blob: 58cb54e5cf1a051133b82f30ccfb2f5084b389d7 [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
Christopher Lamf732cd52017-01-24 12:40:11 +1100148def DieWithError(message, change_desc=None):
149 if change_desc:
150 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000151 print('\n ** Content of CL description **\n' +
152 '='*72 + '\n' +
153 change_desc.description + '\n' +
154 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100155
vapiera7fbd5a2016-06-16 09:17:49 -0700156 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000157 sys.exit(1)
158
159
Christopher Lamf732cd52017-01-24 12:40:11 +1100160def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000161 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000162 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000163 with open(backup_path, 'w') as backup_file:
164 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100165
166
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000167def GetNoGitPagerEnv():
168 env = os.environ.copy()
169 # 'cat' is a magical git string that disables pagers on all platforms.
170 env['GIT_PAGER'] = 'cat'
171 return env
172
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000173
bsep@chromium.org627d9002016-04-29 00:00:52 +0000174def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000176 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
177 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000178 except subprocess2.CalledProcessError as e:
179 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000180 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000181 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
182 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000183 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000184
185
186def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000187 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000188 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000189
190
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000191def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000192 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700193 if suppress_stderr:
194 stderr = subprocess2.VOID
195 else:
196 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000197 try:
tandrii5d48c322016-08-18 16:19:37 -0700198 (out, _), code = subprocess2.communicate(['git'] + args,
199 env=GetNoGitPagerEnv(),
200 stdout=subprocess2.PIPE,
201 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700203 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900204 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000205 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000206
207
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000208def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000209 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000210 return RunGitWithCode(args, suppress_stderr=True)[1]
211
212
tandrii2a16b952016-10-19 07:09:44 -0700213def time_sleep(seconds):
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700216 return time.sleep(seconds)
217
218
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000219def time_time():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return time.time()
223
224
Edward Lemur1b52d872019-05-09 21:12:12 +0000225def datetime_now():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return datetime.datetime.now()
229
230
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100231def confirm_or_exit(prefix='', action='confirm'):
232 """Asks user to press enter to continue or press Ctrl+C to abort."""
233 if not prefix or prefix.endswith('\n'):
234 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100235 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100236 mid = ' Press'
237 elif prefix.endswith(' '):
238 mid = 'press'
239 else:
240 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000241 gclient_utils.AskForData(
242 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100243
244
245def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000246 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000247 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100248 while True:
249 if 'yes'.startswith(result):
250 return True
251 if 'no'.startswith(result):
252 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000253 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100254
255
machenbach@chromium.org45453142015-09-15 08:45:22 +0000256def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000257 prop_list = getattr(options, 'properties', [])
258 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000259 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260 try:
261 properties[key] = json.loads(val)
262 except ValueError:
263 pass # If a value couldn't be evaluated, treat it as a string.
264 return properties
265
266
Edward Lemur4c707a22019-09-24 21:13:43 +0000267def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000268 """Calls a buildbucket v2 method and returns the parsed json response."""
269 headers = {
270 'Accept': 'application/json',
271 'Content-Type': 'application/json',
272 }
273 request = json.dumps(request)
274 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
275
276 logging.info('POST %s with %s' % (url, request))
277
278 attempts = 1
279 time_to_sleep = 1
280 while True:
281 response, content = http.request(url, 'POST', body=request, headers=headers)
282 if response.status == 200:
283 return json.loads(content[4:])
284 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
285 msg = '%s error when calling POST %s with %s: %s' % (
286 response.status, url, request, content)
287 raise BuildbucketResponseException(msg)
288 logging.debug(
289 '%s error when calling POST %s with %s. '
290 'Sleeping for %d seconds and retrying...' % (
291 response.status, url, request, time_to_sleep))
292 time.sleep(time_to_sleep)
293 time_to_sleep *= 2
294 attempts += 1
295
296 assert False, 'unreachable'
297
298
Edward Lemur6215c792019-10-03 21:59:05 +0000299def _parse_bucket(raw_bucket):
300 legacy = True
301 project = bucket = None
302 if '/' in raw_bucket:
303 legacy = False
304 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000305 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000306 elif raw_bucket.startswith('luci.'):
307 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000308 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000309 elif '.' in raw_bucket:
310 project = raw_bucket.split('.')[0]
311 bucket = raw_bucket
312 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000313 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000314 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
315 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000316
317
Quinten Yearsley777660f2020-03-04 23:37:06 +0000318def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700320
321 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000322 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000323 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700324 options: Command-line options.
325 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000327 for project, bucket, builder in jobs:
328 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000329 print('To see results here, run: git cl try-results')
330 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700331
Quinten Yearsley777660f2020-03-04 23:37:06 +0000332 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000333 if not requests:
334 return
335
Edward Lemur5b929a42019-10-21 17:57:39 +0000336 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 http.force_exception_to_status_code = True
338
339 batch_request = {'requests': requests}
340 batch_response = _call_buildbucket(
341 http, options.buildbucket_host, 'Batch', batch_request)
342
343 errors = [
344 ' ' + response['error']['message']
345 for response in batch_response.get('responses', [])
346 if 'error' in response
347 ]
348 if errors:
349 raise BuildbucketResponseException(
350 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
351
352
Quinten Yearsley777660f2020-03-04 23:37:06 +0000353def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000354 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000355 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000356 shared_properties = {
357 'category': options.ensure_value('category', 'git_cl_try')
358 }
359 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000360 shared_properties['clobber'] = True
361 shared_properties.update(_get_properties_from_options(options) or {})
362
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000363 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000364 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000365 shared_tags.append({'key': 'retry_failed',
366 'value': '1'})
367
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000369 for (project, bucket, builder) in jobs:
370 properties = shared_properties.copy()
371 if 'presubmit' in builder.lower():
372 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373
Edward Lemur45768512020-03-02 19:03:14 +0000374 requests.append({
375 'scheduleBuild': {
376 'requestId': str(uuid.uuid4()),
377 'builder': {
378 'project': getattr(options, 'project', None) or project,
379 'bucket': bucket,
380 'builder': builder,
381 },
382 'gerritChanges': gerrit_changes,
383 'properties': properties,
384 'tags': [
385 {'key': 'builder', 'value': builder},
386 ] + shared_tags,
387 }
388 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000389
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000390 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000391 requests[-1]['scheduleBuild']['gitilesCommit'] = {
392 'host': gerrit_changes[0]['host'],
393 'project': gerrit_changes[0]['project'],
394 'id': options.revision
395 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000396
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000398
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000399
Quinten Yearsley777660f2020-03-04 23:37:06 +0000400def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000401 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000402
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000403 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000404 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000405 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000406 request = {
407 'predicate': {
408 'gerritChanges': [changelist.GetGerritChange(patchset)],
409 },
410 'fields': ','.join('builds.*.' + field for field in fields),
411 }
tandrii221ab252016-10-06 08:12:04 -0700412
Edward Lemur5b929a42019-10-21 17:57:39 +0000413 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000414 if authenticator.has_cached_credentials():
415 http = authenticator.authorize(httplib2.Http())
416 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700417 print('Warning: Some results might be missing because %s' %
418 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000419 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000420 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000421 http.force_exception_to_status_code = True
422
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000423 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
424 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426
Edward Lemur5b929a42019-10-21 17:57:39 +0000427def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000428 """Fetches builds from the latest patchset that has builds (within
429 the last few patchsets).
430
431 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 changelist (Changelist): The CL to fetch builds for
433 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000434 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
435 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000437 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
438 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000439 """
440 assert buildbucket_host
441 assert changelist.GetIssue(), 'CL must be uploaded first'
442 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000443 if latest_patchset is None:
444 assert changelist.GetMostRecentPatchset()
445 ps = changelist.GetMostRecentPatchset()
446 else:
447 assert latest_patchset > 0, latest_patchset
448 ps = latest_patchset
449
Quinten Yearsley983111f2019-09-26 17:18:48 +0000450 min_ps = max(1, ps - 5)
451 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000452 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000453 if len(builds):
454 return builds, ps
455 ps -= 1
456 return [], 0
457
458
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459def _filter_failed_for_retry(all_builds):
460 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000461
462 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000463 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000464 i.e. a list of buildbucket.v2.Builds which includes status and builder
465 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000466
467 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000468 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000469 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470 """
Edward Lemur45768512020-03-02 19:03:14 +0000471 grouped = {}
472 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000473 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000474 key = (builder['project'], builder['bucket'], builder['builder'])
475 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000476
Edward Lemur45768512020-03-02 19:03:14 +0000477 jobs = []
478 for (project, bucket, builder), builds in grouped.items():
479 if 'triggered' in builder:
480 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
481 'from a parent. Please schedule a manual job for the parent '
482 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000483 continue
484 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
485 # Don't retry if any are running.
486 continue
Edward Lemur45768512020-03-02 19:03:14 +0000487 # If builder had several builds, retry only if the last one failed.
488 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
489 # build, but in case of retrying failed jobs retrying a flaky one makes
490 # sense.
491 builds = sorted(builds, key=lambda b: b['createTime'])
492 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
493 continue
494 # Don't retry experimental build previously triggered by CQ.
495 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
496 for t in builds[-1]['tags']):
497 continue
498 jobs.append((project, bucket, builder))
499
500 # Sort the jobs to make testing easier.
501 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000502
503
Quinten Yearsley777660f2020-03-04 23:37:06 +0000504def _print_tryjobs(options, builds):
505 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000506 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000507 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000508 return
509
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000510 longest_builder = max(len(b['builder']['builder']) for b in builds)
511 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000513 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
514 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000515
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000516 builds_by_status = {}
517 for b in builds:
518 builds_by_status.setdefault(b['status'], []).append({
519 'id': b['id'],
520 'name': name_fmt.format(
521 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
522 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 sort_key = lambda b: (b['name'], b['id'])
525
526 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 if not builds:
529 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000530
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000531 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000532 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 else:
535 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 print(colorize(title))
538 for b in sorted(builds, key=sort_key):
539 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540
541 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 print_builds(
543 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
544 print_builds(
545 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
546 color=Fore.MAGENTA)
547 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
548 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
549 color=Fore.MAGENTA)
550 print_builds('Started:', builds_by_status.pop('STARTED', []))
551 print_builds(
552 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000554 print_builds(
555 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000556 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557
558
Aiden Bennerc08566e2018-10-03 17:52:42 +0000559def _ComputeDiffLineRanges(files, upstream_commit):
560 """Gets the changed line ranges for each file since upstream_commit.
561
562 Parses a git diff on provided files and returns a dict that maps a file name
563 to an ordered list of range tuples in the form (start_line, count).
564 Ranges are in the same format as a git diff.
565 """
566 # If files is empty then diff_output will be a full diff.
567 if len(files) == 0:
568 return {}
569
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000570 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000571 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000572 diff_output = RunGit(diff_cmd)
573
574 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
575 # 2 capture groups
576 # 0 == fname of diff file
577 # 1 == 'diff_start,diff_count' or 'diff_start'
578 # will match each of
579 # diff --git a/foo.foo b/foo.py
580 # @@ -12,2 +14,3 @@
581 # @@ -12,2 +17 @@
582 # running re.findall on the above string with pattern will give
583 # [('foo.py', ''), ('', '14,3'), ('', '17')]
584
585 curr_file = None
586 line_diffs = {}
587 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
588 if match[0] != '':
589 # Will match the second filename in diff --git a/a.py b/b.py.
590 curr_file = match[0]
591 line_diffs[curr_file] = []
592 else:
593 # Matches +14,3
594 if ',' in match[1]:
595 diff_start, diff_count = match[1].split(',')
596 else:
597 # Single line changes are of the form +12 instead of +12,1.
598 diff_start = match[1]
599 diff_count = 1
600
601 diff_start = int(diff_start)
602 diff_count = int(diff_count)
603
604 # If diff_count == 0 this is a removal we can ignore.
605 line_diffs[curr_file].append((diff_start, diff_count))
606
607 return line_diffs
608
609
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000610def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000611 """Checks if a yapf file is in any parent directory of fpath until top_dir.
612
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000613 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000614 is found returns None. Uses yapf_config_cache as a cache for previously found
615 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000617 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000618 # Return result if we've already computed it.
619 if fpath in yapf_config_cache:
620 return yapf_config_cache[fpath]
621
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622 parent_dir = os.path.dirname(fpath)
623 if os.path.isfile(fpath):
624 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000625 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000626 # Otherwise fpath is a directory
627 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
628 if os.path.isfile(yapf_file):
629 ret = yapf_file
630 elif fpath == top_dir or parent_dir == fpath:
631 # If we're at the top level directory, or if we're at root
632 # there is no provided style.
633 ret = None
634 else:
635 # Otherwise recurse on the current directory.
636 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 yapf_config_cache[fpath] = ret
638 return ret
639
640
Brian Sheedyb4307d52019-12-02 19:18:17 +0000641def _GetYapfIgnorePatterns(top_dir):
642 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000643
644 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
645 but this functionality appears to break when explicitly passing files to
646 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000647 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000648 the .yapfignore file should be in the directory that yapf is invoked from,
649 which we assume to be the top level directory in this case.
650
651 Args:
652 top_dir: The top level directory for the repository being formatted.
653
654 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000655 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000656 """
657 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000658 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000659 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000660 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000661
Brian Sheedyb4307d52019-12-02 19:18:17 +0000662 with open(yapfignore_file) as f:
663 for line in f.readlines():
664 stripped_line = line.strip()
665 # Comments and blank lines should be ignored.
666 if stripped_line.startswith('#') or stripped_line == '':
667 continue
668 ignore_patterns.add(stripped_line)
669 return ignore_patterns
670
671
672def _FilterYapfIgnoredFiles(filepaths, patterns):
673 """Filters out any filepaths that match any of the given patterns.
674
675 Args:
676 filepaths: An iterable of strings containing filepaths to filter.
677 patterns: An iterable of strings containing fnmatch patterns to filter on.
678
679 Returns:
680 A list of strings containing all the elements of |filepaths| that did not
681 match any of the patterns in |patterns|.
682 """
683 # Not inlined so that tests can use the same implementation.
684 return [f for f in filepaths
685 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000686
687
Aaron Gable13101a62018-02-09 13:20:41 -0800688def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000689 """Prints statistics about the change to the user."""
690 # --no-ext-diff is broken in some versions of Git, so try to work around
691 # this by overriding the environment (but there is still a problem if the
692 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000693 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000694 if 'GIT_EXTERNAL_DIFF' in env:
695 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000696
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000697 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800698 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000699 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700
701
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000702class BuildbucketResponseException(Exception):
703 pass
704
705
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000706class Settings(object):
707 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000708 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000709 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000710 self.tree_status_url = None
711 self.viewvc_url = None
712 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000713 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000714 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000715 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000716 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000717 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000718
Edward Lemur26964072020-02-19 19:18:51 +0000719 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000720 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000721 if self.updated:
722 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000723
Edward Lemur26964072020-02-19 19:18:51 +0000724 # The only value that actually changes the behavior is
725 # autoupdate = "false". Everything else means "true".
726 autoupdate = (
727 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
728
729 cr_settings_file = FindCodereviewSettingsFile()
730 if autoupdate != 'false' and cr_settings_file:
731 LoadCodereviewSettingsFromFile(cr_settings_file)
732 cr_settings_file.close()
733
734 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000735
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000736 @staticmethod
737 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000738 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000739
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000740 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000741 if self.root is None:
742 self.root = os.path.abspath(self.GetRelativeRoot())
743 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 def GetTreeStatusUrl(self, error_ok=False):
746 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000747 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
748 if self.tree_status_url is None and not error_ok:
749 DieWithError(
750 'You must configure your tree status URL by running '
751 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 return self.tree_status_url
753
754 def GetViewVCUrl(self):
755 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000756 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 return self.viewvc_url
758
rmistry@google.com90752582014-01-14 21:04:50 +0000759 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000760 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000761
rmistry@google.com5626a922015-02-26 14:03:30 +0000762 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000763 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000764 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000765 return run_post_upload_hook == "True"
766
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000767 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000768 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000769
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000770 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000771 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000773 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
774 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000775 # Default is squash now (http://crbug.com/611892#c23).
776 self.squash_gerrit_uploads = self._GetConfig(
777 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000778 return self.squash_gerrit_uploads
779
Edward Lesmes4de54132020-05-05 19:41:33 +0000780 def GetSquashGerritUploadsOverride(self):
781 """Return True or False if codereview.settings should be overridden.
782
783 Returns None if no override has been defined.
784 """
785 # See also http://crbug.com/611892#c23
786 result = self._GetConfig('gerrit.override-squash-uploads').lower()
787 if result == 'true':
788 return True
789 if result == 'false':
790 return False
791 return None
792
tandrii@chromium.org28253532016-04-14 13:46:56 +0000793 def GetGerritSkipEnsureAuthenticated(self):
794 """Return True if EnsureAuthenticated should not be done for Gerrit
795 uploads."""
796 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000797 self.gerrit_skip_ensure_authenticated = self._GetConfig(
798 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000799 return self.gerrit_skip_ensure_authenticated
800
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000801 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000802 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000803 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000804 # Git requires single quotes for paths with spaces. We need to replace
805 # them with double quotes for Windows to treat such paths as a single
806 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000808 return self.git_editor or None
809
thestig@chromium.org44202a22014-03-11 19:22:18 +0000810 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000811 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000812
813 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000814 return self._GetConfig(
815 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000816
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000817 def GetFormatFullByDefault(self):
818 if self.format_full_by_default is None:
819 result = (
820 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
821 error_ok=True).strip())
822 self.format_full_by_default = (result == 'true')
823 return self.format_full_by_default
824
Edward Lemur26964072020-02-19 19:18:51 +0000825 def _GetConfig(self, key, default=''):
826 self._LazyUpdateIfNeeded()
827 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828
829
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000830class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000831 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000832 NONE = 'none'
833 DRY_RUN = 'dry_run'
834 COMMIT = 'commit'
835
836 ALL_STATES = [NONE, DRY_RUN, COMMIT]
837
838
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000839class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000840 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000841 self.issue = issue
842 self.patchset = patchset
843 self.hostname = hostname
844
845 @property
846 def valid(self):
847 return self.issue is not None
848
849
Edward Lemurf38bc172019-09-03 21:02:13 +0000850def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000851 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
852 fail_result = _ParsedIssueNumberArgument()
853
Edward Lemur678a6842019-10-03 22:25:05 +0000854 if isinstance(arg, int):
855 return _ParsedIssueNumberArgument(issue=arg)
856 if not isinstance(arg, basestring):
857 return fail_result
858
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000859 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000860 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000861 if not arg.startswith('http'):
862 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700863
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000865 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
866 if url.startswith(short_url):
867 url = gerrit_url + url[len(short_url):]
868 break
869
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000870 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000871 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000872 except ValueError:
873 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200874
Edward Lemur678a6842019-10-03 22:25:05 +0000875 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
876 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
877 # Short urls like https://domain/<issue_number> can be used, but don't allow
878 # specifying the patchset (you'd 404), but we allow that here.
879 if parsed_url.path == '/':
880 part = parsed_url.fragment
881 else:
882 part = parsed_url.path
883
884 match = re.match(
885 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
886 if not match:
887 return fail_result
888
889 issue = int(match.group('issue'))
890 patchset = match.group('patchset')
891 return _ParsedIssueNumberArgument(
892 issue=issue,
893 patchset=int(patchset) if patchset else None,
894 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000895
896
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000897def _create_description_from_log(args):
898 """Pulls out the commit log to use as a base for the CL description."""
899 log_args = []
900 if len(args) == 1 and not args[0].endswith('.'):
901 log_args = [args[0] + '..']
902 elif len(args) == 1 and args[0].endswith('...'):
903 log_args = [args[0][:-1]]
904 elif len(args) == 2:
905 log_args = [args[0] + '..' + args[1]]
906 else:
907 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000908 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000909
910
Aaron Gablea45ee112016-11-22 15:14:38 -0800911class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700912 def __init__(self, issue, url):
913 self.issue = issue
914 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800915 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700916
917 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800918 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700919 self.issue, self.url)
920
921
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100922_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000923 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100924 # TODO(tandrii): these two aren't known in Gerrit.
925 'approval', 'disapproval'])
926
927
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000928class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000929 """Changelist works with one changelist in local branch.
930
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000931 Notes:
932 * Not safe for concurrent multi-{thread,process} use.
933 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700934 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000935 """
936
Edward Lemur125d60a2019-09-13 18:25:41 +0000937 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000938 """Create a new ChangeList instance.
939
Edward Lemurf38bc172019-09-03 21:02:13 +0000940 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000941 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000942 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000943 global settings
944 if not settings:
945 # Happens when git_cl.py is used as a utility library.
946 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000947
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000948 self.branchref = branchref
949 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000950 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000951 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000952 else:
953 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000954 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000955 self.lookedup_issue = False
956 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000957 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000958 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000959 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000960 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800961 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000962 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000963 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000964
Edward Lemur125d60a2019-09-13 18:25:41 +0000965 # Lazily cached values.
966 self._gerrit_host = None # e.g. chromium-review.googlesource.com
967 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
968 # Map from change number (issue) to its detail cache.
969 self._detail_cache = {}
970
971 if codereview_host is not None:
972 assert not codereview_host.startswith('https://'), codereview_host
973 self._gerrit_host = codereview_host
974 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000975
976 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700977 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000978
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700979 The return value is a string suitable for passing to git cl with the --cc
980 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000981 """
982 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000983 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800984 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000985 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
986 return self.cc
987
Daniel Cheng7227d212017-11-17 08:12:37 -0800988 def ExtendCC(self, more_cc):
989 """Extends the list of users to cc on this CL based on the changed files."""
990 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000991
992 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000993 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +0000995 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000996 if not branchref:
997 return None
998 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +0000999 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001000 return self.branch
1001
1002 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001003 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001004 self.GetBranch() # Poke the lazy loader.
1005 return self.branchref
1006
Edward Lemur85153282020-02-14 22:06:29 +00001007 def _GitGetBranchConfigValue(self, key, default=None):
1008 return scm.GIT.GetBranchConfig(
1009 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001010
Edward Lemur85153282020-02-14 22:06:29 +00001011 def _GitSetBranchConfigValue(self, key, value):
1012 action = 'set %s to %r' % (key, value)
1013 if not value:
1014 action = 'unset %s' % key
1015 assert self.GetBranch(), 'a branch is needed to ' + action
1016 return scm.GIT.SetBranchConfig(
1017 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001018
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001019 @staticmethod
1020 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001021 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001022 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001024 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1025 settings.GetRoot(), branch)
1026 if not remote or not upstream_branch:
1027 DieWithError(
1028 'Unable to determine default branch to diff against.\n'
1029 'Either pass complete "git diff"-style arguments, like\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001030 ' git cl upload origin/main\n'
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001031 'or verify this branch is set up to track another \n'
1032 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033
1034 return remote, upstream_branch
1035
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001036 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001037 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001038 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001039 DieWithError('The upstream for the current branch (%s) does not exist '
1040 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001041 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001042 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001043
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 def GetUpstreamBranch(self):
1045 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001046 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001047 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001048 upstream_branch = upstream_branch.replace('refs/heads/',
1049 'refs/remotes/%s/' % remote)
1050 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1051 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 self.upstream_branch = upstream_branch
1053 return self.upstream_branch
1054
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001055 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001056 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001057 remote, branch = None, self.GetBranch()
1058 seen_branches = set()
1059 while branch not in seen_branches:
1060 seen_branches.add(branch)
1061 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001062 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001063 if remote != '.' or branch.startswith('refs/remotes'):
1064 break
1065 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001066 remotes = RunGit(['remote'], error_ok=True).split()
1067 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001068 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001069 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001070 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001071 logging.warn('Could not determine which remote this change is '
1072 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001073 else:
1074 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001075 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001076 branch = 'HEAD'
1077 if branch.startswith('refs/remotes'):
1078 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001079 elif branch.startswith('refs/branch-heads/'):
1080 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001081 else:
1082 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001083 return self._remote
1084
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 def GetRemoteUrl(self):
1086 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1087
1088 Returns None if there is no remote.
1089 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001090 is_cached, value = self._cached_remote_url
1091 if is_cached:
1092 return value
1093
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001094 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001095 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001096
Edward Lemur298f2cf2019-02-22 21:40:39 +00001097 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001098 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001099 if host:
1100 self._cached_remote_url = (True, url)
1101 return url
1102
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001103 # If it cannot be parsed as an url, assume it is a local directory,
1104 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001105 logging.warning('"%s" doesn\'t appear to point to a git host. '
1106 'Interpreting it as a local directory.', url)
1107 if not os.path.isdir(url):
1108 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001109 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1110 'but it doesn\'t exist.',
1111 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001112 return None
1113
1114 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001115 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001116
Edward Lemur79d4f992019-11-11 23:49:02 +00001117 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001118 if not host:
1119 logging.error(
1120 'Remote "%(remote)s" for branch "%(branch)s" points to '
1121 '"%(cache_path)s", but it is misconfigured.\n'
1122 '"%(cache_path)s" must be a git repo and must have a remote named '
1123 '"%(remote)s" pointing to the git host.', {
1124 'remote': remote,
1125 'cache_path': cache_path,
1126 'branch': self.GetBranch()})
1127 return None
1128
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001129 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001130 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001132 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001133 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001134 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001135 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001136 if self.issue is not None:
1137 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001138 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 return self.issue
1140
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001141 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001143 issue = self.GetIssue()
1144 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001145 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001146 server = self.GetCodereviewServer()
1147 if short:
1148 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1149 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150
Edward Lemur6c6827c2020-02-06 21:15:18 +00001151 def FetchDescription(self, pretty=False):
1152 assert self.GetIssue(), 'issue is required to query Gerrit'
1153
Edward Lemur9aa1a962020-02-25 00:58:38 +00001154 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001155 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1156 current_rev = data['current_revision']
1157 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001158
1159 if not pretty:
1160 return self.description
1161
1162 # Set width to 72 columns + 2 space indent.
1163 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1164 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1165 lines = self.description.splitlines()
1166 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001167
1168 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001169 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001170 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001171 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001172 if self.patchset is not None:
1173 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001174 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001175 return self.patchset
1176
Edward Lemur9aa1a962020-02-25 00:58:38 +00001177 def GetAuthor(self):
1178 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1179
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001181 """Set this branch's patchset. If patchset=0, clears the patchset."""
1182 assert self.GetBranch()
1183 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001184 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001185 else:
1186 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001187 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001188
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001189 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001190 """Set this branch's issue. If issue isn't given, clears the issue."""
1191 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001192 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001193 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001194 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001195 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001196 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001197 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001198 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001199 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001200 else:
tandrii5d48c322016-08-18 16:19:37 -07001201 # Reset all of these just to be clean.
1202 reset_suffixes = [
1203 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001204 ISSUE_CONFIG_KEY,
1205 PATCHSET_CONFIG_KEY,
1206 CODEREVIEW_SERVER_CONFIG_KEY,
1207 'gerritsquashhash',
1208 ]
tandrii5d48c322016-08-18 16:19:37 -07001209 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001210 try:
1211 self._GitSetBranchConfigValue(prop, None)
1212 except subprocess2.CalledProcessError:
1213 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001214 msg = RunGit(['log', '-1', '--format=%B']).strip()
1215 if msg and git_footers.get_footer_change_id(msg):
1216 print('WARNING: The change patched into this branch has a Change-Id. '
1217 'Removing it.')
1218 RunGit(['commit', '--amend', '-m',
1219 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001220 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001221 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001222 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223
Edward Lemur2c62b332020-03-12 22:12:33 +00001224 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001225 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001226 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001227 except subprocess2.CalledProcessError:
1228 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001229 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001230 'This branch probably doesn\'t exist anymore. To reset the\n'
1231 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001232 ' git branch --set-upstream-to origin/main %s\n'
1233 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001234 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001235
dsansomee2d6fd92016-09-08 00:10:47 -07001236 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001237 assert self.GetIssue(), 'issue is required to update description'
1238
1239 if gerrit_util.HasPendingChangeEdit(
1240 self._GetGerritHost(), self._GerritChangeIdentifier()):
1241 if not force:
1242 confirm_or_exit(
1243 'The description cannot be modified while the issue has a pending '
1244 'unpublished edit. Either publish the edit in the Gerrit web UI '
1245 'or delete it.\n\n', action='delete the unpublished edit')
1246
1247 gerrit_util.DeletePendingChangeEdit(
1248 self._GetGerritHost(), self._GerritChangeIdentifier())
1249 gerrit_util.SetCommitMessage(
1250 self._GetGerritHost(), self._GerritChangeIdentifier(),
1251 description, notify='NONE')
1252
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001253 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001254
Edward Lemur75526302020-02-27 22:31:05 +00001255 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001256 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001257 '--root', settings.GetRoot(),
1258 '--upstream', upstream,
1259 ]
1260
1261 args.extend(['--verbose'] * verbose)
1262
Edward Lemur99df04e2020-03-05 19:39:43 +00001263 author = self.GetAuthor()
1264 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001265 issue = self.GetIssue()
1266 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001267 if author:
1268 args.extend(['--author', author])
1269 if gerrit_url:
1270 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001271 if issue:
1272 args.extend(['--issue', str(issue)])
1273 if patchset:
1274 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001275
Edward Lemur75526302020-02-27 22:31:05 +00001276 return args
1277
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001278 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001279 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001280 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1281 args = self._GetCommonPresubmitArgs(verbose, upstream)
1282 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001283 if may_prompt:
1284 args.append('--may_prompt')
1285 if parallel:
1286 args.append('--parallel')
1287 if all_files:
1288 args.append('--all_files')
1289
1290 with gclient_utils.temporary_file() as description_file:
1291 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001292
1293 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001294 args.extend(['--json_output', json_output])
1295 args.extend(['--description_file', description_file])
Saagar Sanghavi531d9922020-08-10 20:14:01 +00001296 args.extend(['--gerrit_project', self._GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001297
1298 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001299 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001300 if resultdb and realm:
1301 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1302 elif resultdb:
1303 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1304 # it is not required to pass the realm flag
1305 print('Note: ResultDB reporting will NOT be performed because --realm'
1306 ' was not specified. To enable ResultDB, please run the command'
1307 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001308
1309 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001310 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001311
Edward Lemur227d5102020-02-25 23:45:35 +00001312 metrics.collector.add_repeated('sub_commands', {
1313 'command': 'presubmit',
1314 'execution_time': time_time() - start,
1315 'exit_code': exit_code,
1316 })
1317
1318 if exit_code:
1319 sys.exit(exit_code)
1320
1321 json_results = gclient_utils.FileRead(json_output)
1322 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001323
Edward Lemur75526302020-02-27 22:31:05 +00001324 def RunPostUploadHook(self, verbose, upstream, description):
1325 args = self._GetCommonPresubmitArgs(verbose, upstream)
1326 args.append('--post_upload')
1327
1328 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001329 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001330 args.extend(['--description_file', description_file])
1331 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1332 p.wait()
1333
Edward Lemur5a644f82020-03-18 16:44:57 +00001334 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1335 # Get description message for upload.
1336 if self.GetIssue():
1337 description = self.FetchDescription()
1338 elif options.message:
1339 description = options.message
1340 else:
1341 description = _create_description_from_log(git_diff_args)
1342 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001343 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001344
1345 # Extract bug number from branch name.
1346 bug = options.bug
1347 fixed = options.fixed
1348 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1349 self.GetBranch())
1350 if not bug and not fixed and match:
1351 if match.group('type') == 'bug':
1352 bug = match.group('bugnum')
1353 else:
1354 fixed = match.group('bugnum')
1355
1356 change_description = ChangeDescription(description, bug, fixed)
1357
1358 # Set the reviewer list now so that presubmit checks can access it.
1359 if options.reviewers or options.tbrs or options.add_owners_to:
1360 change_description.update_reviewers(
1361 options.reviewers, options.tbrs, options.add_owners_to, files,
1362 self.GetAuthor())
1363
1364 return change_description
1365
1366 def _GetTitleForUpload(self, options):
1367 # When not squashing, just return options.title.
1368 if not options.squash:
1369 return options.title
1370
1371 # On first upload, patchset title is always this string, while options.title
1372 # gets converted to first line of message.
1373 if not self.GetIssue():
1374 return 'Initial upload'
1375
1376 # When uploading subsequent patchsets, options.message is taken as the title
1377 # if options.title is not provided.
1378 if options.title:
1379 return options.title
1380 if options.message:
1381 return options.message.strip()
1382
1383 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001384 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001385 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001386 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001387 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1388 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001389
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001390 def CMDUpload(self, options, git_diff_args, orig_args):
1391 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001392 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001393 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001395 else:
1396 if self.GetBranch() is None:
1397 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1398
1399 # Default to diffing against common ancestor of upstream branch
1400 base_branch = self.GetCommonAncestorWithUpstream()
1401 git_diff_args = [base_branch, 'HEAD']
1402
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001403 # Fast best-effort checks to abort before running potentially expensive
1404 # hooks if uploading is likely to fail anyway. Passing these checks does
1405 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001406 self.EnsureAuthenticated(force=options.force)
1407 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001408
1409 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001410 watchlist = watchlists.Watchlists(settings.GetRoot())
1411 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001412 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001413 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001414
Edward Lemur5a644f82020-03-18 16:44:57 +00001415 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001416 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001417 hook_results = self.RunHook(
1418 committing=False,
1419 may_prompt=not options.force,
1420 verbose=options.verbose,
1421 parallel=options.parallel,
1422 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001423 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001424 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001425 resultdb=options.resultdb,
1426 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001427 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001428
Aaron Gable13101a62018-02-09 13:20:41 -08001429 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001430 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001431 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001432 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001433 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001434 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001435 # Run post upload hooks, if specified.
1436 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001437 self.RunPostUploadHook(
1438 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001439
1440 # Upload all dependencies if specified.
1441 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001442 print()
1443 print('--dependencies has been specified.')
1444 print('All dependent local branches will be re-uploaded.')
1445 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001446 # Remove the dependencies flag from args so that we do not end up in a
1447 # loop.
1448 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001449 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001450 return ret
1451
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001452 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001453 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001454
1455 Issue must have been already uploaded and known.
1456 """
1457 assert new_state in _CQState.ALL_STATES
1458 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001459 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001460 vote_map = {
1461 _CQState.NONE: 0,
1462 _CQState.DRY_RUN: 1,
1463 _CQState.COMMIT: 2,
1464 }
1465 labels = {'Commit-Queue': vote_map[new_state]}
1466 notify = False if new_state == _CQState.DRY_RUN else None
1467 gerrit_util.SetReview(
1468 self._GetGerritHost(), self._GerritChangeIdentifier(),
1469 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001470 return 0
1471 except KeyboardInterrupt:
1472 raise
1473 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001474 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001475 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001476 ' * Your project has no CQ,\n'
1477 ' * You don\'t have permission to change the CQ state,\n'
1478 ' * There\'s a bug in this code (see stack trace below).\n'
1479 'Consider specifying which bots to trigger manually or asking your '
1480 'project owners for permissions or contacting Chrome Infra at:\n'
1481 'https://www.chromium.org/infra\n\n' %
1482 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001483 # Still raise exception so that stack trace is printed.
1484 raise
1485
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001486 def _GetGerritHost(self):
1487 # Lazy load of configs.
1488 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001489 if self._gerrit_host and '.' not in self._gerrit_host:
1490 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1491 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001492 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001493 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001494 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001495 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001496 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1497 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001498 return self._gerrit_host
1499
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001500 def _GetGitHost(self):
1501 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001502 remote_url = self.GetRemoteUrl()
1503 if not remote_url:
1504 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001505 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001506
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001507 def GetCodereviewServer(self):
1508 if not self._gerrit_server:
1509 # If we're on a branch then get the server potentially associated
1510 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001511 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001512 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001513 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001514 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001515 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001516 if not self._gerrit_server:
1517 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1518 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001519 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001520 parts[0] = parts[0] + '-review'
1521 self._gerrit_host = '.'.join(parts)
1522 self._gerrit_server = 'https://%s' % self._gerrit_host
1523 return self._gerrit_server
1524
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001525 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001526 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001527 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001528 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001529 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001530 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001531 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001532 if project.endswith('.git'):
1533 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001534 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1535 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1536 # gitiles/git-over-https protocol. E.g.,
1537 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1538 # as
1539 # https://chromium.googlesource.com/v8/v8
1540 if project.startswith('a/'):
1541 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001542 return project
1543
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001544 def _GerritChangeIdentifier(self):
1545 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1546
1547 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001548 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001549 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001550 project = self._GetGerritProject()
1551 if project:
1552 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1553 # Fall back on still unique, but less efficient change number.
1554 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001555
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001556 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001558 if settings.GetGerritSkipEnsureAuthenticated():
1559 # For projects with unusual authentication schemes.
1560 # See http://crbug.com/603378.
1561 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001562
1563 # Check presence of cookies only if using cookies-based auth method.
1564 cookie_auth = gerrit_util.Authenticator.get()
1565 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001566 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001567
Florian Mayerae510e82020-01-30 21:04:48 +00001568 remote_url = self.GetRemoteUrl()
1569 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001570 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001571 return
1572 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001573 logging.warning('Ignoring branch %(branch)s with non-https remote '
1574 '%(remote)s', {
1575 'branch': self.branch,
1576 'remote': self.GetRemoteUrl()
1577 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001578 return
1579
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001580 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001581 self.GetCodereviewServer()
1582 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001583 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001584
1585 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1586 git_auth = cookie_auth.get_auth_header(git_host)
1587 if gerrit_auth and git_auth:
1588 if gerrit_auth == git_auth:
1589 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001590 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001591 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001592 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001593 ' %s\n'
1594 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001595 ' Consider running the following command:\n'
1596 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001597 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001598 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001599 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001600 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001601 cookie_auth.get_new_password_message(git_host)))
1602 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001603 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001604 return
1605 else:
1606 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001607 ([] if gerrit_auth else [self._gerrit_host]) +
1608 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001609 DieWithError('Credentials for the following hosts are required:\n'
1610 ' %s\n'
1611 'These are read from %s (or legacy %s)\n'
1612 '%s' % (
1613 '\n '.join(missing),
1614 cookie_auth.get_gitcookies_path(),
1615 cookie_auth.get_netrc_path(),
1616 cookie_auth.get_new_password_message(git_host)))
1617
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001618 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001619 if not self.GetIssue():
1620 return
1621
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001622 status = self._GetChangeDetail()['status']
1623 if status in ('MERGED', 'ABANDONED'):
1624 DieWithError('Change %s has been %s, new uploads are not allowed' %
1625 (self.GetIssueURL(),
1626 'submitted' if status == 'MERGED' else 'abandoned'))
1627
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001628 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1629 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1630 # Apparently this check is not very important? Otherwise get_auth_email
1631 # could have been added to other implementations of Authenticator.
1632 cookies_auth = gerrit_util.Authenticator.get()
1633 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001634 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001635
1636 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001637 if self.GetIssueOwner() == cookies_user:
1638 return
1639 logging.debug('change %s owner is %s, cookies user is %s',
1640 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001641 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001642 # so ask what Gerrit thinks of this user.
1643 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1644 if details['email'] == self.GetIssueOwner():
1645 return
1646 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001647 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001648 'as %s.\n'
1649 'Uploading may fail due to lack of permissions.' %
1650 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1651 confirm_or_exit(action='upload')
1652
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001653 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001654 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001655 or CQ status, assuming adherence to a common workflow.
1656
1657 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001658 * 'error' - error from review tool (including deleted issues)
1659 * 'unsent' - no reviewers added
1660 * 'waiting' - waiting for review
1661 * 'reply' - waiting for uploader to reply to review
1662 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001663 * 'dry-run' - dry-running in the CQ
1664 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001665 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001666 """
1667 if not self.GetIssue():
1668 return None
1669
1670 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001671 data = self._GetChangeDetail([
1672 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001673 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001674 return 'error'
1675
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001676 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001677 return 'closed'
1678
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001679 cq_label = data['labels'].get('Commit-Queue', {})
1680 max_cq_vote = 0
1681 for vote in cq_label.get('all', []):
1682 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1683 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001684 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001685 if max_cq_vote == 1:
1686 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001687
Aaron Gable9ab38c62017-04-06 14:36:33 -07001688 if data['labels'].get('Code-Review', {}).get('approved'):
1689 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001690
1691 if not data.get('reviewers', {}).get('REVIEWER', []):
1692 return 'unsent'
1693
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001694 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001695 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001696 while messages:
1697 m = messages.pop()
1698 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001699 # Ignore replies from CQ.
1700 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001701 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001702 # Most recent message was by owner.
1703 return 'waiting'
1704 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001705 # Some reply from non-owner.
1706 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001707
1708 # Somehow there are no messages even though there are reviewers.
1709 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001710
1711 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001712 if not self.GetIssue():
1713 return None
1714
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001715 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001716 patchset = data['revisions'][data['current_revision']]['_number']
1717 self.SetPatchset(patchset)
1718 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001719
Aaron Gable636b13f2017-07-14 10:42:48 -07001720 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001721 gerrit_util.SetReview(
1722 self._GetGerritHost(), self._GerritChangeIdentifier(),
1723 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001724
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001726 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001727 # CURRENT_REVISION is included to get the latest patchset so that
1728 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001729 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001730 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1731 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001732 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001733 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001734 robot_file_comments = gerrit_util.GetChangeRobotComments(
1735 self._GetGerritHost(), self._GerritChangeIdentifier())
1736
1737 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001738 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001739 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001740 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001741 line_comments = file_comments.setdefault(path, [])
1742 line_comments.extend(
1743 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001744
1745 # Build dictionary of file comments for easy access and sorting later.
1746 # {author+date: {path: {patchset: {line: url+message}}}}
1747 comments = collections.defaultdict(
1748 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001749 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001750 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001751 tag = comment.get('tag', '')
1752 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001753 continue
1754 key = (comment['author']['email'], comment['updated'])
1755 if comment.get('side', 'REVISION') == 'PARENT':
1756 patchset = 'Base'
1757 else:
1758 patchset = 'PS%d' % comment['patch_set']
1759 line = comment.get('line', 0)
1760 url = ('https://%s/c/%s/%s/%s#%s%s' %
1761 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1762 'b' if comment.get('side') == 'PARENT' else '',
1763 str(line) if line else ''))
1764 comments[key][path][patchset][line] = (url, comment['message'])
1765
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001766 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001767 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001768 summary = self._BuildCommentSummary(msg, comments, readable)
1769 if summary:
1770 summaries.append(summary)
1771 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001772
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001773 @staticmethod
1774 def _BuildCommentSummary(msg, comments, readable):
1775 key = (msg['author']['email'], msg['date'])
1776 # Don't bother showing autogenerated messages that don't have associated
1777 # file or line comments. this will filter out most autogenerated
1778 # messages, but will keep robot comments like those from Tricium.
1779 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1780 if is_autogenerated and not comments.get(key):
1781 return None
1782 message = msg['message']
1783 # Gerrit spits out nanoseconds.
1784 assert len(msg['date'].split('.')[-1]) == 9
1785 date = datetime.datetime.strptime(msg['date'][:-3],
1786 '%Y-%m-%d %H:%M:%S.%f')
1787 if key in comments:
1788 message += '\n'
1789 for path, patchsets in sorted(comments.get(key, {}).items()):
1790 if readable:
1791 message += '\n%s' % path
1792 for patchset, lines in sorted(patchsets.items()):
1793 for line, (url, content) in sorted(lines.items()):
1794 if line:
1795 line_str = 'Line %d' % line
1796 path_str = '%s:%d:' % (path, line)
1797 else:
1798 line_str = 'File comment'
1799 path_str = '%s:0:' % path
1800 if readable:
1801 message += '\n %s, %s: %s' % (patchset, line_str, url)
1802 message += '\n %s\n' % content
1803 else:
1804 message += '\n%s ' % path_str
1805 message += '\n%s\n' % content
1806
1807 return _CommentSummary(
1808 date=date,
1809 message=message,
1810 sender=msg['author']['email'],
1811 autogenerated=is_autogenerated,
1812 # These could be inferred from the text messages and correlated with
1813 # Code-Review label maximum, however this is not reliable.
1814 # Leaving as is until the need arises.
1815 approval=False,
1816 disapproval=False,
1817 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001818
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001819 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001820 gerrit_util.AbandonChange(
1821 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001823 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001824 gerrit_util.SubmitChange(
1825 self._GetGerritHost(), self._GerritChangeIdentifier(),
1826 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001827
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001828 def _GetChangeDetail(self, options=None):
1829 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001830 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001831 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001832
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001833 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001834 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001835 options.append('CURRENT_COMMIT')
1836
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001837 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001838 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001839 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001840
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001841 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1842 # Assumption: data fetched before with extra options is suitable
1843 # for return for a smaller set of options.
1844 # For example, if we cached data for
1845 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1846 # and request is for options=[CURRENT_REVISION],
1847 # THEN we can return prior cached data.
1848 if options_set.issubset(cached_options_set):
1849 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001850
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001851 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001852 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001853 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001854 except gerrit_util.GerritError as e:
1855 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001856 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001857 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001858
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001859 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001860 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001861
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001862 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001863 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001864 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001865 data = gerrit_util.GetChangeCommit(
1866 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001867 except gerrit_util.GerritError as e:
1868 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001869 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001870 raise
agable32978d92016-11-01 12:55:02 -07001871 return data
1872
Karen Qian40c19422019-03-13 21:28:29 +00001873 def _IsCqConfigured(self):
1874 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001875 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001876
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001877 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001878 if git_common.is_dirty_git_tree('land'):
1879 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001880
tandriid60367b2016-06-22 05:25:12 -07001881 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001882 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001883 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001884 'which can test and land changes for you. '
1885 'Are you sure you wish to bypass it?\n',
1886 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001887 differs = True
tandriic4344b52016-08-29 06:04:54 -07001888 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001889 # Note: git diff outputs nothing if there is no diff.
1890 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001891 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001892 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001893 if detail['current_revision'] == last_upload:
1894 differs = False
1895 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 print('WARNING: Local branch contents differ from latest uploaded '
1897 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001898 if differs:
1899 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001900 confirm_or_exit(
1901 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1902 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001903 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001904 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001905 upstream = self.GetCommonAncestorWithUpstream()
1906 if self.GetIssue():
1907 description = self.FetchDescription()
1908 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001909 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001910 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001911 committing=True,
1912 may_prompt=not force,
1913 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001914 parallel=parallel,
1915 upstream=upstream,
1916 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001917 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001918 resultdb=resultdb,
1919 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001920
1921 self.SubmitIssue(wait_for_merge=True)
1922 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001923 links = self._GetChangeCommit().get('web_links', [])
1924 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001925 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001926 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001927 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001928 return 0
1929
Edward Lemurf38bc172019-09-03 21:02:13 +00001930 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001931 assert parsed_issue_arg.valid
1932
Edward Lemur125d60a2019-09-13 18:25:41 +00001933 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001934
1935 if parsed_issue_arg.hostname:
1936 self._gerrit_host = parsed_issue_arg.hostname
1937 self._gerrit_server = 'https://%s' % self._gerrit_host
1938
tandriic2405f52016-10-10 08:13:15 -07001939 try:
1940 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001941 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001942 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001943
1944 if not parsed_issue_arg.patchset:
1945 # Use current revision by default.
1946 revision_info = detail['revisions'][detail['current_revision']]
1947 patchset = int(revision_info['_number'])
1948 else:
1949 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001950 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1952 break
1953 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001954 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001955 (parsed_issue_arg.patchset, self.GetIssue()))
1956
Edward Lemur125d60a2019-09-13 18:25:41 +00001957 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001958 if remote_url.endswith('.git'):
1959 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001960 remote_url = remote_url.rstrip('/')
1961
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001962 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001963 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001964
1965 if remote_url != fetch_info['url']:
1966 DieWithError('Trying to patch a change from %s but this repo appears '
1967 'to be %s.' % (fetch_info['url'], remote_url))
1968
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001969 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001970
Aaron Gable62619a32017-06-16 08:22:09 -07001971 if force:
1972 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1973 print('Checked out commit for change %i patchset %i locally' %
1974 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001975 elif nocommit:
1976 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1977 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001978 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001979 RunGit(['cherry-pick', 'FETCH_HEAD'])
1980 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001981 (parsed_issue_arg.issue, patchset))
1982 print('Note: this created a local commit which does not have '
1983 'the same hash as the one uploaded for review. This will make '
1984 'uploading changes based on top of this branch difficult.\n'
1985 'If you want to do that, use "git cl patch --force" instead.')
1986
Stefan Zagerd08043c2017-10-12 12:07:02 -07001987 if self.GetBranch():
1988 self.SetIssue(parsed_issue_arg.issue)
1989 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001990 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001991 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1992 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1993 else:
1994 print('WARNING: You are in detached HEAD state.\n'
1995 'The patch has been applied to your checkout, but you will not be '
1996 'able to upload a new patch set to the gerrit issue.\n'
1997 'Try using the \'-b\' option if you would like to work on a '
1998 'branch and/or upload a new patch set.')
1999
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000 return 0
2001
tandrii16e0b4e2016-06-07 10:34:28 -07002002 def _GerritCommitMsgHookCheck(self, offer_removal):
2003 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2004 if not os.path.exists(hook):
2005 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002006 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2007 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002008 data = gclient_utils.FileRead(hook)
2009 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2010 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002011 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002012 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002013 'and may interfere with it in subtle ways.\n'
2014 'We recommend you remove the commit-msg hook.')
2015 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002016 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002017 gclient_utils.rm_file_or_tree(hook)
2018 print('Gerrit commit-msg hook removed.')
2019 else:
2020 print('OK, will keep Gerrit commit-msg hook in place.')
2021
Edward Lemur1b52d872019-05-09 21:12:12 +00002022 def _CleanUpOldTraces(self):
2023 """Keep only the last |MAX_TRACES| traces."""
2024 try:
2025 traces = sorted([
2026 os.path.join(TRACES_DIR, f)
2027 for f in os.listdir(TRACES_DIR)
2028 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2029 and not f.startswith('tmp'))
2030 ])
2031 traces_to_delete = traces[:-MAX_TRACES]
2032 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002033 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002034 except OSError:
2035 print('WARNING: Failed to remove old git traces from\n'
2036 ' %s'
2037 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002038
Edward Lemur5737f022019-05-17 01:24:00 +00002039 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002040 """Zip and write the git push traces stored in traces_dir."""
2041 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002042 traces_zip = trace_name + '-traces'
2043 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002044 # Create a temporary dir to store git config and gitcookies in. It will be
2045 # compressed and stored next to the traces.
2046 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002047 git_info_zip = trace_name + '-git-info'
2048
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002049 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002050
Edward Lemur1b52d872019-05-09 21:12:12 +00002051 git_push_metadata['trace_name'] = trace_name
2052 gclient_utils.FileWrite(
2053 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2054
2055 # Keep only the first 6 characters of the git hashes on the packet
2056 # trace. This greatly decreases size after compression.
2057 packet_traces = os.path.join(traces_dir, 'trace-packet')
2058 if os.path.isfile(packet_traces):
2059 contents = gclient_utils.FileRead(packet_traces)
2060 gclient_utils.FileWrite(
2061 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2062 shutil.make_archive(traces_zip, 'zip', traces_dir)
2063
2064 # Collect and compress the git config and gitcookies.
2065 git_config = RunGit(['config', '-l'])
2066 gclient_utils.FileWrite(
2067 os.path.join(git_info_dir, 'git-config'),
2068 git_config)
2069
2070 cookie_auth = gerrit_util.Authenticator.get()
2071 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2072 gitcookies_path = cookie_auth.get_gitcookies_path()
2073 if os.path.isfile(gitcookies_path):
2074 gitcookies = gclient_utils.FileRead(gitcookies_path)
2075 gclient_utils.FileWrite(
2076 os.path.join(git_info_dir, 'gitcookies'),
2077 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2078 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2079
Edward Lemur1b52d872019-05-09 21:12:12 +00002080 gclient_utils.rmtree(git_info_dir)
2081
2082 def _RunGitPushWithTraces(
2083 self, change_desc, refspec, refspec_opts, git_push_metadata):
2084 """Run git push and collect the traces resulting from the execution."""
2085 # Create a temporary directory to store traces in. Traces will be compressed
2086 # and stored in a 'traces' dir inside depot_tools.
2087 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002088 trace_name = os.path.join(
2089 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002090
2091 env = os.environ.copy()
2092 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2093 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002094 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002095 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2096 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2097 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2098
2099 try:
2100 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002101 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002102 before_push = time_time()
2103 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002104 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002105 env=env,
2106 print_stdout=True,
2107 # Flush after every line: useful for seeing progress when running as
2108 # recipe.
2109 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002110 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002111 except subprocess2.CalledProcessError as e:
2112 push_returncode = e.returncode
2113 DieWithError('Failed to create a change. Please examine output above '
2114 'for the reason of the failure.\n'
2115 'Hint: run command below to diagnose common Git/Gerrit '
2116 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002117 ' git cl creds-check\n'
2118 '\n'
2119 'If git-cl is not working correctly, file a bug under the '
2120 'Infra>SDK component including the files below.\n'
2121 'Review the files before upload, since they might contain '
2122 'sensitive information.\n'
2123 'Set the Restrict-View-Google label so that they are not '
2124 'publicly accessible.\n'
2125 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002126 change_desc)
2127 finally:
2128 execution_time = time_time() - before_push
2129 metrics.collector.add_repeated('sub_commands', {
2130 'command': 'git push',
2131 'execution_time': execution_time,
2132 'exit_code': push_returncode,
2133 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2134 })
2135
Edward Lemur1b52d872019-05-09 21:12:12 +00002136 git_push_metadata['execution_time'] = execution_time
2137 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002138 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002139
Edward Lemur1b52d872019-05-09 21:12:12 +00002140 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002141 gclient_utils.rmtree(traces_dir)
2142
2143 return push_stdout
2144
Edward Lemura12175c2020-03-09 16:58:26 +00002145 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002146 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002147 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002149 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002150
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002151 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002152 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002153 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002154 # User requested to change description
2155 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002156 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002157 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002158 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002159 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002160 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002161 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002162 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002163 if len(change_ids) == 1:
2164 change_id = change_ids[0]
2165 else:
2166 change_id = GenerateGerritChangeId(change_desc.description)
2167 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002168
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002169 if options.preserve_tryjobs:
2170 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002171
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002172 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002173 parent = self._ComputeParent(
2174 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002175 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002176 with gclient_utils.temporary_file() as desc_tempfile:
2177 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2178 ref_to_push = RunGit(
2179 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002180 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002181 if not git_footers.get_footer_change_id(change_desc.description):
2182 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002183 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002184 self._AddChangeIdToCommitMessage(
2185 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002186 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002187 # For no-squash mode, we assume the remote called "origin" is the one we
2188 # want. It is not worthwhile to support different workflows for
2189 # no-squash mode.
2190 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002191 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2192
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002193 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002194 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2195 ref_to_push)]).splitlines()
2196 if len(commits) > 1:
2197 print('WARNING: This will upload %d commits. Run the following command '
2198 'to see which commits will be uploaded: ' % len(commits))
2199 print('git log %s..%s' % (parent, ref_to_push))
2200 print('You can also use `git squash-branch` to squash these into a '
2201 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002202 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002203
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002204 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002205 cc = []
2206 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2207 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2208 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002209 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002210 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002211 if options.cc:
2212 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002213 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002214 if change_desc.get_cced():
2215 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002216 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2217 valid_accounts = set(reviewers + cc)
2218 # TODO(crbug/877717): relax this for all hosts.
2219 else:
2220 valid_accounts = gerrit_util.ValidAccounts(
2221 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002222 logging.info('accounts %s are recognized, %s invalid',
2223 sorted(valid_accounts),
2224 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002225
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002226 # Extra options that can be specified at push time. Doc:
2227 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002228 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002229
Aaron Gable844cf292017-06-28 11:32:59 -07002230 # By default, new changes are started in WIP mode, and subsequent patchsets
2231 # don't send email. At any time, passing --send-mail will mark the change
2232 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002233 if options.send_mail:
2234 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002235 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002236 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002237 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002238 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002239 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002240
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002241 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002242 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002243
Edward Lemur5a644f82020-03-18 16:44:57 +00002244 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002245 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002246 # Punctuation and whitespace in |title| must be percent-encoded.
2247 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002248
agablec6787972016-09-09 16:13:34 -07002249 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002250 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002251
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002252 for r in sorted(reviewers):
2253 if r in valid_accounts:
2254 refspec_opts.append('r=%s' % r)
2255 reviewers.remove(r)
2256 else:
2257 # TODO(tandrii): this should probably be a hard failure.
2258 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2259 % r)
2260 for c in sorted(cc):
2261 # refspec option will be rejected if cc doesn't correspond to an
2262 # account, even though REST call to add such arbitrary cc may succeed.
2263 if c in valid_accounts:
2264 refspec_opts.append('cc=%s' % c)
2265 cc.remove(c)
2266
rmistry9eadede2016-09-19 11:22:43 -07002267 if options.topic:
2268 # Documentation on Gerrit topics is here:
2269 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002270 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002271
Edward Lemur687ca902018-12-05 02:30:30 +00002272 if options.enable_auto_submit:
2273 refspec_opts.append('l=Auto-Submit+1')
2274 if options.use_commit_queue:
2275 refspec_opts.append('l=Commit-Queue+2')
2276 elif options.cq_dry_run:
2277 refspec_opts.append('l=Commit-Queue+1')
2278
2279 if change_desc.get_reviewers(tbr_only=True):
2280 score = gerrit_util.GetCodeReviewTbrScore(
2281 self._GetGerritHost(),
2282 self._GetGerritProject())
2283 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002284
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002285 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002286 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002287 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002288 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002289 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2290
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002291 refspec_suffix = ''
2292 if refspec_opts:
2293 refspec_suffix = '%' + ','.join(refspec_opts)
2294 assert ' ' not in refspec_suffix, (
2295 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2296 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2297
Edward Lemur1b52d872019-05-09 21:12:12 +00002298 git_push_metadata = {
2299 'gerrit_host': self._GetGerritHost(),
2300 'title': title or '<untitled>',
2301 'change_id': change_id,
2302 'description': change_desc.description,
2303 }
2304 push_stdout = self._RunGitPushWithTraces(
2305 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002306
2307 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002308 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002309 change_numbers = [m.group(1)
2310 for m in map(regex.match, push_stdout.splitlines())
2311 if m]
2312 if len(change_numbers) != 1:
2313 DieWithError(
2314 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002315 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002316 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002317 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002318
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002319 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002320 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002321 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002322 gerrit_util.AddReviewers(
2323 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002324 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002325 reviewers, cc,
2326 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002327
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 return 0
2329
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002330 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2331 change_desc):
2332 """Computes parent of the generated commit to be uploaded to Gerrit.
2333
2334 Returns revision or a ref name.
2335 """
2336 if custom_cl_base:
2337 # Try to avoid creating additional unintended CLs when uploading, unless
2338 # user wants to take this risk.
2339 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2340 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2341 local_ref_of_target_remote])
2342 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002343 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002344 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2345 'If you proceed with upload, more than 1 CL may be created by '
2346 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2347 'If you are certain that specified base `%s` has already been '
2348 'uploaded to Gerrit as another CL, you may proceed.\n' %
2349 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2350 if not force:
2351 confirm_or_exit(
2352 'Do you take responsibility for cleaning up potential mess '
2353 'resulting from proceeding with upload?',
2354 action='upload')
2355 return custom_cl_base
2356
Aaron Gablef97e33d2017-03-30 15:44:27 -07002357 if remote != '.':
2358 return self.GetCommonAncestorWithUpstream()
2359
2360 # If our upstream branch is local, we base our squashed commit on its
2361 # squashed version.
2362 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2363
Aaron Gablef97e33d2017-03-30 15:44:27 -07002364 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002365 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002366 if upstream_branch_name == 'main':
2367 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002368
2369 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002370 # TODO(tandrii): consider checking parent change in Gerrit and using its
2371 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2372 # the tree hash of the parent branch. The upside is less likely bogus
2373 # requests to reupload parent change just because it's uploadhash is
2374 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002375 parent = scm.GIT.GetBranchConfig(
2376 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002377 # Verify that the upstream branch has been uploaded too, otherwise
2378 # Gerrit will create additional CLs when uploading.
2379 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2380 RunGitSilent(['rev-parse', parent + ':'])):
2381 DieWithError(
2382 '\nUpload upstream branch %s first.\n'
2383 'It is likely that this branch has been rebased since its last '
2384 'upload, so you just need to upload it again.\n'
2385 '(If you uploaded it with --no-squash, then branch dependencies '
2386 'are not supported, and you should reupload with --squash.)'
2387 % upstream_branch_name,
2388 change_desc)
2389 return parent
2390
Edward Lemura12175c2020-03-09 16:58:26 +00002391 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002392 """Re-commits using the current message, assumes the commit hook is in
2393 place.
2394 """
Edward Lemura12175c2020-03-09 16:58:26 +00002395 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002396 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002397 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002398 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002399 return new_log_desc
2400 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002401 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402
tandriie113dfd2016-10-11 10:20:12 -07002403 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002404 try:
2405 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002406 except GerritChangeNotExists:
2407 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002408
2409 if data['status'] in ('ABANDONED', 'MERGED'):
2410 return 'CL %s is closed' % self.GetIssue()
2411
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002412 def GetGerritChange(self, patchset=None):
2413 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002414 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002415 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002416 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002417 data = self._GetChangeDetail(['ALL_REVISIONS'])
2418
2419 assert host and issue and patchset, 'CL must be uploaded first'
2420
2421 has_patchset = any(
2422 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002423 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002424 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002425 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002426 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002427
tandrii8c5a3532016-11-04 07:52:02 -07002428 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002429 'host': host,
2430 'change': issue,
2431 'project': data['project'],
2432 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002433 }
tandriie113dfd2016-10-11 10:20:12 -07002434
tandriide281ae2016-10-12 06:02:30 -07002435 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002436 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002437
Edward Lemur707d70b2018-02-07 00:50:14 +01002438 def GetReviewers(self):
2439 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002440 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002441
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002442
Lei Zhang8a0efc12020-08-05 19:58:45 +00002443def _get_bug_line_values(default_project_prefix, bugs):
2444 """Given default_project_prefix and comma separated list of bugs, yields bug
2445 line values.
tandriif9aefb72016-07-01 09:06:51 -07002446
2447 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002448 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002449 * string, which is left as is.
2450
2451 This function may produce more than one line, because bugdroid expects one
2452 project per line.
2453
Lei Zhang8a0efc12020-08-05 19:58:45 +00002454 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002455 ['v8:123', 'chromium:789']
2456 """
2457 default_bugs = []
2458 others = []
2459 for bug in bugs.split(','):
2460 bug = bug.strip()
2461 if bug:
2462 try:
2463 default_bugs.append(int(bug))
2464 except ValueError:
2465 others.append(bug)
2466
2467 if default_bugs:
2468 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002469 if default_project_prefix:
2470 if not default_project_prefix.endswith(':'):
2471 default_project_prefix += ':'
2472 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002473 else:
2474 yield default_bugs
2475 for other in sorted(others):
2476 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2477 yield other
2478
2479
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002480class ChangeDescription(object):
2481 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002482 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002483 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002484 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002485 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002486 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002487 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2488 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002489 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002490 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002491
Dan Beamd8b04ca2019-10-10 21:23:26 +00002492 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002493 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002494 if bug:
2495 regexp = re.compile(self.BUG_LINE)
2496 prefix = settings.GetBugPrefix()
2497 if not any((regexp.match(line) for line in self._description_lines)):
2498 values = list(_get_bug_line_values(prefix, bug))
2499 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002500 if fixed:
2501 regexp = re.compile(self.FIXED_LINE)
2502 prefix = settings.GetBugPrefix()
2503 if not any((regexp.match(line) for line in self._description_lines)):
2504 values = list(_get_bug_line_values(prefix, fixed))
2505 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002506
agable@chromium.org42c20792013-09-12 17:34:49 +00002507 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002508 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002509 return '\n'.join(self._description_lines)
2510
2511 def set_description(self, desc):
2512 if isinstance(desc, basestring):
2513 lines = desc.splitlines()
2514 else:
2515 lines = [line.rstrip() for line in desc]
2516 while lines and not lines[0]:
2517 lines.pop(0)
2518 while lines and not lines[-1]:
2519 lines.pop(-1)
2520 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002521
Edward Lemur5a644f82020-03-18 16:44:57 +00002522 def ensure_change_id(self, change_id):
2523 description = self.description
2524 footer_change_ids = git_footers.get_footer_change_id(description)
2525 # Make sure that the Change-Id in the description matches the given one.
2526 if footer_change_ids != [change_id]:
2527 if footer_change_ids:
2528 # Remove any existing Change-Id footers since they don't match the
2529 # expected change_id footer.
2530 description = git_footers.remove_footer(description, 'Change-Id')
2531 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2532 'if you want to set a new one.')
2533 # Add the expected Change-Id footer.
2534 description = git_footers.add_footer_change_id(description, change_id)
2535 self.set_description(description)
2536
Edward Lemur2c62b332020-03-12 22:12:33 +00002537 def update_reviewers(
2538 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002539 """Rewrites the R=/TBR= line(s) as a single line each.
2540
2541 Args:
2542 reviewers (list(str)) - list of additional emails to use for reviewers.
2543 tbrs (list(str)) - list of additional emails to use for TBRs.
2544 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2545 the change that are missing OWNER coverage. If this is not None, you
2546 must also pass a value for `change`.
2547 change (Change) - The Change that should be used for OWNERS lookups.
2548 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002549 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002550 assert isinstance(tbrs, list), tbrs
2551
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002552 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002553 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002554
2555 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002556 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002557
2558 reviewers = set(reviewers)
2559 tbrs = set(tbrs)
2560 LOOKUP = {
2561 'TBR': tbrs,
2562 'R': reviewers,
2563 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002564
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002565 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002566 regexp = re.compile(self.R_LINE)
2567 matches = [regexp.match(line) for line in self._description_lines]
2568 new_desc = [l for i, l in enumerate(self._description_lines)
2569 if not matches[i]]
2570 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002571
agable@chromium.org42c20792013-09-12 17:34:49 +00002572 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002573
2574 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002575 for match in matches:
2576 if not match:
2577 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002578 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2579
2580 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002581 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002582 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002583 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002584 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002585 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002586 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002587 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002588
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002589 # If any folks ended up in both groups, remove them from tbrs.
2590 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002591
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002592 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2593 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002594
2595 # Put the new lines in the description where the old first R= line was.
2596 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2597 if 0 <= line_loc < len(self._description_lines):
2598 if new_tbr_line:
2599 self._description_lines.insert(line_loc, new_tbr_line)
2600 if new_r_line:
2601 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002602 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002603 if new_r_line:
2604 self.append_footer(new_r_line)
2605 if new_tbr_line:
2606 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002607
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002608 def set_preserve_tryjobs(self):
2609 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2610 footers = git_footers.parse_footers(self.description)
2611 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2612 if v.lower() == 'true':
2613 return
2614 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2615
Anthony Polito8b955342019-09-24 19:01:36 +00002616 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002617 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002618 self.set_description([
2619 '# Enter a description of the change.',
2620 '# This will be displayed on the codereview site.',
2621 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002622 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002623 '--------------------',
2624 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002625 bug_regexp = re.compile(self.BUG_LINE)
2626 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002627 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002628 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2629 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002630 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002631
agable@chromium.org42c20792013-09-12 17:34:49 +00002632 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002633 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002634 if not content:
2635 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002636 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002637
Bruce Dawson2377b012018-01-11 16:46:49 -08002638 # Strip off comments and default inserted "Bug:" line.
2639 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002640 (line.startswith('#') or
2641 line.rstrip() == "Bug:" or
2642 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002643 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002644 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002645 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002646
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002647 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002648 """Adds a footer line to the description.
2649
2650 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2651 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2652 that Gerrit footers are always at the end.
2653 """
2654 parsed_footer_line = git_footers.parse_footer(line)
2655 if parsed_footer_line:
2656 # Line is a gerrit footer in the form: Footer-Key: any value.
2657 # Thus, must be appended observing Gerrit footer rules.
2658 self.set_description(
2659 git_footers.add_footer(self.description,
2660 key=parsed_footer_line[0],
2661 value=parsed_footer_line[1]))
2662 return
2663
2664 if not self._description_lines:
2665 self._description_lines.append(line)
2666 return
2667
2668 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2669 if gerrit_footers:
2670 # git_footers.split_footers ensures that there is an empty line before
2671 # actual (gerrit) footers, if any. We have to keep it that way.
2672 assert top_lines and top_lines[-1] == ''
2673 top_lines, separator = top_lines[:-1], top_lines[-1:]
2674 else:
2675 separator = [] # No need for separator if there are no gerrit_footers.
2676
2677 prev_line = top_lines[-1] if top_lines else ''
2678 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2679 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2680 top_lines.append('')
2681 top_lines.append(line)
2682 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002683
tandrii99a72f22016-08-17 14:33:24 -07002684 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002685 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002687 reviewers = [match.group(2).strip()
2688 for match in matches
2689 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002690 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002691
bradnelsond975b302016-10-23 12:20:23 -07002692 def get_cced(self):
2693 """Retrieves the list of reviewers."""
2694 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2695 cced = [match.group(2).strip() for match in matches if match]
2696 return cleanup_list(cced)
2697
Nodir Turakulov23b82142017-11-16 11:04:25 -08002698 def get_hash_tags(self):
2699 """Extracts and sanitizes a list of Gerrit hashtags."""
2700 subject = (self._description_lines or ('',))[0]
2701 subject = re.sub(
2702 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2703
2704 tags = []
2705 start = 0
2706 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2707 while True:
2708 m = bracket_exp.match(subject, start)
2709 if not m:
2710 break
2711 tags.append(self.sanitize_hash_tag(m.group(1)))
2712 start = m.end()
2713
2714 if not tags:
2715 # Try "Tag: " prefix.
2716 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2717 if m:
2718 tags.append(self.sanitize_hash_tag(m.group(1)))
2719 return tags
2720
2721 @classmethod
2722 def sanitize_hash_tag(cls, tag):
2723 """Returns a sanitized Gerrit hash tag.
2724
2725 A sanitized hashtag can be used as a git push refspec parameter value.
2726 """
2727 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2728
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002729
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002730def FindCodereviewSettingsFile(filename='codereview.settings'):
2731 """Finds the given file starting in the cwd and going up.
2732
2733 Only looks up to the top of the repository unless an
2734 'inherit-review-settings-ok' file exists in the root of the repository.
2735 """
2736 inherit_ok_file = 'inherit-review-settings-ok'
2737 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002738 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002739 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2740 root = '/'
2741 while True:
2742 if filename in os.listdir(cwd):
2743 if os.path.isfile(os.path.join(cwd, filename)):
2744 return open(os.path.join(cwd, filename))
2745 if cwd == root:
2746 break
2747 cwd = os.path.dirname(cwd)
2748
2749
2750def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002751 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002752 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002753
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002754 def SetProperty(name, setting, unset_error_ok=False):
2755 fullname = 'rietveld.' + name
2756 if setting in keyvals:
2757 RunGit(['config', fullname, keyvals[setting]])
2758 else:
2759 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2760
tandrii48df5812016-10-17 03:55:37 -07002761 if not keyvals.get('GERRIT_HOST', False):
2762 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002763 # Only server setting is required. Other settings can be absent.
2764 # In that case, we ignore errors raised during option deletion attempt.
2765 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2766 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2767 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002768 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002769 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2770 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002771 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2772 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002773 SetProperty(
2774 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002775
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002776 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002777 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002778
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002779 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002780 RunGit(['config', 'gerrit.squash-uploads',
2781 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002782
tandrii@chromium.org28253532016-04-14 13:46:56 +00002783 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002784 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002785 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002787 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002788 # should be of the form
2789 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2790 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002791 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2792 keyvals['ORIGIN_URL_CONFIG']])
2793
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002794
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002795def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002796 """Downloads a network object to a local file, like urllib.urlretrieve.
2797
2798 This is necessary because urllib is broken for SSL connections via a proxy.
2799 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002800 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002801 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002802
2803
ukai@chromium.org712d6102013-11-27 00:52:58 +00002804def hasSheBang(fname):
2805 """Checks fname is a #! script."""
2806 with open(fname) as f:
2807 return f.read(2).startswith('#!')
2808
2809
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002810def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002811 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002812
2813 Args:
2814 force: True to update hooks. False to install hooks if not present.
2815 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002816 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002817 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2818 if not os.access(dst, os.X_OK):
2819 if os.path.exists(dst):
2820 if not force:
2821 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002822 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002823 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002824 if not hasSheBang(dst):
2825 DieWithError('Not a script: %s\n'
2826 'You need to download from\n%s\n'
2827 'into .git/hooks/commit-msg and '
2828 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002829 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2830 except Exception:
2831 if os.path.exists(dst):
2832 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002833 DieWithError('\nFailed to download hooks.\n'
2834 'You need to download from\n%s\n'
2835 'into .git/hooks/commit-msg and '
2836 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002837
2838
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002839class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002840 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002841
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002842 _GOOGLESOURCE = 'googlesource.com'
2843
2844 def __init__(self):
2845 # Cached list of [host, identity, source], where source is either
2846 # .gitcookies or .netrc.
2847 self._all_hosts = None
2848
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002849 def ensure_configured_gitcookies(self):
2850 """Runs checks and suggests fixes to make git use .gitcookies from default
2851 path."""
2852 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2853 configured_path = RunGitSilent(
2854 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002855 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002856 if configured_path:
2857 self._ensure_default_gitcookies_path(configured_path, default)
2858 else:
2859 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002860
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002861 @staticmethod
2862 def _ensure_default_gitcookies_path(configured_path, default_path):
2863 assert configured_path
2864 if configured_path == default_path:
2865 print('git is already configured to use your .gitcookies from %s' %
2866 configured_path)
2867 return
2868
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002869 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002870 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2871 (configured_path, default_path))
2872
2873 if not os.path.exists(configured_path):
2874 print('However, your configured .gitcookies file is missing.')
2875 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2876 action='reconfigure')
2877 RunGit(['config', '--global', 'http.cookiefile', default_path])
2878 return
2879
2880 if os.path.exists(default_path):
2881 print('WARNING: default .gitcookies file already exists %s' %
2882 default_path)
2883 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2884 default_path)
2885
2886 confirm_or_exit('Move existing .gitcookies to default location?',
2887 action='move')
2888 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002889 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002890 print('Moved and reconfigured git to use .gitcookies from %s' %
2891 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002892
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002893 @staticmethod
2894 def _configure_gitcookies_path(default_path):
2895 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2896 if os.path.exists(netrc_path):
2897 print('You seem to be using outdated .netrc for git credentials: %s' %
2898 netrc_path)
2899 print('This tool will guide you through setting up recommended '
2900 '.gitcookies store for git credentials.\n'
2901 '\n'
2902 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2903 ' git config --global --unset http.cookiefile\n'
2904 ' mv %s %s.backup\n\n' % (default_path, default_path))
2905 confirm_or_exit(action='setup .gitcookies')
2906 RunGit(['config', '--global', 'http.cookiefile', default_path])
2907 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002908
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002909 def get_hosts_with_creds(self, include_netrc=False):
2910 if self._all_hosts is None:
2911 a = gerrit_util.CookiesAuthenticator()
2912 self._all_hosts = [
2913 (h, u, s)
2914 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002915 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2916 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002917 )
2918 if h.endswith(self._GOOGLESOURCE)
2919 ]
2920
2921 if include_netrc:
2922 return self._all_hosts
2923 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2924
2925 def print_current_creds(self, include_netrc=False):
2926 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2927 if not hosts:
2928 print('No Git/Gerrit credentials found')
2929 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002930 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002931 header = [('Host', 'User', 'Which file'),
2932 ['=' * l for l in lengths]]
2933 for row in (header + hosts):
2934 print('\t'.join((('%%+%ds' % l) % s)
2935 for l, s in zip(lengths, row)))
2936
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002937 @staticmethod
2938 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002939 """Parses identity "git-<username>.domain" into <username> and domain."""
2940 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002941 # distinguishable from sub-domains. But we do know typical domains:
2942 if identity.endswith('.chromium.org'):
2943 domain = 'chromium.org'
2944 username = identity[:-len('.chromium.org')]
2945 else:
2946 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002947 if username.startswith('git-'):
2948 username = username[len('git-'):]
2949 return username, domain
2950
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002951 def _canonical_git_googlesource_host(self, host):
2952 """Normalizes Gerrit hosts (with '-review') to Git host."""
2953 assert host.endswith(self._GOOGLESOURCE)
2954 # Prefix doesn't include '.' at the end.
2955 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2956 if prefix.endswith('-review'):
2957 prefix = prefix[:-len('-review')]
2958 return prefix + '.' + self._GOOGLESOURCE
2959
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002960 def _canonical_gerrit_googlesource_host(self, host):
2961 git_host = self._canonical_git_googlesource_host(host)
2962 prefix = git_host.split('.', 1)[0]
2963 return prefix + '-review.' + self._GOOGLESOURCE
2964
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002965 def _get_counterpart_host(self, host):
2966 assert host.endswith(self._GOOGLESOURCE)
2967 git = self._canonical_git_googlesource_host(host)
2968 gerrit = self._canonical_gerrit_googlesource_host(git)
2969 return git if gerrit == host else gerrit
2970
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002971 def has_generic_host(self):
2972 """Returns whether generic .googlesource.com has been configured.
2973
2974 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2975 """
2976 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2977 if host == '.' + self._GOOGLESOURCE:
2978 return True
2979 return False
2980
2981 def _get_git_gerrit_identity_pairs(self):
2982 """Returns map from canonic host to pair of identities (Git, Gerrit).
2983
2984 One of identities might be None, meaning not configured.
2985 """
2986 host_to_identity_pairs = {}
2987 for host, identity, _ in self.get_hosts_with_creds():
2988 canonical = self._canonical_git_googlesource_host(host)
2989 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2990 idx = 0 if canonical == host else 1
2991 pair[idx] = identity
2992 return host_to_identity_pairs
2993
2994 def get_partially_configured_hosts(self):
2995 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002996 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002997 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002998 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002999
3000 def get_conflicting_hosts(self):
3001 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003002 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003003 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003004 if None not in (i1, i2) and i1 != i2)
3005
3006 def get_duplicated_hosts(self):
3007 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003008 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003009
3010 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3011 'chromium.googlesource.com': 'chromium.org',
3012 'chrome-internal.googlesource.com': 'google.com',
3013 }
3014
3015 def get_hosts_with_wrong_identities(self):
3016 """Finds hosts which **likely** reference wrong identities.
3017
3018 Note: skips hosts which have conflicting identities for Git and Gerrit.
3019 """
3020 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003021 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003022 pair = self._get_git_gerrit_identity_pairs().get(host)
3023 if pair and pair[0] == pair[1]:
3024 _, domain = self._parse_identity(pair[0])
3025 if domain != expected:
3026 hosts.add(host)
3027 return hosts
3028
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003029 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003030 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003031 hosts = sorted(hosts)
3032 assert hosts
3033 if extra_column_func is None:
3034 extras = [''] * len(hosts)
3035 else:
3036 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003037 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3038 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003039 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003040 lines.append(tmpl % he)
3041 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003042
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003043 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003044 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003045 yield ('.googlesource.com wildcard record detected',
3046 ['Chrome Infrastructure team recommends to list full host names '
3047 'explicitly.'],
3048 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003049
3050 dups = self.get_duplicated_hosts()
3051 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003052 yield ('The following hosts were defined twice',
3053 self._format_hosts(dups),
3054 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003055
3056 partial = self.get_partially_configured_hosts()
3057 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003058 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3059 'These hosts are missing',
3060 self._format_hosts(partial, lambda host: 'but %s defined' %
3061 self._get_counterpart_host(host)),
3062 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003063
3064 conflicting = self.get_conflicting_hosts()
3065 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003066 yield ('The following Git hosts have differing credentials from their '
3067 'Gerrit counterparts',
3068 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3069 tuple(self._get_git_gerrit_identity_pairs()[host])),
3070 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003071
3072 wrong = self.get_hosts_with_wrong_identities()
3073 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003074 yield ('These hosts likely use wrong identity',
3075 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3076 (self._get_git_gerrit_identity_pairs()[host][0],
3077 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3078 wrong)
3079
3080 def find_and_report_problems(self):
3081 """Returns True if there was at least one problem, else False."""
3082 found = False
3083 bad_hosts = set()
3084 for title, sublines, hosts in self._find_problems():
3085 if not found:
3086 found = True
3087 print('\n\n.gitcookies problem report:\n')
3088 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003089 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003090 if sublines:
3091 print()
3092 print(' %s' % '\n '.join(sublines))
3093 print()
3094
3095 if bad_hosts:
3096 assert found
3097 print(' You can manually remove corresponding lines in your %s file and '
3098 'visit the following URLs with correct account to generate '
3099 'correct credential lines:\n' %
3100 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3101 print(' %s' % '\n '.join(sorted(set(
3102 gerrit_util.CookiesAuthenticator().get_new_password_url(
3103 self._canonical_git_googlesource_host(host))
3104 for host in bad_hosts
3105 ))))
3106 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003107
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003108
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003109@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003110def CMDcreds_check(parser, args):
3111 """Checks credentials and suggests changes."""
3112 _, _ = parser.parse_args(args)
3113
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003114 # Code below checks .gitcookies. Abort if using something else.
3115 authn = gerrit_util.Authenticator.get()
3116 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003117 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003118 'This command is not designed for bot environment. It checks '
3119 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003120 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3121 if isinstance(authn, gerrit_util.GceAuthenticator):
3122 message += (
3123 '\n'
3124 'If you need to run this on GCE or a cloudtop instance, '
3125 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3126 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003127
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003128 checker = _GitCookiesChecker()
3129 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003130
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003131 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003132 checker.print_current_creds(include_netrc=True)
3133
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003134 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003135 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003136 return 0
3137 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003138
3139
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003140@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003141def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003142 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003143 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003144 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003145 _, args = parser.parse_args(args)
3146 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003147 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003148 return RunGit(['config', 'branch.%s.base-url' % branch],
3149 error_ok=False).strip()
3150 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003151 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003152 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3153 error_ok=False).strip()
3154
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003155
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003156def color_for_status(status):
3157 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003158 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003159 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003160 'unsent': BOLD + Fore.YELLOW,
3161 'waiting': BOLD + Fore.RED,
3162 'reply': BOLD + Fore.YELLOW,
3163 'not lgtm': BOLD + Fore.RED,
3164 'lgtm': BOLD + Fore.GREEN,
3165 'commit': BOLD + Fore.MAGENTA,
3166 'closed': BOLD + Fore.CYAN,
3167 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003168 }.get(status, Fore.WHITE)
3169
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003170
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003171def get_cl_statuses(changes, fine_grained, max_processes=None):
3172 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003173
3174 If fine_grained is true, this will fetch CL statuses from the server.
3175 Otherwise, simply indicate if there's a matching url for the given branches.
3176
3177 If max_processes is specified, it is used as the maximum number of processes
3178 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3179 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003180
3181 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003182 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003183 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003184 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003185
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003186 if not fine_grained:
3187 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003188 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003189 for cl in changes:
3190 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003191 return
3192
3193 # First, sort out authentication issues.
3194 logging.debug('ensuring credentials exist')
3195 for cl in changes:
3196 cl.EnsureAuthenticated(force=False, refresh=True)
3197
3198 def fetch(cl):
3199 try:
3200 return (cl, cl.GetStatus())
3201 except:
3202 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003203 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003204 raise
3205
3206 threads_count = len(changes)
3207 if max_processes:
3208 threads_count = max(1, min(threads_count, max_processes))
3209 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3210
Edward Lemur61bf4172020-02-24 23:22:37 +00003211 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003212 fetched_cls = set()
3213 try:
3214 it = pool.imap_unordered(fetch, changes).__iter__()
3215 while True:
3216 try:
3217 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003218 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003219 break
3220 fetched_cls.add(cl)
3221 yield cl, status
3222 finally:
3223 pool.close()
3224
3225 # Add any branches that failed to fetch.
3226 for cl in set(changes) - fetched_cls:
3227 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003228
rmistry@google.com2dd99862015-06-22 12:22:18 +00003229
Jose Lopes3863fc52020-04-07 17:00:25 +00003230def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003231 """Uploads CLs of local branches that are dependents of the current branch.
3232
3233 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003234
3235 test1 -> test2.1 -> test3.1
3236 -> test3.2
3237 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003238
3239 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3240 run on the dependent branches in this order:
3241 test2.1, test3.1, test3.2, test2.2, test3.3
3242
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003243 Note: This function does not rebase your local dependent branches. Use it
3244 when you make a change to the parent branch that will not conflict
3245 with its dependent branches, and you would like their dependencies
3246 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003247 """
3248 if git_common.is_dirty_git_tree('upload-branch-deps'):
3249 return 1
3250
3251 root_branch = cl.GetBranch()
3252 if root_branch is None:
3253 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3254 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003255 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003256 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3257 'patchset dependencies without an uploaded CL.')
3258
3259 branches = RunGit(['for-each-ref',
3260 '--format=%(refname:short) %(upstream:short)',
3261 'refs/heads'])
3262 if not branches:
3263 print('No local branches found.')
3264 return 0
3265
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003266 # Create a dictionary of all local branches to the branches that are
3267 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003268 tracked_to_dependents = collections.defaultdict(list)
3269 for b in branches.splitlines():
3270 tokens = b.split()
3271 if len(tokens) == 2:
3272 branch_name, tracked = tokens
3273 tracked_to_dependents[tracked].append(branch_name)
3274
vapiera7fbd5a2016-06-16 09:17:49 -07003275 print()
3276 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003277 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003278
rmistry@google.com2dd99862015-06-22 12:22:18 +00003279 def traverse_dependents_preorder(branch, padding=''):
3280 dependents_to_process = tracked_to_dependents.get(branch, [])
3281 padding += ' '
3282 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003283 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003284 dependents.append(dependent)
3285 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003286
rmistry@google.com2dd99862015-06-22 12:22:18 +00003287 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003288 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003289
3290 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003291 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003292 return 0
3293
Jose Lopes3863fc52020-04-07 17:00:25 +00003294 if not force:
3295 confirm_or_exit('This command will checkout all dependent branches and run '
3296 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003297
rmistry@google.com2dd99862015-06-22 12:22:18 +00003298 # Record all dependents that failed to upload.
3299 failures = {}
3300 # Go through all dependents, checkout the branch and upload.
3301 try:
3302 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003303 print()
3304 print('--------------------------------------')
3305 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003306 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003307 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003308 try:
3309 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003310 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003311 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003312 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003313 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003314 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003315 finally:
3316 # Swap back to the original root branch.
3317 RunGit(['checkout', '-q', root_branch])
3318
vapiera7fbd5a2016-06-16 09:17:49 -07003319 print()
3320 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003321 for dependent_branch in dependents:
3322 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003323 print(' %s : %s' % (dependent_branch, upload_status))
3324 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003325
3326 return 0
3327
3328
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003329def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003330 """Given a proposed tag name, returns a tag name that is guaranteed to be
3331 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3332 or 'foo-3', and so on."""
3333
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003334 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003335 for suffix_num in itertools.count(1):
3336 if suffix_num == 1:
3337 to_check = proposed_tag
3338 else:
3339 to_check = '%s-%d' % (proposed_tag, suffix_num)
3340
3341 if to_check not in existing_tags:
3342 return to_check
3343
3344
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003345@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003346def CMDarchive(parser, args):
3347 """Archives and deletes branches associated with closed changelists."""
3348 parser.add_option(
3349 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003350 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003351 parser.add_option(
3352 '-f', '--force', action='store_true',
3353 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003354 parser.add_option(
3355 '-d', '--dry-run', action='store_true',
3356 help='Skip the branch tagging and removal steps.')
3357 parser.add_option(
3358 '-t', '--notags', action='store_true',
3359 help='Do not tag archived branches. '
3360 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003361 parser.add_option(
3362 '-p',
3363 '--pattern',
3364 default='git-cl-archived-{issue}-{branch}',
3365 help='Format string for archive tags. '
3366 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003367
kmarshall3bff56b2016-06-06 18:31:47 -07003368 options, args = parser.parse_args(args)
3369 if args:
3370 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003371
3372 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3373 if not branches:
3374 return 0
3375
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003376 tags = RunGit(['for-each-ref', '--format=%(refname)',
3377 'refs/tags']).splitlines() or []
3378 tags = [t.split('/')[-1] for t in tags]
3379
vapiera7fbd5a2016-06-16 09:17:49 -07003380 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003381 changes = [Changelist(branchref=b)
3382 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003383 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3384 statuses = get_cl_statuses(changes,
3385 fine_grained=True,
3386 max_processes=options.maxjobs)
3387 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003388 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3389 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003390 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003391 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003392 proposal.sort()
3393
3394 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003395 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003396 return 0
3397
Edward Lemur85153282020-02-14 22:06:29 +00003398 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003399
vapiera7fbd5a2016-06-16 09:17:49 -07003400 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003401 if options.notags:
3402 for next_item in proposal:
3403 print(' ' + next_item[0])
3404 else:
3405 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3406 for next_item in proposal:
3407 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003408
kmarshall9249e012016-08-23 12:02:16 -07003409 # Quit now on precondition failure or if instructed by the user, either
3410 # via an interactive prompt or by command line flags.
3411 if options.dry_run:
3412 print('\nNo changes were made (dry run).\n')
3413 return 0
3414 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003415 print('You are currently on a branch \'%s\' which is associated with a '
3416 'closed codereview issue, so archive cannot proceed. Please '
3417 'checkout another branch and run this command again.' %
3418 current_branch)
3419 return 1
kmarshall9249e012016-08-23 12:02:16 -07003420 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003421 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003422 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003423 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003424 return 1
3425
3426 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003427 if not options.notags:
3428 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003429
3430 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3431 # Clean up the tag if we failed to delete the branch.
3432 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003433
vapiera7fbd5a2016-06-16 09:17:49 -07003434 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003435
3436 return 0
3437
3438
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003439@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003440def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003441 """Show status of changelists.
3442
3443 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003444 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003445 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003446 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003447 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003448 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003449 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003450 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003451
3452 Also see 'git cl comments'.
3453 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003454 parser.add_option(
3455 '--no-branch-color',
3456 action='store_true',
3457 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003458 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003459 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003460 parser.add_option('-f', '--fast', action='store_true',
3461 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003462 parser.add_option(
3463 '-j', '--maxjobs', action='store', type=int,
3464 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003465 parser.add_option(
3466 '-i', '--issue', type=int,
3467 help='Operate on this issue instead of the current branch\'s implicit '
3468 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003469 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003470 if args:
3471 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003472
iannuccie53c9352016-08-17 14:40:40 -07003473 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003474 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003475
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003476 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003477 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003478 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003479 if cl.GetIssue():
3480 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003481 elif options.field == 'id':
3482 issueid = cl.GetIssue()
3483 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003484 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003485 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003486 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003487 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003489 elif options.field == 'status':
3490 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003491 elif options.field == 'url':
3492 url = cl.GetIssueURL()
3493 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003494 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003495 return 0
3496
3497 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3498 if not branches:
3499 print('No local branch found.')
3500 return 0
3501
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003502 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003503 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003504 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003505 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003506 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003507 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003508 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003509
Edward Lemur85153282020-02-14 22:06:29 +00003510 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003511
3512 def FormatBranchName(branch, colorize=False):
3513 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3514 an asterisk when it is the current branch."""
3515
3516 asterisk = ""
3517 color = Fore.RESET
3518 if branch == current_branch:
3519 asterisk = "* "
3520 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003521 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003522
3523 if colorize:
3524 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003525 return asterisk + branch_name
3526
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003527 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003528
3529 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003530 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3531 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003532 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003533 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003534 branch_statuses[c.GetBranch()] = status
3535 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003536 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003537 if url and (not status or status == 'error'):
3538 # The issue probably doesn't exist anymore.
3539 url += ' (broken)'
3540
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003541 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003542 # Turn off bold as well as colors.
3543 END = '\033[0m'
3544 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003545 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003546 color = ''
3547 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003548 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003549
Alan Cuttera3be9a52019-03-04 18:50:33 +00003550 branch_display = FormatBranchName(branch)
3551 padding = ' ' * (alignment - len(branch_display))
3552 if not options.no_branch_color:
3553 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003554
Alan Cuttera3be9a52019-03-04 18:50:33 +00003555 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3556 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003557
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003559 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003560 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003561 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003562 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003563 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003564 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003565 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003567 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003568 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003569 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003570 return 0
3571
3572
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003573def colorize_CMDstatus_doc():
3574 """To be called once in main() to add colors to git cl status help."""
3575 colors = [i for i in dir(Fore) if i[0].isupper()]
3576
3577 def colorize_line(line):
3578 for color in colors:
3579 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003580 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003581 indent = len(line) - len(line.lstrip(' ')) + 1
3582 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3583 return line
3584
3585 lines = CMDstatus.__doc__.splitlines()
3586 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3587
3588
phajdan.jre328cf92016-08-22 04:12:17 -07003589def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003590 if path == '-':
3591 json.dump(contents, sys.stdout)
3592 else:
3593 with open(path, 'w') as f:
3594 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003595
3596
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003597@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003598@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003599def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003600 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003601
3602 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003603 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003604 parser.add_option('-r', '--reverse', action='store_true',
3605 help='Lookup the branch(es) for the specified issues. If '
3606 'no issues are specified, all branches with mapped '
3607 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003608 parser.add_option('--json',
3609 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003610 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003611
dnj@chromium.org406c4402015-03-03 17:22:28 +00003612 if options.reverse:
3613 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003614 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003615 # Reverse issue lookup.
3616 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003617
3618 git_config = {}
3619 for config in RunGit(['config', '--get-regexp',
3620 r'branch\..*issue']).splitlines():
3621 name, _space, val = config.partition(' ')
3622 git_config[name] = val
3623
dnj@chromium.org406c4402015-03-03 17:22:28 +00003624 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003625 issue = git_config.get(
3626 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003627 if issue:
3628 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003629 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003630 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003631 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003632 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003633 try:
3634 issue_num = int(issue)
3635 except ValueError:
3636 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003637 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003638 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003639 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003640 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003641 if options.json:
3642 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003643 return 0
3644
3645 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003646 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003647 if not issue.valid:
3648 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3649 'or no argument to list it.\n'
3650 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003651 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003652 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003653 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003654 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003655 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3656 if options.json:
3657 write_json(options.json, {
3658 'issue': cl.GetIssue(),
3659 'issue_url': cl.GetIssueURL(),
3660 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003661 return 0
3662
3663
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003664@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003665def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003666 """Shows or posts review comments for any changelist."""
3667 parser.add_option('-a', '--add-comment', dest='comment',
3668 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003669 parser.add_option('-p', '--publish', action='store_true',
3670 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003671 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003672 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003673 parser.add_option('-m', '--machine-readable', dest='readable',
3674 action='store_false', default=True,
3675 help='output comments in a format compatible with '
3676 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003677 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003678 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003679 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003680
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003681 issue = None
3682 if options.issue:
3683 try:
3684 issue = int(options.issue)
3685 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003686 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003687
Edward Lemur934836a2019-09-09 20:16:54 +00003688 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003689
3690 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003691 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003692 return 0
3693
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003694 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3695 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003696 for comment in summary:
3697 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003698 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003699 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003700 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003701 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003702 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003703 elif comment.autogenerated:
3704 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003705 else:
3706 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003707 print('\n%s%s %s%s\n%s' % (
3708 color,
3709 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3710 comment.sender,
3711 Fore.RESET,
3712 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3713
smut@google.comc85ac942015-09-15 16:34:43 +00003714 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003715 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003716 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003717 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3718 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003719 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003720 return 0
3721
3722
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003723@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003724@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003725def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003726 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003727 parser.add_option('-d', '--display', action='store_true',
3728 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003729 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003730 help='New description to set for this issue (- for stdin, '
3731 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003732 parser.add_option('-f', '--force', action='store_true',
3733 help='Delete any unpublished Gerrit edits for this issue '
3734 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003735
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003736 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003737
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003738 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003739 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003740 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003741 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003742 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003743
Edward Lemur934836a2019-09-09 20:16:54 +00003744 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003745 if target_issue_arg:
3746 kwargs['issue'] = target_issue_arg.issue
3747 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003748
3749 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003750 if not cl.GetIssue():
3751 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003752
Edward Lemur678a6842019-10-03 22:25:05 +00003753 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003754 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003755
Edward Lemur6c6827c2020-02-06 21:15:18 +00003756 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003757
smut@google.com34fb6b12015-07-13 20:03:26 +00003758 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003759 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003760 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003761
3762 if options.new_description:
3763 text = options.new_description
3764 if text == '-':
3765 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003766 elif text == '+':
3767 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003768 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003769
3770 description.set_description(text)
3771 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003772 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003773 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003774 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003775 return 0
3776
3777
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003778@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003779def CMDlint(parser, args):
3780 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003781 parser.add_option('--filter', action='append', metavar='-x,+y',
3782 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003783 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003784
3785 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003786 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003787 try:
3788 import cpplint
3789 import cpplint_chromium
3790 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003791 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003792 return 1
3793
3794 # Change the current working directory before calling lint so that it
3795 # shows the correct base.
3796 previous_cwd = os.getcwd()
3797 os.chdir(settings.GetRoot())
3798 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003799 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003800 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003801 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003803 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003804
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003805 # Process cpplint arguments, if any.
3806 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3807 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003808 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003809
Lei Zhang379d1ad2020-07-15 19:40:06 +00003810 include_regex = re.compile(settings.GetLintRegex())
3811 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003812 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3813 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003814 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003816 continue
3817
3818 if ignore_regex.match(filename):
3819 print('Ignoring file %s' % filename)
3820 continue
3821
3822 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3823 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003824 finally:
3825 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003827 if cpplint._cpplint_state.error_count != 0:
3828 return 1
3829 return 0
3830
3831
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003832@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003833def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003834 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003835 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003836 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003837 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003838 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003839 parser.add_option('--all', action='store_true',
3840 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003841 parser.add_option('--parallel', action='store_true',
3842 help='Run all tests specified by input_api.RunTests in all '
3843 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003844 parser.add_option('--resultdb', action='store_true',
3845 help='Run presubmit checks in the ResultSink environment '
3846 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003847 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003848 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849
sbc@chromium.org71437c02015-04-09 19:29:40 +00003850 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003851 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852 return 1
3853
Edward Lemur934836a2019-09-09 20:16:54 +00003854 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003855 if args:
3856 base_branch = args[0]
3857 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003858 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003859 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003861 if cl.GetIssue():
3862 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003863 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003864 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003865
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003866 cl.RunHook(
3867 committing=not options.upload,
3868 may_prompt=False,
3869 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003870 parallel=options.parallel,
3871 upstream=base_branch,
3872 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003873 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003874 resultdb=options.resultdb,
3875 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003876 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003877
3878
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003879def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003880 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003881
3882 Works the same way as
3883 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3884 but can be called on demand on all platforms.
3885
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003886 The basic idea is to generate git hash of a state of the tree, original
3887 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003888 """
3889 lines = []
3890 tree_hash = RunGitSilent(['write-tree'])
3891 lines.append('tree %s' % tree_hash.strip())
3892 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3893 if code == 0:
3894 lines.append('parent %s' % parent.strip())
3895 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3896 lines.append('author %s' % author.strip())
3897 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3898 lines.append('committer %s' % committer.strip())
3899 lines.append('')
3900 # Note: Gerrit's commit-hook actually cleans message of some lines and
3901 # whitespace. This code is not doing this, but it clearly won't decrease
3902 # entropy.
3903 lines.append(message)
3904 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003905 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003906 return 'I%s' % change_hash.strip()
3907
3908
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003909def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003910 """Computes the remote branch ref to use for the CL.
3911
3912 Args:
3913 remote (str): The git remote for the CL.
3914 remote_branch (str): The git remote branch for the CL.
3915 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003916 """
3917 if not (remote and remote_branch):
3918 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003919
wittman@chromium.org455dc922015-01-26 20:15:50 +00003920 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003921 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003922 # refs, which are then translated into the remote full symbolic refs
3923 # below.
3924 if '/' not in target_branch:
3925 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3926 else:
3927 prefix_replacements = (
3928 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3929 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3930 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3931 )
3932 match = None
3933 for regex, replacement in prefix_replacements:
3934 match = re.search(regex, target_branch)
3935 if match:
3936 remote_branch = target_branch.replace(match.group(0), replacement)
3937 break
3938 if not match:
3939 # This is a branch path but not one we recognize; use as-is.
3940 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003941 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3942 # Handle the refs that need to land in different refs.
3943 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003944
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003945 # Migration to new default branch, only if available on remote.
3946 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
3947 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
3948 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
3949 stderr=subprocess2.PIPE):
3950 # TODO(crbug.com/ID): Print location to local git migration script.
3951 print("WARNING: Using new branch name %s instead of %s" % (
3952 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
3953 remote_branch = DEFAULT_NEW_BRANCH
3954
wittman@chromium.org455dc922015-01-26 20:15:50 +00003955 # Create the true path to the remote branch.
3956 # Does the following translation:
3957 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003958 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00003959 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3960 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3961 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3962 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3963 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3964 'refs/heads/')
3965 elif remote_branch.startswith('refs/remotes/branch-heads'):
3966 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003967
wittman@chromium.org455dc922015-01-26 20:15:50 +00003968 return remote_branch
3969
3970
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003971def cleanup_list(l):
3972 """Fixes a list so that comma separated items are put as individual items.
3973
3974 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3975 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3976 """
3977 items = sum((i.split(',') for i in l), [])
3978 stripped_items = (i.strip() for i in items)
3979 return sorted(filter(None, stripped_items))
3980
3981
Aaron Gable4db38df2017-11-03 14:59:07 -07003982@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003983@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003984def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003985 """Uploads the current changelist to codereview.
3986
3987 Can skip dependency patchset uploads for a branch by running:
3988 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003989 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003990 git config --unset branch.branch_name.skip-deps-uploads
3991 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003992
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003993 If the name of the checked out branch starts with "bug-" or "fix-" followed
3994 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003995 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003996
3997 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003998 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003999 [git-cl] add support for hashtags
4000 Foo bar: implement foo
4001 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004002 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004003 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4004 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004005 parser.add_option('--bypass-watchlists', action='store_true',
4006 dest='bypass_watchlists',
4007 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004008 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004009 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004010 parser.add_option('--message', '-m', dest='message',
4011 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004012 parser.add_option('-b', '--bug',
4013 help='pre-populate the bug number(s) for this issue. '
4014 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004015 parser.add_option('--message-file', dest='message_file',
4016 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004017 parser.add_option('--title', '-t', dest='title',
4018 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004019 parser.add_option('-T', '--skip-title', action='store_true',
4020 dest='skip_title',
4021 help='Use the most recent commit message as the title of '
4022 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004023 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004024 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004025 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004026 parser.add_option('--tbrs',
4027 action='append', default=[],
4028 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004029 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004030 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004031 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004032 parser.add_option('--hashtag', dest='hashtags',
4033 action='append', default=[],
4034 help=('Gerrit hashtag for new CL; '
4035 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004036 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004037 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004038 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004039 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004040 metavar='TARGET',
4041 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004042 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004043 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004044 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004045 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004046 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004047 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004048 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004049 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4050 const='TBR', help='add a set of OWNERS to TBR')
4051 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4052 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004053 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004054 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004055 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004056 'implies --send-mail')
4057 parser.add_option('-d', '--cq-dry-run',
4058 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004059 help='Send the patchset to do a CQ dry run right after '
4060 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004061 parser.add_option('--preserve-tryjobs', action='store_true',
4062 help='instruct the CQ to let tryjobs running even after '
4063 'new patchsets are uploaded instead of canceling '
4064 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004065 parser.add_option('--dependencies', action='store_true',
4066 help='Uploads CLs of all the local branches that depend on '
4067 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004068 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4069 help='Sends your change to the CQ after an approval. Only '
4070 'works on repos that have the Auto-Submit label '
4071 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004072 parser.add_option('--parallel', action='store_true',
4073 help='Run all tests specified by input_api.RunTests in all '
4074 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004075 parser.add_option('--no-autocc', action='store_true',
4076 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004077 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004078 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004079 parser.add_option('-R', '--retry-failed', action='store_true',
4080 help='Retry failed tryjobs from old patchset immediately '
4081 'after uploading new patchset. Cannot be used with '
4082 '--use-commit-queue or --cq-dry-run.')
4083 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4084 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004085 parser.add_option('--fixed', '-x',
4086 help='List of bugs that will be commented on and marked '
4087 'fixed (pre-populates "Fixed:" tag). Same format as '
4088 '-b option / "Bug:" tag. If fixing several issues, '
4089 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004090 parser.add_option('--edit-description', action='store_true', default=False,
4091 help='Modify description before upload. Cannot be used '
4092 'with --force. It is a noop when --no-squash is set '
4093 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004094 parser.add_option('--git-completion-helper', action="store_true",
4095 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004096 parser.add_option('--resultdb', action='store_true',
4097 help='Run presubmit checks in the ResultSink environment '
4098 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004099 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004100
rmistry@google.com2dd99862015-06-22 12:22:18 +00004101 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004102 (options, args) = parser.parse_args(args)
4103
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004104 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004105 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4106 if opt.help != optparse.SUPPRESS_HELP))
4107 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004108
sbc@chromium.org71437c02015-04-09 19:29:40 +00004109 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004110 return 1
4111
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004112 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004113 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004114 options.cc = cleanup_list(options.cc)
4115
Josipe827b0f2020-01-30 00:07:20 +00004116 if options.edit_description and options.force:
4117 parser.error('Only one of --force and --edit-description allowed')
4118
tandriib80458a2016-06-23 12:20:07 -07004119 if options.message_file:
4120 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004121 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004122 options.message = gclient_utils.FileRead(options.message_file)
4123 options.message_file = None
4124
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004125 if ([options.cq_dry_run,
4126 options.use_commit_queue,
4127 options.retry_failed].count(True) > 1):
4128 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4129 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004130
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004131 if options.skip_title and options.title:
4132 parser.error('Only one of --title and --skip-title allowed.')
4133
Aaron Gableedbc4132017-09-11 13:22:28 -07004134 if options.use_commit_queue:
4135 options.send_mail = True
4136
Edward Lesmes0dd54822020-03-26 18:24:25 +00004137 if options.squash is None:
4138 # Load default for user, repo, squash=true, in this order.
4139 options.squash = settings.GetSquashGerritUploads()
4140
Edward Lemur934836a2019-09-09 20:16:54 +00004141 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004142 # Warm change details cache now to avoid RPCs later, reducing latency for
4143 # developers.
4144 if cl.GetIssue():
4145 cl._GetChangeDetail(
4146 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4147
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004148 if options.retry_failed and not cl.GetIssue():
4149 print('No previous patchsets, so --retry-failed has no effect.')
4150 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004151
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004152 # cl.GetMostRecentPatchset uses cached information, and can return the last
4153 # patchset before upload. Calling it here makes it clear that it's the
4154 # last patchset before upload. Note that GetMostRecentPatchset will fail
4155 # if no CL has been uploaded yet.
4156 if options.retry_failed:
4157 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004158
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004159 ret = cl.CMDUpload(options, args, orig_args)
4160
4161 if options.retry_failed:
4162 if ret != 0:
4163 print('Upload failed, so --retry-failed has no effect.')
4164 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004165 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004166 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004167 jobs = _filter_failed_for_retry(builds)
4168 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004169 print('No failed tryjobs, so --retry-failed has no effect.')
4170 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004171 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004172
4173 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004174
4175
Francois Dorayd42c6812017-05-30 15:10:20 -04004176@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004177@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004178def CMDsplit(parser, args):
4179 """Splits a branch into smaller branches and uploads CLs.
4180
4181 Creates a branch and uploads a CL for each group of files modified in the
4182 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004183 comment, the string '$directory', is replaced with the directory containing
4184 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004185 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004186 parser.add_option('-d', '--description', dest='description_file',
4187 help='A text file containing a CL description in which '
4188 '$directory will be replaced by each CL\'s directory.')
4189 parser.add_option('-c', '--comment', dest='comment_file',
4190 help='A text file containing a CL comment.')
4191 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004192 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004193 help='List the files and reviewers for each CL that would '
4194 'be created, but don\'t create branches or CLs.')
4195 parser.add_option('--cq-dry-run', action='store_true',
4196 help='If set, will do a cq dry run for each uploaded CL. '
4197 'Please be careful when doing this; more than ~10 CLs '
4198 'has the potential to overload our build '
4199 'infrastructure. Try to upload these not during high '
4200 'load times (usually 11-3 Mountain View time). Email '
4201 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004202 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4203 default=True,
4204 help='Sends your change to the CQ after an approval. Only '
4205 'works on repos that have the Auto-Submit label '
4206 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004207 options, _ = parser.parse_args(args)
4208
4209 if not options.description_file:
4210 parser.error('No --description flag specified.')
4211
4212 def WrappedCMDupload(args):
4213 return CMDupload(OptionParser(), args)
4214
Edward Lemur2c62b332020-03-12 22:12:33 +00004215 return split_cl.SplitCl(
4216 options.description_file, options.comment_file, Changelist,
4217 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4218 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004219
4220
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004221@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004222@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004223def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004224 """DEPRECATED: Used to commit the current changelist via git-svn."""
4225 message = ('git-cl no longer supports committing to SVN repositories via '
4226 'git-svn. You probably want to use `git cl land` instead.')
4227 print(message)
4228 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004229
4230
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004231@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004232@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004233def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004234 """Commits the current changelist via git.
4235
4236 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4237 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004238 """
4239 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4240 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004241 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004242 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004243 parser.add_option('--parallel', action='store_true',
4244 help='Run all tests specified by input_api.RunTests in all '
4245 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004246 parser.add_option('--resultdb', action='store_true',
4247 help='Run presubmit checks in the ResultSink environment '
4248 'and send results to the ResultDB database.')
4249 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004250 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004251
Edward Lemur934836a2019-09-09 20:16:54 +00004252 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004253
Robert Iannucci2e73d432018-03-14 01:10:47 -07004254 if not cl.GetIssue():
4255 DieWithError('You must upload the change first to Gerrit.\n'
4256 ' If you would rather have `git cl land` upload '
4257 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004258 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4259 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004260
4261
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004262@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004263@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004265 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004266 parser.add_option('-b', dest='newbranch',
4267 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004268 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004269 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004270 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004271 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004272
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004273 group = optparse.OptionGroup(
4274 parser,
4275 'Options for continuing work on the current issue uploaded from a '
4276 'different clone (e.g. different machine). Must be used independently '
4277 'from the other options. No issue number should be specified, and the '
4278 'branch must have an issue number associated with it')
4279 group.add_option('--reapply', action='store_true', dest='reapply',
4280 help='Reset the branch and reapply the issue.\n'
4281 'CAUTION: This will undo any local changes in this '
4282 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004283
4284 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004285 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004286 parser.add_option_group(group)
4287
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004288 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004289
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004290 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004291 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004292 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004293 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004294 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004295
Edward Lemur934836a2019-09-09 20:16:54 +00004296 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004297 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004298 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004299
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004300 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004301 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004302 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004303
4304 RunGit(['reset', '--hard', upstream])
4305 if options.pull:
4306 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004307
Edward Lemur678a6842019-10-03 22:25:05 +00004308 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4309 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004310
4311 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004312 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004313
Edward Lemurf38bc172019-09-03 21:02:13 +00004314 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004315 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004316 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004317
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004318 # We don't want uncommitted changes mixed up with the patch.
4319 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004320 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004321
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004322 if options.newbranch:
4323 if options.force:
4324 RunGit(['branch', '-D', options.newbranch],
4325 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004326 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004327
Edward Lemur678a6842019-10-03 22:25:05 +00004328 cl = Changelist(
4329 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004330
Edward Lemur678a6842019-10-03 22:25:05 +00004331 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004332 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004333
Edward Lemurf38bc172019-09-03 21:02:13 +00004334 return cl.CMDPatchWithParsedIssue(
4335 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004336
4337
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004338def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004339 """Fetches the tree status and returns either 'open', 'closed',
4340 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004341 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004342 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004343 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344 if status.find('closed') != -1 or status == '0':
4345 return 'closed'
4346 elif status.find('open') != -1 or status == '1':
4347 return 'open'
4348 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004349 return 'unset'
4350
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004351
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352def GetTreeStatusReason():
4353 """Fetches the tree status from a json url and returns the message
4354 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004355 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004356 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004357 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004358 status = json.loads(connection.read())
4359 connection.close()
4360 return status['message']
4361
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004362
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004363@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004364def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004365 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004366 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004367 status = GetTreeStatus()
4368 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004370 return 2
4371
vapiera7fbd5a2016-06-16 09:17:49 -07004372 print('The tree is %s' % status)
4373 print()
4374 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004375 if status != 'open':
4376 return 1
4377 return 0
4378
4379
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004380@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004381def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004382 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4383 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004384 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004385 '-b', '--bot', action='append',
4386 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4387 'times to specify multiple builders. ex: '
4388 '"-b win_rel -b win_layout". See '
4389 'the try server waterfall for the builders name and the tests '
4390 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004391 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004392 '-B', '--bucket', default='',
4393 help=('Buildbucket bucket to send the try requests.'))
4394 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004395 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004396 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004397 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004398 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004399 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004400 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004401 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004402 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004403 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004404 '--category', default='git_cl_try', help='Specify custom build category.')
4405 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004406 '--project',
4407 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004408 'in recipe to determine to which repository or directory to '
4409 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004410 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004411 '-p', '--property', dest='properties', action='append', default=[],
4412 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004413 'key2=value2 etc. The value will be treated as '
4414 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004415 'NOTE: using this may make your tryjob not usable for CQ, '
4416 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004417 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004418 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4419 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004420 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004421 parser.add_option(
4422 '-R', '--retry-failed', action='store_true', default=False,
4423 help='Retry failed jobs from the latest set of tryjobs. '
4424 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004425 parser.add_option(
4426 '-i', '--issue', type=int,
4427 help='Operate on this issue instead of the current branch\'s implicit '
4428 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004429 options, args = parser.parse_args(args)
4430
machenbach@chromium.org45453142015-09-15 08:45:22 +00004431 # Make sure that all properties are prop=value pairs.
4432 bad_params = [x for x in options.properties if '=' not in x]
4433 if bad_params:
4434 parser.error('Got properties with missing "=": %s' % bad_params)
4435
maruel@chromium.org15192402012-09-06 12:38:29 +00004436 if args:
4437 parser.error('Unknown arguments: %s' % args)
4438
Edward Lemur934836a2019-09-09 20:16:54 +00004439 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004440 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004441 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004442
Edward Lemurf38bc172019-09-03 21:02:13 +00004443 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004444 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004445
tandriie113dfd2016-10-11 10:20:12 -07004446 error_message = cl.CannotTriggerTryJobReason()
4447 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004448 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004449
Edward Lemur45768512020-03-02 19:03:14 +00004450 if options.bot:
4451 if options.retry_failed:
4452 parser.error('--bot is not compatible with --retry-failed.')
4453 if not options.bucket:
4454 parser.error('A bucket (e.g. "chromium/try") is required.')
4455
4456 triggered = [b for b in options.bot if 'triggered' in b]
4457 if triggered:
4458 parser.error(
4459 'Cannot schedule builds on triggered bots: %s.\n'
4460 'This type of bot requires an initial job from a parent (usually a '
4461 'builder). Schedule a job on the parent instead.\n' % triggered)
4462
4463 if options.bucket.startswith('.master'):
4464 parser.error('Buildbot masters are not supported.')
4465
4466 project, bucket = _parse_bucket(options.bucket)
4467 if project is None or bucket is None:
4468 parser.error('Invalid bucket: %s.' % options.bucket)
4469 jobs = sorted((project, bucket, bot) for bot in options.bot)
4470 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004471 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004472 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004473 if options.verbose:
4474 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004475 jobs = _filter_failed_for_retry(builds)
4476 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004477 print('There are no failed jobs in the latest set of jobs '
4478 '(patchset #%d), doing nothing.' % patchset)
4479 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004480 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004481 if num_builders > 10:
4482 confirm_or_exit('There are %d builders with failed builds.'
4483 % num_builders, action='continue')
4484 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004485 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004486 print('git cl try with no bots now defaults to CQ dry run.')
4487 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4488 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004489
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004490 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004491 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004492 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004493 except BuildbucketResponseException as ex:
4494 print('ERROR: %s' % ex)
4495 return 1
4496 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004497
4498
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004499@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004500def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004501 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004502 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004503 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004504 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004505 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004506 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004507 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004508 '--color', action='store_true', default=setup_color.IS_TTY,
4509 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004510 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004511 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4512 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004513 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004514 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004515 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004516 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004517 parser.add_option(
4518 '-i', '--issue', type=int,
4519 help='Operate on this issue instead of the current branch\'s implicit '
4520 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004521 options, args = parser.parse_args(args)
4522 if args:
4523 parser.error('Unrecognized args: %s' % ' '.join(args))
4524
Edward Lemur934836a2019-09-09 20:16:54 +00004525 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004526 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004527 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004528
tandrii221ab252016-10-06 08:12:04 -07004529 patchset = options.patchset
4530 if not patchset:
4531 patchset = cl.GetMostRecentPatchset()
4532 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004533 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004534 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004535 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004536 cl.GetIssue())
4537
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004538 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004539 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004540 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004541 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004542 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004543 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004544 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004545 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004546 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004547 return 0
4548
4549
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004550@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004551@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004552def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004553 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004554 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004555 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004556 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004557
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004558 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004559 if args:
4560 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004561 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004562 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004563 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004564 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004565
4566 # Clear configured merge-base, if there is one.
4567 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004568 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004569 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004570 return 0
4571
4572
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004573@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004574def CMDweb(parser, args):
4575 """Opens the current CL in the web browser."""
4576 _, args = parser.parse_args(args)
4577 if args:
4578 parser.error('Unrecognized args: %s' % ' '.join(args))
4579
4580 issue_url = Changelist().GetIssueURL()
4581 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004582 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004583 return 1
4584
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004585 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004586 # allows us to hide the "Created new window in existing browser session."
4587 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004588 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004589 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004590 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004591 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004592 os.open(os.devnull, os.O_RDWR)
4593 try:
4594 webbrowser.open(issue_url)
4595 finally:
4596 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004597 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004598 return 0
4599
4600
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004601@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004602def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004603 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004604 parser.add_option('-d', '--dry-run', action='store_true',
4605 help='trigger in dry run mode')
4606 parser.add_option('-c', '--clear', action='store_true',
4607 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004608 parser.add_option(
4609 '-i', '--issue', type=int,
4610 help='Operate on this issue instead of the current branch\'s implicit '
4611 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004612 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004613 if args:
4614 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004615 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004616 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004617
Edward Lemur934836a2019-09-09 20:16:54 +00004618 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004619 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004620 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004621 elif options.dry_run:
4622 state = _CQState.DRY_RUN
4623 else:
4624 state = _CQState.COMMIT
4625 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004626 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004627 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004628 return 0
4629
4630
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004631@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004632def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004633 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004634 parser.add_option(
4635 '-i', '--issue', type=int,
4636 help='Operate on this issue instead of the current branch\'s implicit '
4637 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004638 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004639 if args:
4640 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004641 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004642 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004643 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004644 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004645 cl.CloseIssue()
4646 return 0
4647
4648
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004649@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004650def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004651 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004652 parser.add_option(
4653 '--stat',
4654 action='store_true',
4655 dest='stat',
4656 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004657 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004658 if args:
4659 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004660
Edward Lemur934836a2019-09-09 20:16:54 +00004661 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004662 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004663 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004664 if not issue:
4665 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004666
Aaron Gablea718c3e2017-08-28 17:47:28 -07004667 base = cl._GitGetBranchConfigValue('last-upload-hash')
4668 if not base:
4669 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4670 if not base:
4671 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4672 revision_info = detail['revisions'][detail['current_revision']]
4673 fetch_info = revision_info['fetch']['http']
4674 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4675 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004676
Aaron Gablea718c3e2017-08-28 17:47:28 -07004677 cmd = ['git', 'diff']
4678 if options.stat:
4679 cmd.append('--stat')
4680 cmd.append(base)
4681 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004682
4683 return 0
4684
4685
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004686@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004687def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004688 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004689 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004690 '--ignore-current',
4691 action='store_true',
4692 help='Ignore the CL\'s current reviewers and start from scratch.')
4693 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004694 '--ignore-self',
4695 action='store_true',
4696 help='Do not consider CL\'s author as an owners.')
4697 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004698 '--no-color',
4699 action='store_true',
4700 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004701 parser.add_option(
4702 '--batch',
4703 action='store_true',
4704 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004705 # TODO: Consider moving this to another command, since other
4706 # git-cl owners commands deal with owners for a given CL.
4707 parser.add_option(
4708 '--show-all',
4709 action='store_true',
4710 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004711 options, args = parser.parse_args(args)
4712
Edward Lemur934836a2019-09-09 20:16:54 +00004713 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004714 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004715
Yang Guo6e269a02019-06-26 11:17:02 +00004716 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004717 if len(args) == 0:
4718 print('No files specified for --show-all. Nothing to do.')
4719 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004720 for arg in args:
4721 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004722 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004723 database.load_data_needed_for([arg])
4724 print('Owners for %s:' % arg)
4725 for owner in sorted(database.all_possible_owners([arg], None)):
4726 print(' - %s' % owner)
4727 return 0
4728
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004729 if args:
4730 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004731 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004732 base_branch = args[0]
4733 else:
4734 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004735 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004736
Edward Lemur2c62b332020-03-12 22:12:33 +00004737 root = settings.GetRoot()
4738 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004739
4740 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004741 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004742 print('\n'.join(db.reviewers_for(affected_files, author)))
4743 return 0
4744
Edward Lemur2c62b332020-03-12 22:12:33 +00004745 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4746 original_owner_files = {
4747 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4748 for f in owner_files}
4749
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004750 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004751 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004752 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004753 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004754 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004755 fopen=open,
4756 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004757 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004758 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004759 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004760
4761
Aiden Bennerc08566e2018-10-03 17:52:42 +00004762def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004763 """Generates a diff command."""
4764 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004765 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4766
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004767 if allow_prefix:
4768 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4769 # case that diff.noprefix is set in the user's git config.
4770 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4771 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004772 diff_cmd += ['--no-prefix']
4773
4774 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004775
4776 if args:
4777 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004778 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004779 diff_cmd.append(arg)
4780 else:
4781 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004782
4783 return diff_cmd
4784
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004785
Jamie Madill5e96ad12020-01-13 16:08:35 +00004786def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4787 """Runs clang-format-diff and sets a return value if necessary."""
4788
4789 if not clang_diff_files:
4790 return 0
4791
4792 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4793 # formatted. This is used to block during the presubmit.
4794 return_value = 0
4795
4796 # Locate the clang-format binary in the checkout
4797 try:
4798 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4799 except clang_format.NotFoundError as e:
4800 DieWithError(e)
4801
4802 if opts.full or settings.GetFormatFullByDefault():
4803 cmd = [clang_format_tool]
4804 if not opts.dry_run and not opts.diff:
4805 cmd.append('-i')
4806 if opts.dry_run:
4807 for diff_file in clang_diff_files:
4808 with open(diff_file, 'r') as myfile:
4809 code = myfile.read().replace('\r\n', '\n')
4810 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4811 stdout = stdout.replace('\r\n', '\n')
4812 if opts.diff:
4813 sys.stdout.write(stdout)
4814 if code != stdout:
4815 return_value = 2
4816 else:
4817 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4818 if opts.diff:
4819 sys.stdout.write(stdout)
4820 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004821 try:
4822 script = clang_format.FindClangFormatScriptInChromiumTree(
4823 'clang-format-diff.py')
4824 except clang_format.NotFoundError as e:
4825 DieWithError(e)
4826
Edward Lesmes89624cd2020-04-06 17:51:56 +00004827 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004828 if not opts.dry_run and not opts.diff:
4829 cmd.append('-i')
4830
4831 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004832 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004833
Edward Lesmes89624cd2020-04-06 17:51:56 +00004834 env = os.environ.copy()
4835 env['PATH'] = (
4836 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4837 stdout = RunCommand(
4838 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004839 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004840 if opts.diff:
4841 sys.stdout.write(stdout)
4842 if opts.dry_run and len(stdout) > 0:
4843 return_value = 2
4844
4845 return return_value
4846
4847
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004848def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004849 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004850 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004851
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004852
enne@chromium.org555cfe42014-01-29 18:21:39 +00004853@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004854@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004855def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004856 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004857 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004858 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004859 parser.add_option('--full', action='store_true',
4860 help='Reformat the full content of all touched files')
4861 parser.add_option('--dry-run', action='store_true',
4862 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004863 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004864 '--no-clang-format',
4865 dest='clang_format',
4866 action='store_false',
4867 default=True,
4868 help='Disables formatting of various file types using clang-format.')
4869 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004870 '--python',
4871 action='store_true',
4872 default=None,
4873 help='Enables python formatting on all python files.')
4874 parser.add_option(
4875 '--no-python',
4876 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004877 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004878 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004879 'If neither --python or --no-python are set, python files that have a '
4880 '.style.yapf file in an ancestor directory will be formatted. '
4881 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004882 parser.add_option(
4883 '--js',
4884 action='store_true',
4885 help='Format javascript code with clang-format. '
4886 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004887 parser.add_option('--diff', action='store_true',
4888 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004889 parser.add_option('--presubmit', action='store_true',
4890 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004891 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004892
Garrett Beaty91a6f332020-01-06 16:57:24 +00004893 if opts.python is not None and opts.no_python:
4894 raise parser.error('Cannot set both --python and --no-python')
4895 if opts.no_python:
4896 opts.python = False
4897
Daniel Chengc55eecf2016-12-30 03:11:02 -08004898 # Normalize any remaining args against the current path, so paths relative to
4899 # the current directory are still resolved as expected.
4900 args = [os.path.join(os.getcwd(), arg) for arg in args]
4901
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004902 # git diff generates paths against the root of the repository. Change
4903 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004904 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004905 if rel_base_path:
4906 os.chdir(rel_base_path)
4907
digit@chromium.org29e47272013-05-17 17:01:46 +00004908 # Grab the merge-base commit, i.e. the upstream commit of the current
4909 # branch when it was created or the last time it was rebased. This is
4910 # to cover the case where the user may have called "git fetch origin",
4911 # moving the origin branch to a newer commit, but hasn't rebased yet.
4912 upstream_commit = None
4913 cl = Changelist()
4914 upstream_branch = cl.GetUpstreamBranch()
4915 if upstream_branch:
4916 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4917 upstream_commit = upstream_commit.strip()
4918
4919 if not upstream_commit:
4920 DieWithError('Could not find base commit for this branch. '
4921 'Are you in detached state?')
4922
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004923 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4924 diff_output = RunGit(changed_files_cmd)
4925 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004926 # Filter out files deleted by this CL
4927 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004928
Andreas Haas417d89c2020-02-06 10:24:27 +00004929 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004930 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004931
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004932 clang_diff_files = []
4933 if opts.clang_format:
4934 clang_diff_files = [
4935 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4936 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004937 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004938 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004939
Edward Lesmes50da7702020-03-30 19:23:43 +00004940 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004941
Jamie Madill5e96ad12020-01-13 16:08:35 +00004942 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4943 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004944
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004945 # Similar code to above, but using yapf on .py files rather than clang-format
4946 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004947 py_explicitly_disabled = opts.python is not None and not opts.python
4948 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004949 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4950 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004951
Aiden Bennerc08566e2018-10-03 17:52:42 +00004952 # Used for caching.
4953 yapf_configs = {}
4954 for f in python_diff_files:
4955 # Find the yapf style config for the current file, defaults to depot
4956 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004957 _FindYapfConfigFile(f, yapf_configs, top_dir)
4958
4959 # Turn on python formatting by default if a yapf config is specified.
4960 # This breaks in the case of this repo though since the specified
4961 # style file is also the global default.
4962 if opts.python is None:
4963 filtered_py_files = []
4964 for f in python_diff_files:
4965 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4966 filtered_py_files.append(f)
4967 else:
4968 filtered_py_files = python_diff_files
4969
4970 # Note: yapf still seems to fix indentation of the entire file
4971 # even if line ranges are specified.
4972 # See https://github.com/google/yapf/issues/499
4973 if not opts.full and filtered_py_files:
4974 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4975
Brian Sheedyb4307d52019-12-02 19:18:17 +00004976 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4977 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4978 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004979
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004980 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004981 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4982 # Default to pep8 if not .style.yapf is found.
4983 if not yapf_style:
4984 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004985
Peter Wend9399922020-06-17 17:33:49 +00004986 with open(f, 'r') as py_f:
4987 if 'python3' in py_f.readline():
4988 vpython_script = 'vpython3'
4989 else:
4990 vpython_script = 'vpython'
4991
4992 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004993
4994 has_formattable_lines = False
4995 if not opts.full:
4996 # Only run yapf over changed line ranges.
4997 for diff_start, diff_len in py_line_diffs[f]:
4998 diff_end = diff_start + diff_len - 1
4999 # Yapf errors out if diff_end < diff_start but this
5000 # is a valid line range diff for a removal.
5001 if diff_end >= diff_start:
5002 has_formattable_lines = True
5003 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5004 # If all line diffs were removals we have nothing to format.
5005 if not has_formattable_lines:
5006 continue
5007
5008 if opts.diff or opts.dry_run:
5009 cmd += ['--diff']
5010 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005011 stdout = RunCommand(cmd,
5012 error_ok=True,
5013 cwd=top_dir,
5014 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005015 if opts.diff:
5016 sys.stdout.write(stdout)
5017 elif len(stdout) > 0:
5018 return_value = 2
5019 else:
5020 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005021 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005022
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005023 # Format GN build files. Always run on full build files for canonical form.
5024 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005025 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005026 if opts.dry_run or opts.diff:
5027 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005028 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005029 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005030 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005031 cwd=top_dir)
5032 if opts.dry_run and gn_ret == 2:
5033 return_value = 2 # Not formatted.
5034 elif opts.diff and gn_ret == 2:
5035 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005036 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005037 elif gn_ret != 0:
5038 # For non-dry run cases (and non-2 return values for dry-run), a
5039 # nonzero error code indicates a failure, probably because the file
5040 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005041 DieWithError('gn format failed on ' + gn_diff_file +
5042 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005043
Ilya Shermane081cbe2017-08-15 17:51:04 -07005044 # Skip the metrics formatting from the global presubmit hook. These files have
5045 # a separate presubmit hook that issues an error if the files need formatting,
5046 # whereas the top-level presubmit script merely issues a warning. Formatting
5047 # these files is somewhat slow, so it's important not to duplicate the work.
5048 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005049 for diff_xml in GetDiffXMLs(diff_files):
5050 xml_dir = GetMetricsDir(diff_xml)
5051 if not xml_dir:
5052 continue
5053
Ilya Shermane081cbe2017-08-15 17:51:04 -07005054 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005055 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5056 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005057
5058 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5059 # command as histograms/pretty_print.py now needs a relative path argument
5060 # after splitting the histograms into multiple directories.
5061 # For example, in tools/metrics/ukm, pretty-print could be run using:
5062 # $ python pretty_print.py
5063 # But in tools/metrics/histogrmas, pretty-print should be run with an
5064 # additional relative path argument, like:
5065 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5066 # $ python pretty_print.py enums.xml
5067
5068 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5069 # version of histograms/pretty_print.py is released.
5070 filepath_required = os.path.exists(
5071 os.path.join(tool_dir, 'validate_prefix.py'))
5072
Weilun Shib92c4b72020-08-27 17:45:11 +00005073 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5074 or diff_xml.endswith('histogram_suffixes_list.xml')
5075 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005076 cmd.append(diff_xml)
5077
Ilya Shermane081cbe2017-08-15 17:51:04 -07005078 if opts.dry_run or opts.diff:
5079 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005080
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005081 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5082 # `shell` param and instead replace `'vpython'` with
5083 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005084 stdout = RunCommand(cmd,
5085 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005086 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005087 if opts.diff:
5088 sys.stdout.write(stdout)
5089 if opts.dry_run and stdout:
5090 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005091
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005092 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005093
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005094
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005095def GetDiffXMLs(diff_files):
5096 return [
5097 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5098 ]
5099
5100
5101def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005102 metrics_xml_dirs = [
5103 os.path.join('tools', 'metrics', 'actions'),
5104 os.path.join('tools', 'metrics', 'histograms'),
5105 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005106 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005107 os.path.join('tools', 'metrics', 'ukm'),
5108 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005109 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005110 if diff_xml.startswith(xml_dir):
5111 return xml_dir
5112 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005113
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005114
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005115@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005116@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005117def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005118 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005119 _, args = parser.parse_args(args)
5120
5121 if len(args) != 1:
5122 parser.print_help()
5123 return 1
5124
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005125 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005126 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005127 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005128
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005129 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005130
Edward Lemur52969c92020-02-06 18:15:28 +00005131 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005132 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005133 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005134
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005135 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005136 for key, issue in [x.split() for x in output.splitlines()]:
5137 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005138 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005139
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005140 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005141 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005142 return 1
5143 if len(branches) == 1:
5144 RunGit(['checkout', branches[0]])
5145 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005146 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005147 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005148 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005149 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005150 try:
5151 RunGit(['checkout', branches[int(which)]])
5152 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005153 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005154 return 1
5155
5156 return 0
5157
5158
maruel@chromium.org29404b52014-09-08 22:58:00 +00005159def CMDlol(parser, args):
5160 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005161 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005162 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5163 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5164 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005165 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005166 return 0
5167
5168
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005169class OptionParser(optparse.OptionParser):
5170 """Creates the option parse and add --verbose support."""
5171 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005172 optparse.OptionParser.__init__(
5173 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005174 self.add_option(
5175 '-v', '--verbose', action='count', default=0,
5176 help='Use 2 times for more debugging info')
5177
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005178 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005179 try:
5180 return self._parse_args(args)
5181 finally:
5182 # Regardless of success or failure of args parsing, we want to report
5183 # metrics, but only after logging has been initialized (if parsing
5184 # succeeded).
5185 global settings
5186 settings = Settings()
5187
5188 if not metrics.DISABLE_METRICS_COLLECTION:
5189 # GetViewVCUrl ultimately calls logging method.
5190 project_url = settings.GetViewVCUrl().strip('/+')
5191 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5192 metrics.collector.add('project_urls', [project_url])
5193
5194 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005195 # Create an optparse.Values object that will store only the actual passed
5196 # options, without the defaults.
5197 actual_options = optparse.Values()
5198 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5199 # Create an optparse.Values object with the default options.
5200 options = optparse.Values(self.get_default_values().__dict__)
5201 # Update it with the options passed by the user.
5202 options._update_careful(actual_options.__dict__)
5203 # Store the options passed by the user in an _actual_options attribute.
5204 # We store only the keys, and not the values, since the values can contain
5205 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005206 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005207
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005208 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005209 logging.basicConfig(
5210 level=levels[min(options.verbose, len(levels) - 1)],
5211 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5212 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005213
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005214 return options, args
5215
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005216
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005217def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005218 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005219 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005220 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005221 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005222
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005223 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005224 dispatcher = subcommand.CommandDispatcher(__name__)
5225 try:
5226 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005227 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005228 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005229 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005230 if e.code != 500:
5231 raise
5232 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005233 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005234 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005235 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005236
5237
5238if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005239 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5240 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005241 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005242 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005243 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005244 sys.exit(main(sys.argv[1:]))