blob: 58d7b90b0a238b16125918c40c09be38eaa1fd2d [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
maruel@chromium.org2a74d372011-03-29 19:05:50 +000047import presubmit_support
48import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000049import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040050import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000051import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000052import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000053import watchlists
54
Edward Lemur79d4f992019-11-11 23:49:02 +000055from third_party import six
56from six.moves import urllib
57
58
59if sys.version_info.major == 3:
60 basestring = (str,) # pylint: disable=redefined-builtin
61
Edward Lemurb9830242019-10-30 22:19:20 +000062
tandrii7400cf02016-06-21 08:48:07 -070063__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
Edward Lemur0f58ae42019-04-30 17:24:12 +000065# Traces for git push will be stored in a traces directory inside the
66# depot_tools checkout.
67DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
68TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000069PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000070
71# When collecting traces, Git hashes will be reduced to 6 characters to reduce
72# the size after compression.
73GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
74# Used to redact the cookies from the gitcookies file.
75GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
76
Edward Lemurd4d1ba42019-09-20 21:46:37 +000077MAX_ATTEMPTS = 3
78
Edward Lemur1b52d872019-05-09 21:12:12 +000079# The maximum number of traces we will keep. Multiplied by 3 since we store
80# 3 files per trace.
81MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000082# Message to be displayed to the user to inform where to find the traces for a
83# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000084TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000085'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000086'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000087' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'Copies of your gitcookies file and git config have been recorded at:\n'
89' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000090# Format of the message to be stored as part of the traces to give developers a
91# better context when they go through traces.
92TRACES_README_FORMAT = (
93'Date: %(now)s\n'
94'\n'
95'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
96'Title: %(title)s\n'
97'\n'
98'%(description)s\n'
99'\n'
100'Execution time: %(execution_time)s\n'
101'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000102
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800103POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000104DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000105REFS_THAT_ALIAS_TO_OTHER_REFS = {
106 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
107 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
108}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000109
thestig@chromium.org44202a22014-03-11 19:22:18 +0000110# Valid extensions for files we want to lint.
111DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
112DEFAULT_LINT_IGNORE_REGEX = r"$^"
113
Aiden Bennerc08566e2018-10-03 17:52:42 +0000114# File name for yapf style config files.
115YAPF_CONFIG_FILENAME = '.style.yapf'
116
Edward Lesmes50da7702020-03-30 19:23:43 +0000117# The issue, patchset and codereview server are stored on git config for each
118# branch under branch.<branch-name>.<config-key>.
119ISSUE_CONFIG_KEY = 'gerritissue'
120PATCHSET_CONFIG_KEY = 'gerritpatchset'
121CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
122
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000123# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000124Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000125
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000126# Initialized in main()
127settings = None
128
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129# Used by tests/git_cl_test.py to add extra logging.
130# Inside the weirdly failing test, add this:
131# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700132# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100133_IS_BEING_TESTED = False
134
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000135
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000136_KNOWN_GERRIT_TO_SHORT_URLS = {
137 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
138 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
139}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000140assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
141 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000142
143
Christopher Lamf732cd52017-01-24 12:40:11 +1100144def DieWithError(message, change_desc=None):
145 if change_desc:
146 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000147 print('\n ** Content of CL description **\n' +
148 '='*72 + '\n' +
149 change_desc.description + '\n' +
150 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100151
vapiera7fbd5a2016-06-16 09:17:49 -0700152 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153 sys.exit(1)
154
155
Christopher Lamf732cd52017-01-24 12:40:11 +1100156def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000157 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000158 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000159 with open(backup_path, 'w') as backup_file:
160 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100161
162
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000163def GetNoGitPagerEnv():
164 env = os.environ.copy()
165 # 'cat' is a magical git string that disables pagers on all platforms.
166 env['GIT_PAGER'] = 'cat'
167 return env
168
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000169
bsep@chromium.org627d9002016-04-29 00:00:52 +0000170def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000172 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
173 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000174 except subprocess2.CalledProcessError as e:
175 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000176 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000177 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 'Command "%s" failed.\n%s' % (
179 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000180 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000181
182
183def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000185 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000186
187
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000188def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000189 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700190 if suppress_stderr:
191 stderr = subprocess2.VOID
192 else:
193 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000194 try:
tandrii5d48c322016-08-18 16:19:37 -0700195 (out, _), code = subprocess2.communicate(['git'] + args,
196 env=GetNoGitPagerEnv(),
197 stdout=subprocess2.PIPE,
198 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000199 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700200 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900201 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000203
204
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000205def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000206 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000207 return RunGitWithCode(args, suppress_stderr=True)[1]
208
209
tandrii2a16b952016-10-19 07:09:44 -0700210def time_sleep(seconds):
211 # Use this so that it can be mocked in tests without interfering with python
212 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700213 return time.sleep(seconds)
214
215
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000216def time_time():
217 # Use this so that it can be mocked in tests without interfering with python
218 # system machinery.
219 return time.time()
220
221
Edward Lemur1b52d872019-05-09 21:12:12 +0000222def datetime_now():
223 # Use this so that it can be mocked in tests without interfering with python
224 # system machinery.
225 return datetime.datetime.now()
226
227
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100228def confirm_or_exit(prefix='', action='confirm'):
229 """Asks user to press enter to continue or press Ctrl+C to abort."""
230 if not prefix or prefix.endswith('\n'):
231 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100232 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100233 mid = ' Press'
234 elif prefix.endswith(' '):
235 mid = 'press'
236 else:
237 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000238 gclient_utils.AskForData(
239 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240
241
242def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000243 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000244 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245 while True:
246 if 'yes'.startswith(result):
247 return True
248 if 'no'.startswith(result):
249 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000250 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251
252
machenbach@chromium.org45453142015-09-15 08:45:22 +0000253def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000254 prop_list = getattr(options, 'properties', [])
255 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000256 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000257 try:
258 properties[key] = json.loads(val)
259 except ValueError:
260 pass # If a value couldn't be evaluated, treat it as a string.
261 return properties
262
263
Edward Lemur4c707a22019-09-24 21:13:43 +0000264def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000265 """Calls a buildbucket v2 method and returns the parsed json response."""
266 headers = {
267 'Accept': 'application/json',
268 'Content-Type': 'application/json',
269 }
270 request = json.dumps(request)
271 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
272
273 logging.info('POST %s with %s' % (url, request))
274
275 attempts = 1
276 time_to_sleep = 1
277 while True:
278 response, content = http.request(url, 'POST', body=request, headers=headers)
279 if response.status == 200:
280 return json.loads(content[4:])
281 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
282 msg = '%s error when calling POST %s with %s: %s' % (
283 response.status, url, request, content)
284 raise BuildbucketResponseException(msg)
285 logging.debug(
286 '%s error when calling POST %s with %s. '
287 'Sleeping for %d seconds and retrying...' % (
288 response.status, url, request, time_to_sleep))
289 time.sleep(time_to_sleep)
290 time_to_sleep *= 2
291 attempts += 1
292
293 assert False, 'unreachable'
294
295
Edward Lemur6215c792019-10-03 21:59:05 +0000296def _parse_bucket(raw_bucket):
297 legacy = True
298 project = bucket = None
299 if '/' in raw_bucket:
300 legacy = False
301 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000302 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000303 elif raw_bucket.startswith('luci.'):
304 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000305 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000306 elif '.' in raw_bucket:
307 project = raw_bucket.split('.')[0]
308 bucket = raw_bucket
309 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000310 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000311 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
312 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000313
314
Quinten Yearsley777660f2020-03-04 23:37:06 +0000315def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000316 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700317
318 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000320 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700321 options: Command-line options.
322 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000323 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000324 for project, bucket, builder in jobs:
325 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326 print('To see results here, run: git cl try-results')
327 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700328
Quinten Yearsley777660f2020-03-04 23:37:06 +0000329 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000330 if not requests:
331 return
332
Edward Lemur5b929a42019-10-21 17:57:39 +0000333 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000334 http.force_exception_to_status_code = True
335
336 batch_request = {'requests': requests}
337 batch_response = _call_buildbucket(
338 http, options.buildbucket_host, 'Batch', batch_request)
339
340 errors = [
341 ' ' + response['error']['message']
342 for response in batch_response.get('responses', [])
343 if 'error' in response
344 ]
345 if errors:
346 raise BuildbucketResponseException(
347 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
348
349
Quinten Yearsley777660f2020-03-04 23:37:06 +0000350def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000351 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000352 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000353 shared_properties = {
354 'category': options.ensure_value('category', 'git_cl_try')
355 }
356 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000357 shared_properties['clobber'] = True
358 shared_properties.update(_get_properties_from_options(options) or {})
359
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000360 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000361 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000362 shared_tags.append({'key': 'retry_failed',
363 'value': '1'})
364
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000365 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000366 for (project, bucket, builder) in jobs:
367 properties = shared_properties.copy()
368 if 'presubmit' in builder.lower():
369 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000370
Edward Lemur45768512020-03-02 19:03:14 +0000371 requests.append({
372 'scheduleBuild': {
373 'requestId': str(uuid.uuid4()),
374 'builder': {
375 'project': getattr(options, 'project', None) or project,
376 'bucket': bucket,
377 'builder': builder,
378 },
379 'gerritChanges': gerrit_changes,
380 'properties': properties,
381 'tags': [
382 {'key': 'builder', 'value': builder},
383 ] + shared_tags,
384 }
385 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000386
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000387 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000388 requests[-1]['scheduleBuild']['gitilesCommit'] = {
389 'host': gerrit_changes[0]['host'],
390 'project': gerrit_changes[0]['project'],
391 'id': options.revision
392 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000393
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000394 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000395
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000396
Quinten Yearsley777660f2020-03-04 23:37:06 +0000397def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000398 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000399
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000400 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000401 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000402 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000403 request = {
404 'predicate': {
405 'gerritChanges': [changelist.GetGerritChange(patchset)],
406 },
407 'fields': ','.join('builds.*.' + field for field in fields),
408 }
tandrii221ab252016-10-06 08:12:04 -0700409
Edward Lemur5b929a42019-10-21 17:57:39 +0000410 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000411 if authenticator.has_cached_credentials():
412 http = authenticator.authorize(httplib2.Http())
413 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700414 print('Warning: Some results might be missing because %s' %
415 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000416 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000417 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000418 http.force_exception_to_status_code = True
419
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000420 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
421 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000422
Edward Lemur45768512020-03-02 19:03:14 +0000423
Edward Lemur5b929a42019-10-21 17:57:39 +0000424def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000425 """Fetches builds from the latest patchset that has builds (within
426 the last few patchsets).
427
428 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000429 changelist (Changelist): The CL to fetch builds for
430 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000431 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
432 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000433 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000434 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
435 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 """
437 assert buildbucket_host
438 assert changelist.GetIssue(), 'CL must be uploaded first'
439 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000440 if latest_patchset is None:
441 assert changelist.GetMostRecentPatchset()
442 ps = changelist.GetMostRecentPatchset()
443 else:
444 assert latest_patchset > 0, latest_patchset
445 ps = latest_patchset
446
Quinten Yearsley983111f2019-09-26 17:18:48 +0000447 min_ps = max(1, ps - 5)
448 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000449 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000450 if len(builds):
451 return builds, ps
452 ps -= 1
453 return [], 0
454
455
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000456def _filter_failed_for_retry(all_builds):
457 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000458
459 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000460 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000461 i.e. a list of buildbucket.v2.Builds which includes status and builder
462 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000463
464 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000465 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000466 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000467 """
Edward Lemur45768512020-03-02 19:03:14 +0000468 grouped = {}
469 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000471 key = (builder['project'], builder['bucket'], builder['builder'])
472 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000473
Edward Lemur45768512020-03-02 19:03:14 +0000474 jobs = []
475 for (project, bucket, builder), builds in grouped.items():
476 if 'triggered' in builder:
477 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
478 'from a parent. Please schedule a manual job for the parent '
479 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000480 continue
481 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
482 # Don't retry if any are running.
483 continue
Edward Lemur45768512020-03-02 19:03:14 +0000484 # If builder had several builds, retry only if the last one failed.
485 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
486 # build, but in case of retrying failed jobs retrying a flaky one makes
487 # sense.
488 builds = sorted(builds, key=lambda b: b['createTime'])
489 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
490 continue
491 # Don't retry experimental build previously triggered by CQ.
492 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
493 for t in builds[-1]['tags']):
494 continue
495 jobs.append((project, bucket, builder))
496
497 # Sort the jobs to make testing easier.
498 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000499
500
Quinten Yearsley777660f2020-03-04 23:37:06 +0000501def _print_tryjobs(options, builds):
502 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000503 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000504 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000505 return
506
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000507 longest_builder = max(len(b['builder']['builder']) for b in builds)
508 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000509 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000510 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
511 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000513 builds_by_status = {}
514 for b in builds:
515 builds_by_status.setdefault(b['status'], []).append({
516 'id': b['id'],
517 'name': name_fmt.format(
518 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
519 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000520
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 sort_key = lambda b: (b['name'], b['id'])
522
523 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000524 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000525 if not builds:
526 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000529 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000530 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531 else:
532 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
533
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 print(colorize(title))
535 for b in sorted(builds, key=sort_key):
536 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000537
538 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 print_builds(
540 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
541 print_builds(
542 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
543 color=Fore.MAGENTA)
544 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
545 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
546 color=Fore.MAGENTA)
547 print_builds('Started:', builds_by_status.pop('STARTED', []))
548 print_builds(
549 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000551 print_builds(
552 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000553 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554
555
Aiden Bennerc08566e2018-10-03 17:52:42 +0000556def _ComputeDiffLineRanges(files, upstream_commit):
557 """Gets the changed line ranges for each file since upstream_commit.
558
559 Parses a git diff on provided files and returns a dict that maps a file name
560 to an ordered list of range tuples in the form (start_line, count).
561 Ranges are in the same format as a git diff.
562 """
563 # If files is empty then diff_output will be a full diff.
564 if len(files) == 0:
565 return {}
566
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000567 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000568 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000569 diff_output = RunGit(diff_cmd)
570
571 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
572 # 2 capture groups
573 # 0 == fname of diff file
574 # 1 == 'diff_start,diff_count' or 'diff_start'
575 # will match each of
576 # diff --git a/foo.foo b/foo.py
577 # @@ -12,2 +14,3 @@
578 # @@ -12,2 +17 @@
579 # running re.findall on the above string with pattern will give
580 # [('foo.py', ''), ('', '14,3'), ('', '17')]
581
582 curr_file = None
583 line_diffs = {}
584 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
585 if match[0] != '':
586 # Will match the second filename in diff --git a/a.py b/b.py.
587 curr_file = match[0]
588 line_diffs[curr_file] = []
589 else:
590 # Matches +14,3
591 if ',' in match[1]:
592 diff_start, diff_count = match[1].split(',')
593 else:
594 # Single line changes are of the form +12 instead of +12,1.
595 diff_start = match[1]
596 diff_count = 1
597
598 diff_start = int(diff_start)
599 diff_count = int(diff_count)
600
601 # If diff_count == 0 this is a removal we can ignore.
602 line_diffs[curr_file].append((diff_start, diff_count))
603
604 return line_diffs
605
606
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000607def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000608 """Checks if a yapf file is in any parent directory of fpath until top_dir.
609
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000610 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000611 is found returns None. Uses yapf_config_cache as a cache for previously found
612 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000613 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000614 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000615 # Return result if we've already computed it.
616 if fpath in yapf_config_cache:
617 return yapf_config_cache[fpath]
618
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000619 parent_dir = os.path.dirname(fpath)
620 if os.path.isfile(fpath):
621 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000623 # Otherwise fpath is a directory
624 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
625 if os.path.isfile(yapf_file):
626 ret = yapf_file
627 elif fpath == top_dir or parent_dir == fpath:
628 # If we're at the top level directory, or if we're at root
629 # there is no provided style.
630 ret = None
631 else:
632 # Otherwise recurse on the current directory.
633 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000634 yapf_config_cache[fpath] = ret
635 return ret
636
637
Brian Sheedyb4307d52019-12-02 19:18:17 +0000638def _GetYapfIgnorePatterns(top_dir):
639 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000640
641 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
642 but this functionality appears to break when explicitly passing files to
643 yapf for formatting. According to
644 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
645 the .yapfignore file should be in the directory that yapf is invoked from,
646 which we assume to be the top level directory in this case.
647
648 Args:
649 top_dir: The top level directory for the repository being formatted.
650
651 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000652 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000653 """
654 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000655 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000656 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000657 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000658
Brian Sheedyb4307d52019-12-02 19:18:17 +0000659 with open(yapfignore_file) as f:
660 for line in f.readlines():
661 stripped_line = line.strip()
662 # Comments and blank lines should be ignored.
663 if stripped_line.startswith('#') or stripped_line == '':
664 continue
665 ignore_patterns.add(stripped_line)
666 return ignore_patterns
667
668
669def _FilterYapfIgnoredFiles(filepaths, patterns):
670 """Filters out any filepaths that match any of the given patterns.
671
672 Args:
673 filepaths: An iterable of strings containing filepaths to filter.
674 patterns: An iterable of strings containing fnmatch patterns to filter on.
675
676 Returns:
677 A list of strings containing all the elements of |filepaths| that did not
678 match any of the patterns in |patterns|.
679 """
680 # Not inlined so that tests can use the same implementation.
681 return [f for f in filepaths
682 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000683
684
Aaron Gable13101a62018-02-09 13:20:41 -0800685def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000686 """Prints statistics about the change to the user."""
687 # --no-ext-diff is broken in some versions of Git, so try to work around
688 # this by overriding the environment (but there is still a problem if the
689 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000690 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000691 if 'GIT_EXTERNAL_DIFF' in env:
692 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000693
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000694 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800695 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000696 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000697
698
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000699class BuildbucketResponseException(Exception):
700 pass
701
702
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000703class Settings(object):
704 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000705 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000706 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000707 self.tree_status_url = None
708 self.viewvc_url = None
709 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000710 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000711 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000712 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000713 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000714 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000715
Edward Lemur26964072020-02-19 19:18:51 +0000716 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000717 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000718 if self.updated:
719 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000720
Edward Lemur26964072020-02-19 19:18:51 +0000721 # The only value that actually changes the behavior is
722 # autoupdate = "false". Everything else means "true".
723 autoupdate = (
724 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
725
726 cr_settings_file = FindCodereviewSettingsFile()
727 if autoupdate != 'false' and cr_settings_file:
728 LoadCodereviewSettingsFromFile(cr_settings_file)
729 cr_settings_file.close()
730
731 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000732
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000733 @staticmethod
734 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000735 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000736
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000737 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000738 if self.root is None:
739 self.root = os.path.abspath(self.GetRelativeRoot())
740 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000742 def GetTreeStatusUrl(self, error_ok=False):
743 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000744 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
745 if self.tree_status_url is None and not error_ok:
746 DieWithError(
747 'You must configure your tree status URL by running '
748 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000749 return self.tree_status_url
750
751 def GetViewVCUrl(self):
752 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000753 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000754 return self.viewvc_url
755
rmistry@google.com90752582014-01-14 21:04:50 +0000756 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000757 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000758
rmistry@google.com5626a922015-02-26 14:03:30 +0000759 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000760 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000761 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000762 return run_post_upload_hook == "True"
763
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000764 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000765 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000766
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000767 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000768 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000769 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000770 # Default is squash now (http://crbug.com/611892#c23).
771 self.squash_gerrit_uploads = self._GetConfig(
772 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000773 return self.squash_gerrit_uploads
774
tandrii@chromium.org28253532016-04-14 13:46:56 +0000775 def GetGerritSkipEnsureAuthenticated(self):
776 """Return True if EnsureAuthenticated should not be done for Gerrit
777 uploads."""
778 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000779 self.gerrit_skip_ensure_authenticated = self._GetConfig(
780 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000781 return self.gerrit_skip_ensure_authenticated
782
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000783 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000784 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000785 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000786 # Git requires single quotes for paths with spaces. We need to replace
787 # them with double quotes for Windows to treat such paths as a single
788 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000789 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000790 return self.git_editor or None
791
thestig@chromium.org44202a22014-03-11 19:22:18 +0000792 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000793 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000794
795 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000796 return self._GetConfig(
797 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000798
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000799 def GetFormatFullByDefault(self):
800 if self.format_full_by_default is None:
801 result = (
802 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
803 error_ok=True).strip())
804 self.format_full_by_default = (result == 'true')
805 return self.format_full_by_default
806
Edward Lemur26964072020-02-19 19:18:51 +0000807 def _GetConfig(self, key, default=''):
808 self._LazyUpdateIfNeeded()
809 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810
811
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000812class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000813 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000814 NONE = 'none'
815 DRY_RUN = 'dry_run'
816 COMMIT = 'commit'
817
818 ALL_STATES = [NONE, DRY_RUN, COMMIT]
819
820
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000821class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000822 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000823 self.issue = issue
824 self.patchset = patchset
825 self.hostname = hostname
826
827 @property
828 def valid(self):
829 return self.issue is not None
830
831
Edward Lemurf38bc172019-09-03 21:02:13 +0000832def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000833 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
834 fail_result = _ParsedIssueNumberArgument()
835
Edward Lemur678a6842019-10-03 22:25:05 +0000836 if isinstance(arg, int):
837 return _ParsedIssueNumberArgument(issue=arg)
838 if not isinstance(arg, basestring):
839 return fail_result
840
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000841 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000842 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000843 if not arg.startswith('http'):
844 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700845
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000847 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
848 if url.startswith(short_url):
849 url = gerrit_url + url[len(short_url):]
850 break
851
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000852 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000853 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000854 except ValueError:
855 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200856
Edward Lemur678a6842019-10-03 22:25:05 +0000857 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
858 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
859 # Short urls like https://domain/<issue_number> can be used, but don't allow
860 # specifying the patchset (you'd 404), but we allow that here.
861 if parsed_url.path == '/':
862 part = parsed_url.fragment
863 else:
864 part = parsed_url.path
865
866 match = re.match(
867 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
868 if not match:
869 return fail_result
870
871 issue = int(match.group('issue'))
872 patchset = match.group('patchset')
873 return _ParsedIssueNumberArgument(
874 issue=issue,
875 patchset=int(patchset) if patchset else None,
876 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877
878
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000879def _create_description_from_log(args):
880 """Pulls out the commit log to use as a base for the CL description."""
881 log_args = []
882 if len(args) == 1 and not args[0].endswith('.'):
883 log_args = [args[0] + '..']
884 elif len(args) == 1 and args[0].endswith('...'):
885 log_args = [args[0][:-1]]
886 elif len(args) == 2:
887 log_args = [args[0] + '..' + args[1]]
888 else:
889 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000890 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000891
892
Aaron Gablea45ee112016-11-22 15:14:38 -0800893class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700894 def __init__(self, issue, url):
895 self.issue = issue
896 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800897 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700898
899 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800900 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700901 self.issue, self.url)
902
903
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100904_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000905 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100906 # TODO(tandrii): these two aren't known in Gerrit.
907 'approval', 'disapproval'])
908
909
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000910class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000911 """Changelist works with one changelist in local branch.
912
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000913 Notes:
914 * Not safe for concurrent multi-{thread,process} use.
915 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700916 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000917 """
918
Edward Lemur125d60a2019-09-13 18:25:41 +0000919 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000920 """Create a new ChangeList instance.
921
Edward Lemurf38bc172019-09-03 21:02:13 +0000922 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000923 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000924 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000925 global settings
926 if not settings:
927 # Happens when git_cl.py is used as a utility library.
928 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000929
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000930 self.branchref = branchref
931 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000932 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000933 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000934 else:
935 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000936 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000937 self.lookedup_issue = False
938 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000939 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000940 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000941 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000942 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800943 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000944 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000945 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000946
Edward Lemur125d60a2019-09-13 18:25:41 +0000947 # Lazily cached values.
948 self._gerrit_host = None # e.g. chromium-review.googlesource.com
949 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
950 # Map from change number (issue) to its detail cache.
951 self._detail_cache = {}
952
953 if codereview_host is not None:
954 assert not codereview_host.startswith('https://'), codereview_host
955 self._gerrit_host = codereview_host
956 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000957
958 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700959 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000960
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700961 The return value is a string suitable for passing to git cl with the --cc
962 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000963 """
964 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000965 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800966 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000967 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
968 return self.cc
969
Daniel Cheng7227d212017-11-17 08:12:37 -0800970 def ExtendCC(self, more_cc):
971 """Extends the list of users to cc on this CL based on the changed files."""
972 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973
974 def GetBranch(self):
975 """Returns the short branch name, e.g. 'master'."""
976 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +0000977 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000978 if not branchref:
979 return None
980 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +0000981 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000982 return self.branch
983
984 def GetBranchRef(self):
985 """Returns the full branch name, e.g. 'refs/heads/master'."""
986 self.GetBranch() # Poke the lazy loader.
987 return self.branchref
988
Edward Lemur85153282020-02-14 22:06:29 +0000989 def _GitGetBranchConfigValue(self, key, default=None):
990 return scm.GIT.GetBranchConfig(
991 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -0700992
Edward Lemur85153282020-02-14 22:06:29 +0000993 def _GitSetBranchConfigValue(self, key, value):
994 action = 'set %s to %r' % (key, value)
995 if not value:
996 action = 'unset %s' % key
997 assert self.GetBranch(), 'a branch is needed to ' + action
998 return scm.GIT.SetBranchConfig(
999 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001000
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001001 @staticmethod
1002 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001003 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001004 e.g. 'origin', 'refs/heads/master'
1005 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001006 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1007 settings.GetRoot(), branch)
1008 if not remote or not upstream_branch:
1009 DieWithError(
1010 'Unable to determine default branch to diff against.\n'
1011 'Either pass complete "git diff"-style arguments, like\n'
1012 ' git cl upload origin/master\n'
1013 'or verify this branch is set up to track another \n'
1014 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015
1016 return remote, upstream_branch
1017
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001018 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001019 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001020 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001021 DieWithError('The upstream for the current branch (%s) does not exist '
1022 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001023 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001024 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001025
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026 def GetUpstreamBranch(self):
1027 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001028 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001029 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001030 upstream_branch = upstream_branch.replace('refs/heads/',
1031 'refs/remotes/%s/' % remote)
1032 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1033 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.upstream_branch = upstream_branch
1035 return self.upstream_branch
1036
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001037 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001038 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001039 remote, branch = None, self.GetBranch()
1040 seen_branches = set()
1041 while branch not in seen_branches:
1042 seen_branches.add(branch)
1043 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001044 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001045 if remote != '.' or branch.startswith('refs/remotes'):
1046 break
1047 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001048 remotes = RunGit(['remote'], error_ok=True).split()
1049 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001050 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001051 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001052 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001053 logging.warn('Could not determine which remote this change is '
1054 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001055 else:
1056 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001057 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001058 branch = 'HEAD'
1059 if branch.startswith('refs/remotes'):
1060 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001061 elif branch.startswith('refs/branch-heads/'):
1062 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001063 else:
1064 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001065 return self._remote
1066
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001067 def GetRemoteUrl(self):
1068 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1069
1070 Returns None if there is no remote.
1071 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001072 is_cached, value = self._cached_remote_url
1073 if is_cached:
1074 return value
1075
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001076 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001077 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001078
Edward Lemur298f2cf2019-02-22 21:40:39 +00001079 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001080 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001081 if host:
1082 self._cached_remote_url = (True, url)
1083 return url
1084
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001085 # If it cannot be parsed as an url, assume it is a local directory,
1086 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001087 logging.warning('"%s" doesn\'t appear to point to a git host. '
1088 'Interpreting it as a local directory.', url)
1089 if not os.path.isdir(url):
1090 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001091 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1092 'but it doesn\'t exist.',
1093 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001094 return None
1095
1096 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001097 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001098
Edward Lemur79d4f992019-11-11 23:49:02 +00001099 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001100 if not host:
1101 logging.error(
1102 'Remote "%(remote)s" for branch "%(branch)s" points to '
1103 '"%(cache_path)s", but it is misconfigured.\n'
1104 '"%(cache_path)s" must be a git repo and must have a remote named '
1105 '"%(remote)s" pointing to the git host.', {
1106 'remote': remote,
1107 'cache_path': cache_path,
1108 'branch': self.GetBranch()})
1109 return None
1110
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001111 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001112 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001114 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001115 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001116 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001117 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001118 if self.issue is not None:
1119 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001120 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 return self.issue
1122
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001123 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001125 issue = self.GetIssue()
1126 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001127 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001128 server = self.GetCodereviewServer()
1129 if short:
1130 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1131 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132
Edward Lemur6c6827c2020-02-06 21:15:18 +00001133 def FetchDescription(self, pretty=False):
1134 assert self.GetIssue(), 'issue is required to query Gerrit'
1135
Edward Lemur9aa1a962020-02-25 00:58:38 +00001136 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001137 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1138 current_rev = data['current_revision']
1139 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001140
1141 if not pretty:
1142 return self.description
1143
1144 # Set width to 72 columns + 2 space indent.
1145 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1146 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1147 lines = self.description.splitlines()
1148 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149
1150 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001151 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001152 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001153 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001154 if self.patchset is not None:
1155 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001156 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 return self.patchset
1158
Edward Lemur9aa1a962020-02-25 00:58:38 +00001159 def GetAuthor(self):
1160 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1161
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001163 """Set this branch's patchset. If patchset=0, clears the patchset."""
1164 assert self.GetBranch()
1165 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001166 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001167 else:
1168 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001169 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001170
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001171 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001172 """Set this branch's issue. If issue isn't given, clears the issue."""
1173 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001174 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001175 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001176 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001177 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001178 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001179 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001180 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001181 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001182 else:
tandrii5d48c322016-08-18 16:19:37 -07001183 # Reset all of these just to be clean.
1184 reset_suffixes = [
1185 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001186 ISSUE_CONFIG_KEY,
1187 PATCHSET_CONFIG_KEY,
1188 CODEREVIEW_SERVER_CONFIG_KEY,
1189 'gerritsquashhash',
1190 ]
tandrii5d48c322016-08-18 16:19:37 -07001191 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001192 try:
1193 self._GitSetBranchConfigValue(prop, None)
1194 except subprocess2.CalledProcessError:
1195 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001196 msg = RunGit(['log', '-1', '--format=%B']).strip()
1197 if msg and git_footers.get_footer_change_id(msg):
1198 print('WARNING: The change patched into this branch has a Change-Id. '
1199 'Removing it.')
1200 RunGit(['commit', '--amend', '-m',
1201 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001202 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001203 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001204 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205
Edward Lemur2c62b332020-03-12 22:12:33 +00001206 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001207 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001208 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001209 except subprocess2.CalledProcessError:
1210 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001211 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001212 'This branch probably doesn\'t exist anymore. To reset the\n'
1213 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001214 ' git branch --set-upstream-to origin/master %s\n'
1215 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001216 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001217
dsansomee2d6fd92016-09-08 00:10:47 -07001218 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001219 assert self.GetIssue(), 'issue is required to update description'
1220
1221 if gerrit_util.HasPendingChangeEdit(
1222 self._GetGerritHost(), self._GerritChangeIdentifier()):
1223 if not force:
1224 confirm_or_exit(
1225 'The description cannot be modified while the issue has a pending '
1226 'unpublished edit. Either publish the edit in the Gerrit web UI '
1227 'or delete it.\n\n', action='delete the unpublished edit')
1228
1229 gerrit_util.DeletePendingChangeEdit(
1230 self._GetGerritHost(), self._GerritChangeIdentifier())
1231 gerrit_util.SetCommitMessage(
1232 self._GetGerritHost(), self._GerritChangeIdentifier(),
1233 description, notify='NONE')
1234
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001235 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001236
Edward Lemur75526302020-02-27 22:31:05 +00001237 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001238 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001239 '--root', settings.GetRoot(),
1240 '--upstream', upstream,
1241 ]
1242
1243 args.extend(['--verbose'] * verbose)
1244
Edward Lemur99df04e2020-03-05 19:39:43 +00001245 author = self.GetAuthor()
1246 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001247 issue = self.GetIssue()
1248 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001249 if author:
1250 args.extend(['--author', author])
1251 if gerrit_url:
1252 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001253 if issue:
1254 args.extend(['--issue', str(issue)])
1255 if patchset:
1256 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001257
Edward Lemur75526302020-02-27 22:31:05 +00001258 return args
1259
1260 def RunHook(
1261 self, committing, may_prompt, verbose, parallel, upstream, description,
1262 all_files):
1263 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1264 args = self._GetCommonPresubmitArgs(verbose, upstream)
1265 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001266 if may_prompt:
1267 args.append('--may_prompt')
1268 if parallel:
1269 args.append('--parallel')
1270 if all_files:
1271 args.append('--all_files')
1272
1273 with gclient_utils.temporary_file() as description_file:
1274 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001275
1276 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001277 args.extend(['--json_output', json_output])
1278 args.extend(['--description_file', description_file])
1279
1280 start = time_time()
1281 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1282 exit_code = p.wait()
1283 metrics.collector.add_repeated('sub_commands', {
1284 'command': 'presubmit',
1285 'execution_time': time_time() - start,
1286 'exit_code': exit_code,
1287 })
1288
1289 if exit_code:
1290 sys.exit(exit_code)
1291
1292 json_results = gclient_utils.FileRead(json_output)
1293 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001294
Edward Lemur75526302020-02-27 22:31:05 +00001295 def RunPostUploadHook(self, verbose, upstream, description):
1296 args = self._GetCommonPresubmitArgs(verbose, upstream)
1297 args.append('--post_upload')
1298
1299 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001300 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001301 args.extend(['--description_file', description_file])
1302 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1303 p.wait()
1304
Edward Lemur5a644f82020-03-18 16:44:57 +00001305 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1306 # Get description message for upload.
1307 if self.GetIssue():
1308 description = self.FetchDescription()
1309 elif options.message:
1310 description = options.message
1311 else:
1312 description = _create_description_from_log(git_diff_args)
1313 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001314 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001315
1316 # Extract bug number from branch name.
1317 bug = options.bug
1318 fixed = options.fixed
1319 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1320 self.GetBranch())
1321 if not bug and not fixed and match:
1322 if match.group('type') == 'bug':
1323 bug = match.group('bugnum')
1324 else:
1325 fixed = match.group('bugnum')
1326
1327 change_description = ChangeDescription(description, bug, fixed)
1328
1329 # Set the reviewer list now so that presubmit checks can access it.
1330 if options.reviewers or options.tbrs or options.add_owners_to:
1331 change_description.update_reviewers(
1332 options.reviewers, options.tbrs, options.add_owners_to, files,
1333 self.GetAuthor())
1334
1335 return change_description
1336
1337 def _GetTitleForUpload(self, options):
1338 # When not squashing, just return options.title.
1339 if not options.squash:
1340 return options.title
1341
1342 # On first upload, patchset title is always this string, while options.title
1343 # gets converted to first line of message.
1344 if not self.GetIssue():
1345 return 'Initial upload'
1346
1347 # When uploading subsequent patchsets, options.message is taken as the title
1348 # if options.title is not provided.
1349 if options.title:
1350 return options.title
1351 if options.message:
1352 return options.message.strip()
1353
1354 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001355 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Edward Lemur5a644f82020-03-18 16:44:57 +00001356 if options.force:
1357 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001358 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1359 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001360
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001361 def CMDUpload(self, options, git_diff_args, orig_args):
1362 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001363 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001364 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001365 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001366 else:
1367 if self.GetBranch() is None:
1368 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1369
1370 # Default to diffing against common ancestor of upstream branch
1371 base_branch = self.GetCommonAncestorWithUpstream()
1372 git_diff_args = [base_branch, 'HEAD']
1373
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001374 # Fast best-effort checks to abort before running potentially expensive
1375 # hooks if uploading is likely to fail anyway. Passing these checks does
1376 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001377 self.EnsureAuthenticated(force=options.force)
1378 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001379
1380 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001381 watchlist = watchlists.Watchlists(settings.GetRoot())
1382 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001383 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001384 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001385
Edward Lemur5a644f82020-03-18 16:44:57 +00001386 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001387 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001388 hook_results = self.RunHook(
1389 committing=False,
1390 may_prompt=not options.force,
1391 verbose=options.verbose,
1392 parallel=options.parallel,
1393 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001394 description=change_desc.description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001395 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001396 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001397
Aaron Gable13101a62018-02-09 13:20:41 -08001398 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001399 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001400 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001401 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001402 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001403 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001404 # Run post upload hooks, if specified.
1405 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001406 self.RunPostUploadHook(
1407 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001408
1409 # Upload all dependencies if specified.
1410 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001411 print()
1412 print('--dependencies has been specified.')
1413 print('All dependent local branches will be re-uploaded.')
1414 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001415 # Remove the dependencies flag from args so that we do not end up in a
1416 # loop.
1417 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001418 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001419 return ret
1420
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001421 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001422 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001423
1424 Issue must have been already uploaded and known.
1425 """
1426 assert new_state in _CQState.ALL_STATES
1427 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001428 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001429 vote_map = {
1430 _CQState.NONE: 0,
1431 _CQState.DRY_RUN: 1,
1432 _CQState.COMMIT: 2,
1433 }
1434 labels = {'Commit-Queue': vote_map[new_state]}
1435 notify = False if new_state == _CQState.DRY_RUN else None
1436 gerrit_util.SetReview(
1437 self._GetGerritHost(), self._GerritChangeIdentifier(),
1438 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001439 return 0
1440 except KeyboardInterrupt:
1441 raise
1442 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001443 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001444 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001445 ' * Your project has no CQ,\n'
1446 ' * You don\'t have permission to change the CQ state,\n'
1447 ' * There\'s a bug in this code (see stack trace below).\n'
1448 'Consider specifying which bots to trigger manually or asking your '
1449 'project owners for permissions or contacting Chrome Infra at:\n'
1450 'https://www.chromium.org/infra\n\n' %
1451 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001452 # Still raise exception so that stack trace is printed.
1453 raise
1454
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001455 def _GetGerritHost(self):
1456 # Lazy load of configs.
1457 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001458 if self._gerrit_host and '.' not in self._gerrit_host:
1459 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1460 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001461 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001462 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001463 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001464 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001465 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1466 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467 return self._gerrit_host
1468
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001469 def _GetGitHost(self):
1470 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001471 remote_url = self.GetRemoteUrl()
1472 if not remote_url:
1473 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001474 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001475
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001476 def GetCodereviewServer(self):
1477 if not self._gerrit_server:
1478 # If we're on a branch then get the server potentially associated
1479 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001480 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001481 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001482 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001483 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001484 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001485 if not self._gerrit_server:
1486 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1487 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001488 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001489 parts[0] = parts[0] + '-review'
1490 self._gerrit_host = '.'.join(parts)
1491 self._gerrit_server = 'https://%s' % self._gerrit_host
1492 return self._gerrit_server
1493
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001494 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001495 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001496 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001497 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001498 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001499 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001500 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001501 if project.endswith('.git'):
1502 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001503 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1504 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1505 # gitiles/git-over-https protocol. E.g.,
1506 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1507 # as
1508 # https://chromium.googlesource.com/v8/v8
1509 if project.startswith('a/'):
1510 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001511 return project
1512
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001513 def _GerritChangeIdentifier(self):
1514 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1515
1516 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001517 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001518 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001519 project = self._GetGerritProject()
1520 if project:
1521 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1522 # Fall back on still unique, but less efficient change number.
1523 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001524
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001525 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001527 if settings.GetGerritSkipEnsureAuthenticated():
1528 # For projects with unusual authentication schemes.
1529 # See http://crbug.com/603378.
1530 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001531
1532 # Check presence of cookies only if using cookies-based auth method.
1533 cookie_auth = gerrit_util.Authenticator.get()
1534 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001535 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001536
Florian Mayerae510e82020-01-30 21:04:48 +00001537 remote_url = self.GetRemoteUrl()
1538 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001539 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001540 return
1541 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001542 logging.warning('Ignoring branch %(branch)s with non-https remote '
1543 '%(remote)s', {
1544 'branch': self.branch,
1545 'remote': self.GetRemoteUrl()
1546 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001547 return
1548
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001549 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001550 self.GetCodereviewServer()
1551 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001552 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001553
1554 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1555 git_auth = cookie_auth.get_auth_header(git_host)
1556 if gerrit_auth and git_auth:
1557 if gerrit_auth == git_auth:
1558 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001559 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001560 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001561 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001562 ' %s\n'
1563 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001564 ' Consider running the following command:\n'
1565 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001566 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001567 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001568 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001569 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001570 cookie_auth.get_new_password_message(git_host)))
1571 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001572 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001573 return
1574 else:
1575 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001576 ([] if gerrit_auth else [self._gerrit_host]) +
1577 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001578 DieWithError('Credentials for the following hosts are required:\n'
1579 ' %s\n'
1580 'These are read from %s (or legacy %s)\n'
1581 '%s' % (
1582 '\n '.join(missing),
1583 cookie_auth.get_gitcookies_path(),
1584 cookie_auth.get_netrc_path(),
1585 cookie_auth.get_new_password_message(git_host)))
1586
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001587 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001588 if not self.GetIssue():
1589 return
1590
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001591 status = self._GetChangeDetail()['status']
1592 if status in ('MERGED', 'ABANDONED'):
1593 DieWithError('Change %s has been %s, new uploads are not allowed' %
1594 (self.GetIssueURL(),
1595 'submitted' if status == 'MERGED' else 'abandoned'))
1596
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001597 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1598 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1599 # Apparently this check is not very important? Otherwise get_auth_email
1600 # could have been added to other implementations of Authenticator.
1601 cookies_auth = gerrit_util.Authenticator.get()
1602 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001603 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001604
1605 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001606 if self.GetIssueOwner() == cookies_user:
1607 return
1608 logging.debug('change %s owner is %s, cookies user is %s',
1609 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001610 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001611 # so ask what Gerrit thinks of this user.
1612 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1613 if details['email'] == self.GetIssueOwner():
1614 return
1615 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001616 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001617 'as %s.\n'
1618 'Uploading may fail due to lack of permissions.' %
1619 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1620 confirm_or_exit(action='upload')
1621
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001622 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001623 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001624 or CQ status, assuming adherence to a common workflow.
1625
1626 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001627 * 'error' - error from review tool (including deleted issues)
1628 * 'unsent' - no reviewers added
1629 * 'waiting' - waiting for review
1630 * 'reply' - waiting for uploader to reply to review
1631 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001632 * 'dry-run' - dry-running in the CQ
1633 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001634 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001635 """
1636 if not self.GetIssue():
1637 return None
1638
1639 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001640 data = self._GetChangeDetail([
1641 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001642 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001643 return 'error'
1644
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001645 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001646 return 'closed'
1647
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001648 cq_label = data['labels'].get('Commit-Queue', {})
1649 max_cq_vote = 0
1650 for vote in cq_label.get('all', []):
1651 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1652 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001653 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001654 if max_cq_vote == 1:
1655 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001656
Aaron Gable9ab38c62017-04-06 14:36:33 -07001657 if data['labels'].get('Code-Review', {}).get('approved'):
1658 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001659
1660 if not data.get('reviewers', {}).get('REVIEWER', []):
1661 return 'unsent'
1662
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001663 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001664 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001665 while messages:
1666 m = messages.pop()
1667 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001668 # Ignore replies from CQ.
1669 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001670 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001671 # Most recent message was by owner.
1672 return 'waiting'
1673 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001674 # Some reply from non-owner.
1675 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001676
1677 # Somehow there are no messages even though there are reviewers.
1678 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001679
1680 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001681 if not self.GetIssue():
1682 return None
1683
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001684 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001685 patchset = data['revisions'][data['current_revision']]['_number']
1686 self.SetPatchset(patchset)
1687 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001688
Aaron Gable636b13f2017-07-14 10:42:48 -07001689 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001690 gerrit_util.SetReview(
1691 self._GetGerritHost(), self._GerritChangeIdentifier(),
1692 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001693
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001694 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001695 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001696 # CURRENT_REVISION is included to get the latest patchset so that
1697 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001698 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001699 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1700 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001701 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001702 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001703 robot_file_comments = gerrit_util.GetChangeRobotComments(
1704 self._GetGerritHost(), self._GerritChangeIdentifier())
1705
1706 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001707 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001708 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001709 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001710 line_comments = file_comments.setdefault(path, [])
1711 line_comments.extend(
1712 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001713
1714 # Build dictionary of file comments for easy access and sorting later.
1715 # {author+date: {path: {patchset: {line: url+message}}}}
1716 comments = collections.defaultdict(
1717 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001718 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001719 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001720 tag = comment.get('tag', '')
1721 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001722 continue
1723 key = (comment['author']['email'], comment['updated'])
1724 if comment.get('side', 'REVISION') == 'PARENT':
1725 patchset = 'Base'
1726 else:
1727 patchset = 'PS%d' % comment['patch_set']
1728 line = comment.get('line', 0)
1729 url = ('https://%s/c/%s/%s/%s#%s%s' %
1730 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1731 'b' if comment.get('side') == 'PARENT' else '',
1732 str(line) if line else ''))
1733 comments[key][path][patchset][line] = (url, comment['message'])
1734
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001735 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001736 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001737 summary = self._BuildCommentSummary(msg, comments, readable)
1738 if summary:
1739 summaries.append(summary)
1740 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001741
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001742 @staticmethod
1743 def _BuildCommentSummary(msg, comments, readable):
1744 key = (msg['author']['email'], msg['date'])
1745 # Don't bother showing autogenerated messages that don't have associated
1746 # file or line comments. this will filter out most autogenerated
1747 # messages, but will keep robot comments like those from Tricium.
1748 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1749 if is_autogenerated and not comments.get(key):
1750 return None
1751 message = msg['message']
1752 # Gerrit spits out nanoseconds.
1753 assert len(msg['date'].split('.')[-1]) == 9
1754 date = datetime.datetime.strptime(msg['date'][:-3],
1755 '%Y-%m-%d %H:%M:%S.%f')
1756 if key in comments:
1757 message += '\n'
1758 for path, patchsets in sorted(comments.get(key, {}).items()):
1759 if readable:
1760 message += '\n%s' % path
1761 for patchset, lines in sorted(patchsets.items()):
1762 for line, (url, content) in sorted(lines.items()):
1763 if line:
1764 line_str = 'Line %d' % line
1765 path_str = '%s:%d:' % (path, line)
1766 else:
1767 line_str = 'File comment'
1768 path_str = '%s:0:' % path
1769 if readable:
1770 message += '\n %s, %s: %s' % (patchset, line_str, url)
1771 message += '\n %s\n' % content
1772 else:
1773 message += '\n%s ' % path_str
1774 message += '\n%s\n' % content
1775
1776 return _CommentSummary(
1777 date=date,
1778 message=message,
1779 sender=msg['author']['email'],
1780 autogenerated=is_autogenerated,
1781 # These could be inferred from the text messages and correlated with
1782 # Code-Review label maximum, however this is not reliable.
1783 # Leaving as is until the need arises.
1784 approval=False,
1785 disapproval=False,
1786 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001787
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001788 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001789 gerrit_util.AbandonChange(
1790 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001792 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001793 gerrit_util.SubmitChange(
1794 self._GetGerritHost(), self._GerritChangeIdentifier(),
1795 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001796
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001797 def _GetChangeDetail(self, options=None):
1798 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001799 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001800 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001801
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001802 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001803 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001804 options.append('CURRENT_COMMIT')
1805
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001806 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001807 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001808 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001809
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001810 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1811 # Assumption: data fetched before with extra options is suitable
1812 # for return for a smaller set of options.
1813 # For example, if we cached data for
1814 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1815 # and request is for options=[CURRENT_REVISION],
1816 # THEN we can return prior cached data.
1817 if options_set.issubset(cached_options_set):
1818 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001819
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001820 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001821 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001822 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001823 except gerrit_util.GerritError as e:
1824 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001825 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001826 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001827
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001828 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001829 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001830
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001831 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001832 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001833 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001834 data = gerrit_util.GetChangeCommit(
1835 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001836 except gerrit_util.GerritError as e:
1837 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001838 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001839 raise
agable32978d92016-11-01 12:55:02 -07001840 return data
1841
Karen Qian40c19422019-03-13 21:28:29 +00001842 def _IsCqConfigured(self):
1843 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001844 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001845
Olivier Robin75ee7252018-04-13 10:02:56 +02001846 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001847 if git_common.is_dirty_git_tree('land'):
1848 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001849
tandriid60367b2016-06-22 05:25:12 -07001850 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001851 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001852 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001853 'which can test and land changes for you. '
1854 'Are you sure you wish to bypass it?\n',
1855 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001856 differs = True
tandriic4344b52016-08-29 06:04:54 -07001857 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001858 # Note: git diff outputs nothing if there is no diff.
1859 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001860 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001861 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001862 if detail['current_revision'] == last_upload:
1863 differs = False
1864 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001865 print('WARNING: Local branch contents differ from latest uploaded '
1866 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001867 if differs:
1868 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001869 confirm_or_exit(
1870 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1871 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001872 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001873 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001874 upstream = self.GetCommonAncestorWithUpstream()
1875 if self.GetIssue():
1876 description = self.FetchDescription()
1877 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001878 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001879 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001880 committing=True,
1881 may_prompt=not force,
1882 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001883 parallel=parallel,
1884 upstream=upstream,
1885 description=description,
1886 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001887
1888 self.SubmitIssue(wait_for_merge=True)
1889 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001890 links = self._GetChangeCommit().get('web_links', [])
1891 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001892 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001893 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001894 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001895 return 0
1896
Edward Lemurf38bc172019-09-03 21:02:13 +00001897 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001898 assert parsed_issue_arg.valid
1899
Edward Lemur125d60a2019-09-13 18:25:41 +00001900 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001901
1902 if parsed_issue_arg.hostname:
1903 self._gerrit_host = parsed_issue_arg.hostname
1904 self._gerrit_server = 'https://%s' % self._gerrit_host
1905
tandriic2405f52016-10-10 08:13:15 -07001906 try:
1907 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001908 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001909 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001910
1911 if not parsed_issue_arg.patchset:
1912 # Use current revision by default.
1913 revision_info = detail['revisions'][detail['current_revision']]
1914 patchset = int(revision_info['_number'])
1915 else:
1916 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001917 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001918 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1919 break
1920 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001921 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001922 (parsed_issue_arg.patchset, self.GetIssue()))
1923
Edward Lemur125d60a2019-09-13 18:25:41 +00001924 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001925 if remote_url.endswith('.git'):
1926 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001927 remote_url = remote_url.rstrip('/')
1928
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001929 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001930 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001931
1932 if remote_url != fetch_info['url']:
1933 DieWithError('Trying to patch a change from %s but this repo appears '
1934 'to be %s.' % (fetch_info['url'], remote_url))
1935
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001936 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001937
Aaron Gable62619a32017-06-16 08:22:09 -07001938 if force:
1939 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1940 print('Checked out commit for change %i patchset %i locally' %
1941 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001942 elif nocommit:
1943 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1944 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001945 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001946 RunGit(['cherry-pick', 'FETCH_HEAD'])
1947 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001948 (parsed_issue_arg.issue, patchset))
1949 print('Note: this created a local commit which does not have '
1950 'the same hash as the one uploaded for review. This will make '
1951 'uploading changes based on top of this branch difficult.\n'
1952 'If you want to do that, use "git cl patch --force" instead.')
1953
Stefan Zagerd08043c2017-10-12 12:07:02 -07001954 if self.GetBranch():
1955 self.SetIssue(parsed_issue_arg.issue)
1956 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001957 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001958 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1959 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1960 else:
1961 print('WARNING: You are in detached HEAD state.\n'
1962 'The patch has been applied to your checkout, but you will not be '
1963 'able to upload a new patch set to the gerrit issue.\n'
1964 'Try using the \'-b\' option if you would like to work on a '
1965 'branch and/or upload a new patch set.')
1966
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001967 return 0
1968
tandrii16e0b4e2016-06-07 10:34:28 -07001969 def _GerritCommitMsgHookCheck(self, offer_removal):
1970 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
1971 if not os.path.exists(hook):
1972 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001973 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
1974 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07001975 data = gclient_utils.FileRead(hook)
1976 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
1977 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001978 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07001979 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07001980 'and may interfere with it in subtle ways.\n'
1981 'We recommend you remove the commit-msg hook.')
1982 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001983 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07001984 gclient_utils.rm_file_or_tree(hook)
1985 print('Gerrit commit-msg hook removed.')
1986 else:
1987 print('OK, will keep Gerrit commit-msg hook in place.')
1988
Edward Lemur1b52d872019-05-09 21:12:12 +00001989 def _CleanUpOldTraces(self):
1990 """Keep only the last |MAX_TRACES| traces."""
1991 try:
1992 traces = sorted([
1993 os.path.join(TRACES_DIR, f)
1994 for f in os.listdir(TRACES_DIR)
1995 if (os.path.isfile(os.path.join(TRACES_DIR, f))
1996 and not f.startswith('tmp'))
1997 ])
1998 traces_to_delete = traces[:-MAX_TRACES]
1999 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002000 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002001 except OSError:
2002 print('WARNING: Failed to remove old git traces from\n'
2003 ' %s'
2004 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002005
Edward Lemur5737f022019-05-17 01:24:00 +00002006 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002007 """Zip and write the git push traces stored in traces_dir."""
2008 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002009 traces_zip = trace_name + '-traces'
2010 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002011 # Create a temporary dir to store git config and gitcookies in. It will be
2012 # compressed and stored next to the traces.
2013 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002014 git_info_zip = trace_name + '-git-info'
2015
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002016 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002017
Edward Lemur1b52d872019-05-09 21:12:12 +00002018 git_push_metadata['trace_name'] = trace_name
2019 gclient_utils.FileWrite(
2020 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2021
2022 # Keep only the first 6 characters of the git hashes on the packet
2023 # trace. This greatly decreases size after compression.
2024 packet_traces = os.path.join(traces_dir, 'trace-packet')
2025 if os.path.isfile(packet_traces):
2026 contents = gclient_utils.FileRead(packet_traces)
2027 gclient_utils.FileWrite(
2028 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2029 shutil.make_archive(traces_zip, 'zip', traces_dir)
2030
2031 # Collect and compress the git config and gitcookies.
2032 git_config = RunGit(['config', '-l'])
2033 gclient_utils.FileWrite(
2034 os.path.join(git_info_dir, 'git-config'),
2035 git_config)
2036
2037 cookie_auth = gerrit_util.Authenticator.get()
2038 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2039 gitcookies_path = cookie_auth.get_gitcookies_path()
2040 if os.path.isfile(gitcookies_path):
2041 gitcookies = gclient_utils.FileRead(gitcookies_path)
2042 gclient_utils.FileWrite(
2043 os.path.join(git_info_dir, 'gitcookies'),
2044 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2045 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2046
Edward Lemur1b52d872019-05-09 21:12:12 +00002047 gclient_utils.rmtree(git_info_dir)
2048
2049 def _RunGitPushWithTraces(
2050 self, change_desc, refspec, refspec_opts, git_push_metadata):
2051 """Run git push and collect the traces resulting from the execution."""
2052 # Create a temporary directory to store traces in. Traces will be compressed
2053 # and stored in a 'traces' dir inside depot_tools.
2054 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002055 trace_name = os.path.join(
2056 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002057
2058 env = os.environ.copy()
2059 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2060 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002061 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002062 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2063 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2064 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2065
2066 try:
2067 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002068 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002069 before_push = time_time()
2070 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002071 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002072 env=env,
2073 print_stdout=True,
2074 # Flush after every line: useful for seeing progress when running as
2075 # recipe.
2076 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002077 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002078 except subprocess2.CalledProcessError as e:
2079 push_returncode = e.returncode
2080 DieWithError('Failed to create a change. Please examine output above '
2081 'for the reason of the failure.\n'
2082 'Hint: run command below to diagnose common Git/Gerrit '
2083 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002084 ' git cl creds-check\n'
2085 '\n'
2086 'If git-cl is not working correctly, file a bug under the '
2087 'Infra>SDK component including the files below.\n'
2088 'Review the files before upload, since they might contain '
2089 'sensitive information.\n'
2090 'Set the Restrict-View-Google label so that they are not '
2091 'publicly accessible.\n'
2092 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002093 change_desc)
2094 finally:
2095 execution_time = time_time() - before_push
2096 metrics.collector.add_repeated('sub_commands', {
2097 'command': 'git push',
2098 'execution_time': execution_time,
2099 'exit_code': push_returncode,
2100 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2101 })
2102
Edward Lemur1b52d872019-05-09 21:12:12 +00002103 git_push_metadata['execution_time'] = execution_time
2104 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002105 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002106
Edward Lemur1b52d872019-05-09 21:12:12 +00002107 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002108 gclient_utils.rmtree(traces_dir)
2109
2110 return push_stdout
2111
Edward Lemura12175c2020-03-09 16:58:26 +00002112 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002113 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002114 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002115 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002116 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002117
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002118 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002119 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002120 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002121 # User requested to change description
2122 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002123 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002124 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002125 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002126 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002127 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002128 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002129 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002130 if len(change_ids) == 1:
2131 change_id = change_ids[0]
2132 else:
2133 change_id = GenerateGerritChangeId(change_desc.description)
2134 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002135
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002136 if options.preserve_tryjobs:
2137 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002138
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002139 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002140 parent = self._ComputeParent(
2141 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002142 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002143 with gclient_utils.temporary_file() as desc_tempfile:
2144 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2145 ref_to_push = RunGit(
2146 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002147 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148 if not git_footers.get_footer_change_id(change_desc.description):
2149 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002150 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002151 self._AddChangeIdToCommitMessage(
2152 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002153 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002154 # For no-squash mode, we assume the remote called "origin" is the one we
2155 # want. It is not worthwhile to support different workflows for
2156 # no-squash mode.
2157 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002158 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2159
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002160 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002161 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2162 ref_to_push)]).splitlines()
2163 if len(commits) > 1:
2164 print('WARNING: This will upload %d commits. Run the following command '
2165 'to see which commits will be uploaded: ' % len(commits))
2166 print('git log %s..%s' % (parent, ref_to_push))
2167 print('You can also use `git squash-branch` to squash these into a '
2168 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002169 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002170
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002171 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002172 cc = []
2173 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2174 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2175 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002176 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002177 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002178 if options.cc:
2179 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002180 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002181 if change_desc.get_cced():
2182 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002183 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2184 valid_accounts = set(reviewers + cc)
2185 # TODO(crbug/877717): relax this for all hosts.
2186 else:
2187 valid_accounts = gerrit_util.ValidAccounts(
2188 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002189 logging.info('accounts %s are recognized, %s invalid',
2190 sorted(valid_accounts),
2191 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002192
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002193 # Extra options that can be specified at push time. Doc:
2194 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002195 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002196
Aaron Gable844cf292017-06-28 11:32:59 -07002197 # By default, new changes are started in WIP mode, and subsequent patchsets
2198 # don't send email. At any time, passing --send-mail will mark the change
2199 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002200 if options.send_mail:
2201 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002202 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002203 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002204 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002205 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002206 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002207
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002208 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002209 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002210
Edward Lemur5a644f82020-03-18 16:44:57 +00002211 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002212 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002213 # Punctuation and whitespace in |title| must be percent-encoded.
2214 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002215
agablec6787972016-09-09 16:13:34 -07002216 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002217 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002218
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002219 for r in sorted(reviewers):
2220 if r in valid_accounts:
2221 refspec_opts.append('r=%s' % r)
2222 reviewers.remove(r)
2223 else:
2224 # TODO(tandrii): this should probably be a hard failure.
2225 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2226 % r)
2227 for c in sorted(cc):
2228 # refspec option will be rejected if cc doesn't correspond to an
2229 # account, even though REST call to add such arbitrary cc may succeed.
2230 if c in valid_accounts:
2231 refspec_opts.append('cc=%s' % c)
2232 cc.remove(c)
2233
rmistry9eadede2016-09-19 11:22:43 -07002234 if options.topic:
2235 # Documentation on Gerrit topics is here:
2236 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002237 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002238
Edward Lemur687ca902018-12-05 02:30:30 +00002239 if options.enable_auto_submit:
2240 refspec_opts.append('l=Auto-Submit+1')
2241 if options.use_commit_queue:
2242 refspec_opts.append('l=Commit-Queue+2')
2243 elif options.cq_dry_run:
2244 refspec_opts.append('l=Commit-Queue+1')
2245
2246 if change_desc.get_reviewers(tbr_only=True):
2247 score = gerrit_util.GetCodeReviewTbrScore(
2248 self._GetGerritHost(),
2249 self._GetGerritProject())
2250 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002251
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002252 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002253 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002254 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002255 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002256 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2257
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002258 refspec_suffix = ''
2259 if refspec_opts:
2260 refspec_suffix = '%' + ','.join(refspec_opts)
2261 assert ' ' not in refspec_suffix, (
2262 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2263 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2264
Edward Lemur1b52d872019-05-09 21:12:12 +00002265 git_push_metadata = {
2266 'gerrit_host': self._GetGerritHost(),
2267 'title': title or '<untitled>',
2268 'change_id': change_id,
2269 'description': change_desc.description,
2270 }
2271 push_stdout = self._RunGitPushWithTraces(
2272 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002273
2274 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002275 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 change_numbers = [m.group(1)
2277 for m in map(regex.match, push_stdout.splitlines())
2278 if m]
2279 if len(change_numbers) != 1:
2280 DieWithError(
2281 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002282 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002284 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002285
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002286 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002287 # GetIssue() is not set in case of non-squash uploads according to tests.
2288 # TODO(agable): non-squash uploads in git cl should be removed.
2289 gerrit_util.AddReviewers(
2290 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002291 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002292 reviewers, cc,
2293 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002294
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 return 0
2296
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002297 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2298 change_desc):
2299 """Computes parent of the generated commit to be uploaded to Gerrit.
2300
2301 Returns revision or a ref name.
2302 """
2303 if custom_cl_base:
2304 # Try to avoid creating additional unintended CLs when uploading, unless
2305 # user wants to take this risk.
2306 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2307 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2308 local_ref_of_target_remote])
2309 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002310 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002311 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2312 'If you proceed with upload, more than 1 CL may be created by '
2313 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2314 'If you are certain that specified base `%s` has already been '
2315 'uploaded to Gerrit as another CL, you may proceed.\n' %
2316 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2317 if not force:
2318 confirm_or_exit(
2319 'Do you take responsibility for cleaning up potential mess '
2320 'resulting from proceeding with upload?',
2321 action='upload')
2322 return custom_cl_base
2323
Aaron Gablef97e33d2017-03-30 15:44:27 -07002324 if remote != '.':
2325 return self.GetCommonAncestorWithUpstream()
2326
2327 # If our upstream branch is local, we base our squashed commit on its
2328 # squashed version.
2329 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2330
Aaron Gablef97e33d2017-03-30 15:44:27 -07002331 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002332 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002333
2334 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002335 # TODO(tandrii): consider checking parent change in Gerrit and using its
2336 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2337 # the tree hash of the parent branch. The upside is less likely bogus
2338 # requests to reupload parent change just because it's uploadhash is
2339 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002340 parent = scm.GIT.GetBranchConfig(
2341 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002342 # Verify that the upstream branch has been uploaded too, otherwise
2343 # Gerrit will create additional CLs when uploading.
2344 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2345 RunGitSilent(['rev-parse', parent + ':'])):
2346 DieWithError(
2347 '\nUpload upstream branch %s first.\n'
2348 'It is likely that this branch has been rebased since its last '
2349 'upload, so you just need to upload it again.\n'
2350 '(If you uploaded it with --no-squash, then branch dependencies '
2351 'are not supported, and you should reupload with --squash.)'
2352 % upstream_branch_name,
2353 change_desc)
2354 return parent
2355
Edward Lemura12175c2020-03-09 16:58:26 +00002356 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002357 """Re-commits using the current message, assumes the commit hook is in
2358 place.
2359 """
Edward Lemura12175c2020-03-09 16:58:26 +00002360 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002361 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002362 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002363 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002364 return new_log_desc
2365 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002366 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367
tandriie113dfd2016-10-11 10:20:12 -07002368 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002369 try:
2370 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002371 except GerritChangeNotExists:
2372 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002373
2374 if data['status'] in ('ABANDONED', 'MERGED'):
2375 return 'CL %s is closed' % self.GetIssue()
2376
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002377 def GetGerritChange(self, patchset=None):
2378 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002379 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002380 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002381 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002382 data = self._GetChangeDetail(['ALL_REVISIONS'])
2383
2384 assert host and issue and patchset, 'CL must be uploaded first'
2385
2386 has_patchset = any(
2387 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002388 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002389 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002390 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002391 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002392
tandrii8c5a3532016-11-04 07:52:02 -07002393 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002394 'host': host,
2395 'change': issue,
2396 'project': data['project'],
2397 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002398 }
tandriie113dfd2016-10-11 10:20:12 -07002399
tandriide281ae2016-10-12 06:02:30 -07002400 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002401 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002402
Edward Lemur707d70b2018-02-07 00:50:14 +01002403 def GetReviewers(self):
2404 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002405 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002406
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002407
tandriif9aefb72016-07-01 09:06:51 -07002408def _get_bug_line_values(default_project, bugs):
2409 """Given default_project and comma separated list of bugs, yields bug line
2410 values.
2411
2412 Each bug can be either:
2413 * a number, which is combined with default_project
2414 * string, which is left as is.
2415
2416 This function may produce more than one line, because bugdroid expects one
2417 project per line.
2418
2419 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2420 ['v8:123', 'chromium:789']
2421 """
2422 default_bugs = []
2423 others = []
2424 for bug in bugs.split(','):
2425 bug = bug.strip()
2426 if bug:
2427 try:
2428 default_bugs.append(int(bug))
2429 except ValueError:
2430 others.append(bug)
2431
2432 if default_bugs:
2433 default_bugs = ','.join(map(str, default_bugs))
2434 if default_project:
2435 yield '%s:%s' % (default_project, default_bugs)
2436 else:
2437 yield default_bugs
2438 for other in sorted(others):
2439 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2440 yield other
2441
2442
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002443class ChangeDescription(object):
2444 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002445 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002446 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002447 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002448 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002449 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002450 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2451 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002452 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002453 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002454
Dan Beamd8b04ca2019-10-10 21:23:26 +00002455 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002456 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002457 if bug:
2458 regexp = re.compile(self.BUG_LINE)
2459 prefix = settings.GetBugPrefix()
2460 if not any((regexp.match(line) for line in self._description_lines)):
2461 values = list(_get_bug_line_values(prefix, bug))
2462 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002463 if fixed:
2464 regexp = re.compile(self.FIXED_LINE)
2465 prefix = settings.GetBugPrefix()
2466 if not any((regexp.match(line) for line in self._description_lines)):
2467 values = list(_get_bug_line_values(prefix, fixed))
2468 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002469
agable@chromium.org42c20792013-09-12 17:34:49 +00002470 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002471 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002472 return '\n'.join(self._description_lines)
2473
2474 def set_description(self, desc):
2475 if isinstance(desc, basestring):
2476 lines = desc.splitlines()
2477 else:
2478 lines = [line.rstrip() for line in desc]
2479 while lines and not lines[0]:
2480 lines.pop(0)
2481 while lines and not lines[-1]:
2482 lines.pop(-1)
2483 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002484
Edward Lemur5a644f82020-03-18 16:44:57 +00002485 def ensure_change_id(self, change_id):
2486 description = self.description
2487 footer_change_ids = git_footers.get_footer_change_id(description)
2488 # Make sure that the Change-Id in the description matches the given one.
2489 if footer_change_ids != [change_id]:
2490 if footer_change_ids:
2491 # Remove any existing Change-Id footers since they don't match the
2492 # expected change_id footer.
2493 description = git_footers.remove_footer(description, 'Change-Id')
2494 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2495 'if you want to set a new one.')
2496 # Add the expected Change-Id footer.
2497 description = git_footers.add_footer_change_id(description, change_id)
2498 self.set_description(description)
2499
Edward Lemur2c62b332020-03-12 22:12:33 +00002500 def update_reviewers(
2501 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002502 """Rewrites the R=/TBR= line(s) as a single line each.
2503
2504 Args:
2505 reviewers (list(str)) - list of additional emails to use for reviewers.
2506 tbrs (list(str)) - list of additional emails to use for TBRs.
2507 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2508 the change that are missing OWNER coverage. If this is not None, you
2509 must also pass a value for `change`.
2510 change (Change) - The Change that should be used for OWNERS lookups.
2511 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002512 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002513 assert isinstance(tbrs, list), tbrs
2514
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002515 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002516 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002517
2518 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002519 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002520
2521 reviewers = set(reviewers)
2522 tbrs = set(tbrs)
2523 LOOKUP = {
2524 'TBR': tbrs,
2525 'R': reviewers,
2526 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002527
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002528 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002529 regexp = re.compile(self.R_LINE)
2530 matches = [regexp.match(line) for line in self._description_lines]
2531 new_desc = [l for i, l in enumerate(self._description_lines)
2532 if not matches[i]]
2533 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002534
agable@chromium.org42c20792013-09-12 17:34:49 +00002535 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002536
2537 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002538 for match in matches:
2539 if not match:
2540 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002541 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2542
2543 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002544 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002545 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002546 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002547 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002548 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002549 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002550 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002551
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002552 # If any folks ended up in both groups, remove them from tbrs.
2553 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002554
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002555 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2556 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002557
2558 # Put the new lines in the description where the old first R= line was.
2559 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2560 if 0 <= line_loc < len(self._description_lines):
2561 if new_tbr_line:
2562 self._description_lines.insert(line_loc, new_tbr_line)
2563 if new_r_line:
2564 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002565 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002566 if new_r_line:
2567 self.append_footer(new_r_line)
2568 if new_tbr_line:
2569 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002570
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002571 def set_preserve_tryjobs(self):
2572 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2573 footers = git_footers.parse_footers(self.description)
2574 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2575 if v.lower() == 'true':
2576 return
2577 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2578
Anthony Polito8b955342019-09-24 19:01:36 +00002579 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002580 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002581 self.set_description([
2582 '# Enter a description of the change.',
2583 '# This will be displayed on the codereview site.',
2584 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002585 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002586 '--------------------',
2587 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002588 bug_regexp = re.compile(self.BUG_LINE)
2589 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002590 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002591 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2592 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002593 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002594
agable@chromium.org42c20792013-09-12 17:34:49 +00002595 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002596 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002597 if not content:
2598 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002599 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002600
Bruce Dawson2377b012018-01-11 16:46:49 -08002601 # Strip off comments and default inserted "Bug:" line.
2602 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002603 (line.startswith('#') or
2604 line.rstrip() == "Bug:" or
2605 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002606 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002607 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002608 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002609
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002610 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002611 """Adds a footer line to the description.
2612
2613 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2614 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2615 that Gerrit footers are always at the end.
2616 """
2617 parsed_footer_line = git_footers.parse_footer(line)
2618 if parsed_footer_line:
2619 # Line is a gerrit footer in the form: Footer-Key: any value.
2620 # Thus, must be appended observing Gerrit footer rules.
2621 self.set_description(
2622 git_footers.add_footer(self.description,
2623 key=parsed_footer_line[0],
2624 value=parsed_footer_line[1]))
2625 return
2626
2627 if not self._description_lines:
2628 self._description_lines.append(line)
2629 return
2630
2631 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2632 if gerrit_footers:
2633 # git_footers.split_footers ensures that there is an empty line before
2634 # actual (gerrit) footers, if any. We have to keep it that way.
2635 assert top_lines and top_lines[-1] == ''
2636 top_lines, separator = top_lines[:-1], top_lines[-1:]
2637 else:
2638 separator = [] # No need for separator if there are no gerrit_footers.
2639
2640 prev_line = top_lines[-1] if top_lines else ''
2641 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2642 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2643 top_lines.append('')
2644 top_lines.append(line)
2645 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002646
tandrii99a72f22016-08-17 14:33:24 -07002647 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002648 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002649 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002650 reviewers = [match.group(2).strip()
2651 for match in matches
2652 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002653 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002654
bradnelsond975b302016-10-23 12:20:23 -07002655 def get_cced(self):
2656 """Retrieves the list of reviewers."""
2657 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2658 cced = [match.group(2).strip() for match in matches if match]
2659 return cleanup_list(cced)
2660
Nodir Turakulov23b82142017-11-16 11:04:25 -08002661 def get_hash_tags(self):
2662 """Extracts and sanitizes a list of Gerrit hashtags."""
2663 subject = (self._description_lines or ('',))[0]
2664 subject = re.sub(
2665 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2666
2667 tags = []
2668 start = 0
2669 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2670 while True:
2671 m = bracket_exp.match(subject, start)
2672 if not m:
2673 break
2674 tags.append(self.sanitize_hash_tag(m.group(1)))
2675 start = m.end()
2676
2677 if not tags:
2678 # Try "Tag: " prefix.
2679 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2680 if m:
2681 tags.append(self.sanitize_hash_tag(m.group(1)))
2682 return tags
2683
2684 @classmethod
2685 def sanitize_hash_tag(cls, tag):
2686 """Returns a sanitized Gerrit hash tag.
2687
2688 A sanitized hashtag can be used as a git push refspec parameter value.
2689 """
2690 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2691
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002692
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002693def FindCodereviewSettingsFile(filename='codereview.settings'):
2694 """Finds the given file starting in the cwd and going up.
2695
2696 Only looks up to the top of the repository unless an
2697 'inherit-review-settings-ok' file exists in the root of the repository.
2698 """
2699 inherit_ok_file = 'inherit-review-settings-ok'
2700 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002701 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002702 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2703 root = '/'
2704 while True:
2705 if filename in os.listdir(cwd):
2706 if os.path.isfile(os.path.join(cwd, filename)):
2707 return open(os.path.join(cwd, filename))
2708 if cwd == root:
2709 break
2710 cwd = os.path.dirname(cwd)
2711
2712
2713def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002714 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002715 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002717 def SetProperty(name, setting, unset_error_ok=False):
2718 fullname = 'rietveld.' + name
2719 if setting in keyvals:
2720 RunGit(['config', fullname, keyvals[setting]])
2721 else:
2722 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2723
tandrii48df5812016-10-17 03:55:37 -07002724 if not keyvals.get('GERRIT_HOST', False):
2725 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002726 # Only server setting is required. Other settings can be absent.
2727 # In that case, we ignore errors raised during option deletion attempt.
2728 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2729 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2730 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002731 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002732 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2733 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002734 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2735 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002736 SetProperty(
2737 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002738
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002739 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002740 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002741
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002742 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Mike Frysinger31a538a2020-05-05 18:38:51 +00002743 print('WARNING: GERRIT_SQUASH_UPLOADS in codereview.settings is no longer '
2744 'supported. Please delete it and update your ~/.gitconfig instead.')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002745
tandrii@chromium.org28253532016-04-14 13:46:56 +00002746 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002747 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002748 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002750 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002751 # should be of the form
2752 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2753 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002754 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2755 keyvals['ORIGIN_URL_CONFIG']])
2756
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002757
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002758def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002759 """Downloads a network object to a local file, like urllib.urlretrieve.
2760
2761 This is necessary because urllib is broken for SSL connections via a proxy.
2762 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002763 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002764 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002765
2766
ukai@chromium.org712d6102013-11-27 00:52:58 +00002767def hasSheBang(fname):
2768 """Checks fname is a #! script."""
2769 with open(fname) as f:
2770 return f.read(2).startswith('#!')
2771
2772
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002773def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002774 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002775
2776 Args:
2777 force: True to update hooks. False to install hooks if not present.
2778 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002779 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002780 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2781 if not os.access(dst, os.X_OK):
2782 if os.path.exists(dst):
2783 if not force:
2784 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002785 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002786 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002787 if not hasSheBang(dst):
2788 DieWithError('Not a script: %s\n'
2789 'You need to download from\n%s\n'
2790 'into .git/hooks/commit-msg and '
2791 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002792 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2793 except Exception:
2794 if os.path.exists(dst):
2795 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002796 DieWithError('\nFailed to download hooks.\n'
2797 'You need to download from\n%s\n'
2798 'into .git/hooks/commit-msg and '
2799 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002800
2801
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002802class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002803 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002804
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002805 _GOOGLESOURCE = 'googlesource.com'
2806
2807 def __init__(self):
2808 # Cached list of [host, identity, source], where source is either
2809 # .gitcookies or .netrc.
2810 self._all_hosts = None
2811
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002812 def ensure_configured_gitcookies(self):
2813 """Runs checks and suggests fixes to make git use .gitcookies from default
2814 path."""
2815 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2816 configured_path = RunGitSilent(
2817 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002818 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002819 if configured_path:
2820 self._ensure_default_gitcookies_path(configured_path, default)
2821 else:
2822 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002823
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002824 @staticmethod
2825 def _ensure_default_gitcookies_path(configured_path, default_path):
2826 assert configured_path
2827 if configured_path == default_path:
2828 print('git is already configured to use your .gitcookies from %s' %
2829 configured_path)
2830 return
2831
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002832 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002833 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2834 (configured_path, default_path))
2835
2836 if not os.path.exists(configured_path):
2837 print('However, your configured .gitcookies file is missing.')
2838 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2839 action='reconfigure')
2840 RunGit(['config', '--global', 'http.cookiefile', default_path])
2841 return
2842
2843 if os.path.exists(default_path):
2844 print('WARNING: default .gitcookies file already exists %s' %
2845 default_path)
2846 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2847 default_path)
2848
2849 confirm_or_exit('Move existing .gitcookies to default location?',
2850 action='move')
2851 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002852 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002853 print('Moved and reconfigured git to use .gitcookies from %s' %
2854 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002855
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002856 @staticmethod
2857 def _configure_gitcookies_path(default_path):
2858 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2859 if os.path.exists(netrc_path):
2860 print('You seem to be using outdated .netrc for git credentials: %s' %
2861 netrc_path)
2862 print('This tool will guide you through setting up recommended '
2863 '.gitcookies store for git credentials.\n'
2864 '\n'
2865 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2866 ' git config --global --unset http.cookiefile\n'
2867 ' mv %s %s.backup\n\n' % (default_path, default_path))
2868 confirm_or_exit(action='setup .gitcookies')
2869 RunGit(['config', '--global', 'http.cookiefile', default_path])
2870 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002871
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002872 def get_hosts_with_creds(self, include_netrc=False):
2873 if self._all_hosts is None:
2874 a = gerrit_util.CookiesAuthenticator()
2875 self._all_hosts = [
2876 (h, u, s)
2877 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002878 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2879 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002880 )
2881 if h.endswith(self._GOOGLESOURCE)
2882 ]
2883
2884 if include_netrc:
2885 return self._all_hosts
2886 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2887
2888 def print_current_creds(self, include_netrc=False):
2889 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2890 if not hosts:
2891 print('No Git/Gerrit credentials found')
2892 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002893 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002894 header = [('Host', 'User', 'Which file'),
2895 ['=' * l for l in lengths]]
2896 for row in (header + hosts):
2897 print('\t'.join((('%%+%ds' % l) % s)
2898 for l, s in zip(lengths, row)))
2899
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002900 @staticmethod
2901 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002902 """Parses identity "git-<username>.domain" into <username> and domain."""
2903 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002904 # distinguishable from sub-domains. But we do know typical domains:
2905 if identity.endswith('.chromium.org'):
2906 domain = 'chromium.org'
2907 username = identity[:-len('.chromium.org')]
2908 else:
2909 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002910 if username.startswith('git-'):
2911 username = username[len('git-'):]
2912 return username, domain
2913
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002914 def _canonical_git_googlesource_host(self, host):
2915 """Normalizes Gerrit hosts (with '-review') to Git host."""
2916 assert host.endswith(self._GOOGLESOURCE)
2917 # Prefix doesn't include '.' at the end.
2918 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2919 if prefix.endswith('-review'):
2920 prefix = prefix[:-len('-review')]
2921 return prefix + '.' + self._GOOGLESOURCE
2922
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002923 def _canonical_gerrit_googlesource_host(self, host):
2924 git_host = self._canonical_git_googlesource_host(host)
2925 prefix = git_host.split('.', 1)[0]
2926 return prefix + '-review.' + self._GOOGLESOURCE
2927
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002928 def _get_counterpart_host(self, host):
2929 assert host.endswith(self._GOOGLESOURCE)
2930 git = self._canonical_git_googlesource_host(host)
2931 gerrit = self._canonical_gerrit_googlesource_host(git)
2932 return git if gerrit == host else gerrit
2933
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002934 def has_generic_host(self):
2935 """Returns whether generic .googlesource.com has been configured.
2936
2937 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2938 """
2939 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2940 if host == '.' + self._GOOGLESOURCE:
2941 return True
2942 return False
2943
2944 def _get_git_gerrit_identity_pairs(self):
2945 """Returns map from canonic host to pair of identities (Git, Gerrit).
2946
2947 One of identities might be None, meaning not configured.
2948 """
2949 host_to_identity_pairs = {}
2950 for host, identity, _ in self.get_hosts_with_creds():
2951 canonical = self._canonical_git_googlesource_host(host)
2952 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2953 idx = 0 if canonical == host else 1
2954 pair[idx] = identity
2955 return host_to_identity_pairs
2956
2957 def get_partially_configured_hosts(self):
2958 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002959 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002960 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002961 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002962
2963 def get_conflicting_hosts(self):
2964 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002965 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002966 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002967 if None not in (i1, i2) and i1 != i2)
2968
2969 def get_duplicated_hosts(self):
2970 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002971 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002972
2973 _EXPECTED_HOST_IDENTITY_DOMAINS = {
2974 'chromium.googlesource.com': 'chromium.org',
2975 'chrome-internal.googlesource.com': 'google.com',
2976 }
2977
2978 def get_hosts_with_wrong_identities(self):
2979 """Finds hosts which **likely** reference wrong identities.
2980
2981 Note: skips hosts which have conflicting identities for Git and Gerrit.
2982 """
2983 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002984 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002985 pair = self._get_git_gerrit_identity_pairs().get(host)
2986 if pair and pair[0] == pair[1]:
2987 _, domain = self._parse_identity(pair[0])
2988 if domain != expected:
2989 hosts.add(host)
2990 return hosts
2991
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002992 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002993 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002994 hosts = sorted(hosts)
2995 assert hosts
2996 if extra_column_func is None:
2997 extras = [''] * len(hosts)
2998 else:
2999 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003000 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3001 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003002 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003003 lines.append(tmpl % he)
3004 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003005
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003006 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003007 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003008 yield ('.googlesource.com wildcard record detected',
3009 ['Chrome Infrastructure team recommends to list full host names '
3010 'explicitly.'],
3011 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003012
3013 dups = self.get_duplicated_hosts()
3014 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003015 yield ('The following hosts were defined twice',
3016 self._format_hosts(dups),
3017 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003018
3019 partial = self.get_partially_configured_hosts()
3020 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003021 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3022 'These hosts are missing',
3023 self._format_hosts(partial, lambda host: 'but %s defined' %
3024 self._get_counterpart_host(host)),
3025 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003026
3027 conflicting = self.get_conflicting_hosts()
3028 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003029 yield ('The following Git hosts have differing credentials from their '
3030 'Gerrit counterparts',
3031 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3032 tuple(self._get_git_gerrit_identity_pairs()[host])),
3033 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003034
3035 wrong = self.get_hosts_with_wrong_identities()
3036 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003037 yield ('These hosts likely use wrong identity',
3038 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3039 (self._get_git_gerrit_identity_pairs()[host][0],
3040 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3041 wrong)
3042
3043 def find_and_report_problems(self):
3044 """Returns True if there was at least one problem, else False."""
3045 found = False
3046 bad_hosts = set()
3047 for title, sublines, hosts in self._find_problems():
3048 if not found:
3049 found = True
3050 print('\n\n.gitcookies problem report:\n')
3051 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003052 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003053 if sublines:
3054 print()
3055 print(' %s' % '\n '.join(sublines))
3056 print()
3057
3058 if bad_hosts:
3059 assert found
3060 print(' You can manually remove corresponding lines in your %s file and '
3061 'visit the following URLs with correct account to generate '
3062 'correct credential lines:\n' %
3063 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3064 print(' %s' % '\n '.join(sorted(set(
3065 gerrit_util.CookiesAuthenticator().get_new_password_url(
3066 self._canonical_git_googlesource_host(host))
3067 for host in bad_hosts
3068 ))))
3069 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003070
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003071
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003072@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003073def CMDcreds_check(parser, args):
3074 """Checks credentials and suggests changes."""
3075 _, _ = parser.parse_args(args)
3076
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003077 # Code below checks .gitcookies. Abort if using something else.
3078 authn = gerrit_util.Authenticator.get()
3079 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003080 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003081 'This command is not designed for bot environment. It checks '
3082 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003083 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3084 if isinstance(authn, gerrit_util.GceAuthenticator):
3085 message += (
3086 '\n'
3087 'If you need to run this on GCE or a cloudtop instance, '
3088 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3089 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003090
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003091 checker = _GitCookiesChecker()
3092 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003093
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003094 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003095 checker.print_current_creds(include_netrc=True)
3096
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003097 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003098 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003099 return 0
3100 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003101
3102
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003103@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003104def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003105 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003106 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003107 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003108 _, args = parser.parse_args(args)
3109 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003110 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003111 return RunGit(['config', 'branch.%s.base-url' % branch],
3112 error_ok=False).strip()
3113 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003114 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003115 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3116 error_ok=False).strip()
3117
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003118
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003119def color_for_status(status):
3120 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003121 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003122 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003123 'unsent': BOLD + Fore.YELLOW,
3124 'waiting': BOLD + Fore.RED,
3125 'reply': BOLD + Fore.YELLOW,
3126 'not lgtm': BOLD + Fore.RED,
3127 'lgtm': BOLD + Fore.GREEN,
3128 'commit': BOLD + Fore.MAGENTA,
3129 'closed': BOLD + Fore.CYAN,
3130 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003131 }.get(status, Fore.WHITE)
3132
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003133
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003134def get_cl_statuses(changes, fine_grained, max_processes=None):
3135 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003136
3137 If fine_grained is true, this will fetch CL statuses from the server.
3138 Otherwise, simply indicate if there's a matching url for the given branches.
3139
3140 If max_processes is specified, it is used as the maximum number of processes
3141 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3142 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003143
3144 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003145 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003146 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003147 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003148
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003149 if not fine_grained:
3150 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003151 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003152 for cl in changes:
3153 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003154 return
3155
3156 # First, sort out authentication issues.
3157 logging.debug('ensuring credentials exist')
3158 for cl in changes:
3159 cl.EnsureAuthenticated(force=False, refresh=True)
3160
3161 def fetch(cl):
3162 try:
3163 return (cl, cl.GetStatus())
3164 except:
3165 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003166 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003167 raise
3168
3169 threads_count = len(changes)
3170 if max_processes:
3171 threads_count = max(1, min(threads_count, max_processes))
3172 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3173
Edward Lemur61bf4172020-02-24 23:22:37 +00003174 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003175 fetched_cls = set()
3176 try:
3177 it = pool.imap_unordered(fetch, changes).__iter__()
3178 while True:
3179 try:
3180 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003181 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003182 break
3183 fetched_cls.add(cl)
3184 yield cl, status
3185 finally:
3186 pool.close()
3187
3188 # Add any branches that failed to fetch.
3189 for cl in set(changes) - fetched_cls:
3190 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003191
rmistry@google.com2dd99862015-06-22 12:22:18 +00003192
Jose Lopes3863fc52020-04-07 17:00:25 +00003193def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003194 """Uploads CLs of local branches that are dependents of the current branch.
3195
3196 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003197
3198 test1 -> test2.1 -> test3.1
3199 -> test3.2
3200 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003201
3202 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3203 run on the dependent branches in this order:
3204 test2.1, test3.1, test3.2, test2.2, test3.3
3205
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003206 Note: This function does not rebase your local dependent branches. Use it
3207 when you make a change to the parent branch that will not conflict
3208 with its dependent branches, and you would like their dependencies
3209 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003210 """
3211 if git_common.is_dirty_git_tree('upload-branch-deps'):
3212 return 1
3213
3214 root_branch = cl.GetBranch()
3215 if root_branch is None:
3216 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3217 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003218 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003219 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3220 'patchset dependencies without an uploaded CL.')
3221
3222 branches = RunGit(['for-each-ref',
3223 '--format=%(refname:short) %(upstream:short)',
3224 'refs/heads'])
3225 if not branches:
3226 print('No local branches found.')
3227 return 0
3228
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003229 # Create a dictionary of all local branches to the branches that are
3230 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003231 tracked_to_dependents = collections.defaultdict(list)
3232 for b in branches.splitlines():
3233 tokens = b.split()
3234 if len(tokens) == 2:
3235 branch_name, tracked = tokens
3236 tracked_to_dependents[tracked].append(branch_name)
3237
vapiera7fbd5a2016-06-16 09:17:49 -07003238 print()
3239 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003240 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003241
rmistry@google.com2dd99862015-06-22 12:22:18 +00003242 def traverse_dependents_preorder(branch, padding=''):
3243 dependents_to_process = tracked_to_dependents.get(branch, [])
3244 padding += ' '
3245 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003246 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003247 dependents.append(dependent)
3248 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003249
rmistry@google.com2dd99862015-06-22 12:22:18 +00003250 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003251 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003252
3253 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003254 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003255 return 0
3256
Jose Lopes3863fc52020-04-07 17:00:25 +00003257 if not force:
3258 confirm_or_exit('This command will checkout all dependent branches and run '
3259 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003260
rmistry@google.com2dd99862015-06-22 12:22:18 +00003261 # Record all dependents that failed to upload.
3262 failures = {}
3263 # Go through all dependents, checkout the branch and upload.
3264 try:
3265 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003266 print()
3267 print('--------------------------------------')
3268 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003269 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003270 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003271 try:
3272 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003273 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003274 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003275 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003276 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003277 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003278 finally:
3279 # Swap back to the original root branch.
3280 RunGit(['checkout', '-q', root_branch])
3281
vapiera7fbd5a2016-06-16 09:17:49 -07003282 print()
3283 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003284 for dependent_branch in dependents:
3285 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003286 print(' %s : %s' % (dependent_branch, upload_status))
3287 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003288
3289 return 0
3290
3291
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003292def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003293 """Given a proposed tag name, returns a tag name that is guaranteed to be
3294 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3295 or 'foo-3', and so on."""
3296
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003297 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003298 for suffix_num in itertools.count(1):
3299 if suffix_num == 1:
3300 to_check = proposed_tag
3301 else:
3302 to_check = '%s-%d' % (proposed_tag, suffix_num)
3303
3304 if to_check not in existing_tags:
3305 return to_check
3306
3307
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003308@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003309def CMDarchive(parser, args):
3310 """Archives and deletes branches associated with closed changelists."""
3311 parser.add_option(
3312 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003313 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003314 parser.add_option(
3315 '-f', '--force', action='store_true',
3316 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003317 parser.add_option(
3318 '-d', '--dry-run', action='store_true',
3319 help='Skip the branch tagging and removal steps.')
3320 parser.add_option(
3321 '-t', '--notags', action='store_true',
3322 help='Do not tag archived branches. '
3323 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003324 parser.add_option(
3325 '-p',
3326 '--pattern',
3327 default='git-cl-archived-{issue}-{branch}',
3328 help='Format string for archive tags. '
3329 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003330
kmarshall3bff56b2016-06-06 18:31:47 -07003331 options, args = parser.parse_args(args)
3332 if args:
3333 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003334
3335 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3336 if not branches:
3337 return 0
3338
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003339 tags = RunGit(['for-each-ref', '--format=%(refname)',
3340 'refs/tags']).splitlines() or []
3341 tags = [t.split('/')[-1] for t in tags]
3342
vapiera7fbd5a2016-06-16 09:17:49 -07003343 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003344 changes = [Changelist(branchref=b)
3345 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003346 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3347 statuses = get_cl_statuses(changes,
3348 fine_grained=True,
3349 max_processes=options.maxjobs)
3350 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003351 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3352 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003353 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003354 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003355 proposal.sort()
3356
3357 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003358 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003359 return 0
3360
Edward Lemur85153282020-02-14 22:06:29 +00003361 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003362
vapiera7fbd5a2016-06-16 09:17:49 -07003363 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003364 if options.notags:
3365 for next_item in proposal:
3366 print(' ' + next_item[0])
3367 else:
3368 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3369 for next_item in proposal:
3370 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003371
kmarshall9249e012016-08-23 12:02:16 -07003372 # Quit now on precondition failure or if instructed by the user, either
3373 # via an interactive prompt or by command line flags.
3374 if options.dry_run:
3375 print('\nNo changes were made (dry run).\n')
3376 return 0
3377 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003378 print('You are currently on a branch \'%s\' which is associated with a '
3379 'closed codereview issue, so archive cannot proceed. Please '
3380 'checkout another branch and run this command again.' %
3381 current_branch)
3382 return 1
kmarshall9249e012016-08-23 12:02:16 -07003383 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003384 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003385 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003386 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003387 return 1
3388
3389 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003390 if not options.notags:
3391 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003392
3393 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3394 # Clean up the tag if we failed to delete the branch.
3395 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003396
vapiera7fbd5a2016-06-16 09:17:49 -07003397 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003398
3399 return 0
3400
3401
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003402@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003404 """Show status of changelists.
3405
3406 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003407 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003408 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003409 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003410 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003411 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003412 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003413 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003414
3415 Also see 'git cl comments'.
3416 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003417 parser.add_option(
3418 '--no-branch-color',
3419 action='store_true',
3420 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003421 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003422 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003423 parser.add_option('-f', '--fast', action='store_true',
3424 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003425 parser.add_option(
3426 '-j', '--maxjobs', action='store', type=int,
3427 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003428 parser.add_option(
3429 '-i', '--issue', type=int,
3430 help='Operate on this issue instead of the current branch\'s implicit '
3431 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003432 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003433 if args:
3434 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435
iannuccie53c9352016-08-17 14:40:40 -07003436 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003437 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003438
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003439 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003440 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003441 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003442 if cl.GetIssue():
3443 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003444 elif options.field == 'id':
3445 issueid = cl.GetIssue()
3446 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003447 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003448 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003449 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003450 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003451 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003452 elif options.field == 'status':
3453 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003454 elif options.field == 'url':
3455 url = cl.GetIssueURL()
3456 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003457 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003458 return 0
3459
3460 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3461 if not branches:
3462 print('No local branch found.')
3463 return 0
3464
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003465 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003466 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003467 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003468 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003469 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003470 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003471 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003472
Edward Lemur85153282020-02-14 22:06:29 +00003473 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003474
3475 def FormatBranchName(branch, colorize=False):
3476 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3477 an asterisk when it is the current branch."""
3478
3479 asterisk = ""
3480 color = Fore.RESET
3481 if branch == current_branch:
3482 asterisk = "* "
3483 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003484 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003485
3486 if colorize:
3487 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003488 return asterisk + branch_name
3489
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003490 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003491
3492 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003493 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3494 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003495 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003496 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003497 branch_statuses[c.GetBranch()] = status
3498 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003499 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003500 if url and (not status or status == 'error'):
3501 # The issue probably doesn't exist anymore.
3502 url += ' (broken)'
3503
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003504 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003505 # Turn off bold as well as colors.
3506 END = '\033[0m'
3507 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003508 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003509 color = ''
3510 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003511 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003512
Alan Cuttera3be9a52019-03-04 18:50:33 +00003513 branch_display = FormatBranchName(branch)
3514 padding = ' ' * (alignment - len(branch_display))
3515 if not options.no_branch_color:
3516 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003517
Alan Cuttera3be9a52019-03-04 18:50:33 +00003518 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3519 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003520
vapiera7fbd5a2016-06-16 09:17:49 -07003521 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003522 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003523 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003524 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003525 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003526 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003528 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003529 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003530 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003531 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003532 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003533 return 0
3534
3535
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003536def colorize_CMDstatus_doc():
3537 """To be called once in main() to add colors to git cl status help."""
3538 colors = [i for i in dir(Fore) if i[0].isupper()]
3539
3540 def colorize_line(line):
3541 for color in colors:
3542 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003543 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003544 indent = len(line) - len(line.lstrip(' ')) + 1
3545 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3546 return line
3547
3548 lines = CMDstatus.__doc__.splitlines()
3549 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3550
3551
phajdan.jre328cf92016-08-22 04:12:17 -07003552def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003553 if path == '-':
3554 json.dump(contents, sys.stdout)
3555 else:
3556 with open(path, 'w') as f:
3557 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003558
3559
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003560@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003561@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003562def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003563 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003564
3565 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003566 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003567 parser.add_option('-r', '--reverse', action='store_true',
3568 help='Lookup the branch(es) for the specified issues. If '
3569 'no issues are specified, all branches with mapped '
3570 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003571 parser.add_option('--json',
3572 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003573 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003574
dnj@chromium.org406c4402015-03-03 17:22:28 +00003575 if options.reverse:
3576 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003577 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003578 # Reverse issue lookup.
3579 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003580
3581 git_config = {}
3582 for config in RunGit(['config', '--get-regexp',
3583 r'branch\..*issue']).splitlines():
3584 name, _space, val = config.partition(' ')
3585 git_config[name] = val
3586
dnj@chromium.org406c4402015-03-03 17:22:28 +00003587 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003588 issue = git_config.get(
3589 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003590 if issue:
3591 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003592 if not args:
3593 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003594 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003595 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003596 try:
3597 issue_num = int(issue)
3598 except ValueError:
3599 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003600 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003601 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003602 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003603 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003604 if options.json:
3605 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003606 return 0
3607
3608 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003609 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003610 if not issue.valid:
3611 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3612 'or no argument to list it.\n'
3613 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003614 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003615 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003616 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003617 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003618 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3619 if options.json:
3620 write_json(options.json, {
3621 'issue': cl.GetIssue(),
3622 'issue_url': cl.GetIssueURL(),
3623 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624 return 0
3625
3626
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003627@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003628def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003629 """Shows or posts review comments for any changelist."""
3630 parser.add_option('-a', '--add-comment', dest='comment',
3631 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003632 parser.add_option('-p', '--publish', action='store_true',
3633 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003634 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003635 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003636 parser.add_option('-m', '--machine-readable', dest='readable',
3637 action='store_false', default=True,
3638 help='output comments in a format compatible with '
3639 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003640 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003641 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003642 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003643
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003644 issue = None
3645 if options.issue:
3646 try:
3647 issue = int(options.issue)
3648 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003649 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003650
Edward Lemur934836a2019-09-09 20:16:54 +00003651 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003652
3653 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003654 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003655 return 0
3656
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003657 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3658 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003659 for comment in summary:
3660 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003661 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003662 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003663 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003664 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003665 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003666 elif comment.autogenerated:
3667 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003668 else:
3669 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003670 print('\n%s%s %s%s\n%s' % (
3671 color,
3672 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3673 comment.sender,
3674 Fore.RESET,
3675 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3676
smut@google.comc85ac942015-09-15 16:34:43 +00003677 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003678 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003679 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003680 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3681 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003682 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003683 return 0
3684
3685
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003686@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003687@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003688def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003689 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003690 parser.add_option('-d', '--display', action='store_true',
3691 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003692 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003693 help='New description to set for this issue (- for stdin, '
3694 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003695 parser.add_option('-f', '--force', action='store_true',
3696 help='Delete any unpublished Gerrit edits for this issue '
3697 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003698
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003699 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003700
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003701 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003702 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003703 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003704 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003705 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003706
Edward Lemur934836a2019-09-09 20:16:54 +00003707 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003708 if target_issue_arg:
3709 kwargs['issue'] = target_issue_arg.issue
3710 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003711
3712 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003713 if not cl.GetIssue():
3714 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003715
Edward Lemur678a6842019-10-03 22:25:05 +00003716 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003717 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003718
Edward Lemur6c6827c2020-02-06 21:15:18 +00003719 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003720
smut@google.com34fb6b12015-07-13 20:03:26 +00003721 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003722 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003723 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003724
3725 if options.new_description:
3726 text = options.new_description
3727 if text == '-':
3728 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003729 elif text == '+':
3730 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003731 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003732
3733 description.set_description(text)
3734 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003735 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003736 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003737 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003738 return 0
3739
3740
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003741@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003742def CMDlint(parser, args):
3743 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003744 parser.add_option('--filter', action='append', metavar='-x,+y',
3745 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003746 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003747
3748 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003749 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003750 try:
3751 import cpplint
3752 import cpplint_chromium
3753 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003754 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003755 return 1
3756
3757 # Change the current working directory before calling lint so that it
3758 # shows the correct base.
3759 previous_cwd = os.getcwd()
3760 os.chdir(settings.GetRoot())
3761 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003762 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003763 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003764 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003765 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003766 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003767
3768 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003769 command = args + files
3770 if options.filter:
3771 command = ['--filter=' + ','.join(options.filter)] + command
3772 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003773
3774 white_regex = re.compile(settings.GetLintRegex())
3775 black_regex = re.compile(settings.GetLintIgnoreRegex())
3776 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3777 for filename in filenames:
3778 if white_regex.match(filename):
3779 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003780 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003781 else:
3782 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3783 extra_check_functions)
3784 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003785 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003786 finally:
3787 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003788 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003789 if cpplint._cpplint_state.error_count != 0:
3790 return 1
3791 return 0
3792
3793
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003794@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003795def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003796 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003797 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003798 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003799 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003800 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003801 parser.add_option('--all', action='store_true',
3802 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003803 parser.add_option('--parallel', action='store_true',
3804 help='Run all tests specified by input_api.RunTests in all '
3805 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003806 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807
sbc@chromium.org71437c02015-04-09 19:29:40 +00003808 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003810 return 1
3811
Edward Lemur934836a2019-09-09 20:16:54 +00003812 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003813 if args:
3814 base_branch = args[0]
3815 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003816 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003817 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003819 if cl.GetIssue():
3820 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003821 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003822 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003823
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003824 cl.RunHook(
3825 committing=not options.upload,
3826 may_prompt=False,
3827 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003828 parallel=options.parallel,
3829 upstream=base_branch,
3830 description=description,
3831 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003832 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003833
3834
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003835def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003836 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003837
3838 Works the same way as
3839 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3840 but can be called on demand on all platforms.
3841
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003842 The basic idea is to generate git hash of a state of the tree, original
3843 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003844 """
3845 lines = []
3846 tree_hash = RunGitSilent(['write-tree'])
3847 lines.append('tree %s' % tree_hash.strip())
3848 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3849 if code == 0:
3850 lines.append('parent %s' % parent.strip())
3851 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3852 lines.append('author %s' % author.strip())
3853 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3854 lines.append('committer %s' % committer.strip())
3855 lines.append('')
3856 # Note: Gerrit's commit-hook actually cleans message of some lines and
3857 # whitespace. This code is not doing this, but it clearly won't decrease
3858 # entropy.
3859 lines.append(message)
3860 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003861 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003862 return 'I%s' % change_hash.strip()
3863
3864
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003865def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003866 """Computes the remote branch ref to use for the CL.
3867
3868 Args:
3869 remote (str): The git remote for the CL.
3870 remote_branch (str): The git remote branch for the CL.
3871 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003872 """
3873 if not (remote and remote_branch):
3874 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003875
wittman@chromium.org455dc922015-01-26 20:15:50 +00003876 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003877 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003878 # refs, which are then translated into the remote full symbolic refs
3879 # below.
3880 if '/' not in target_branch:
3881 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3882 else:
3883 prefix_replacements = (
3884 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3885 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3886 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3887 )
3888 match = None
3889 for regex, replacement in prefix_replacements:
3890 match = re.search(regex, target_branch)
3891 if match:
3892 remote_branch = target_branch.replace(match.group(0), replacement)
3893 break
3894 if not match:
3895 # This is a branch path but not one we recognize; use as-is.
3896 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003897 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3898 # Handle the refs that need to land in different refs.
3899 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003900
wittman@chromium.org455dc922015-01-26 20:15:50 +00003901 # Create the true path to the remote branch.
3902 # Does the following translation:
3903 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3904 # * refs/remotes/origin/master -> refs/heads/master
3905 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3906 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3907 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3908 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3909 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3910 'refs/heads/')
3911 elif remote_branch.startswith('refs/remotes/branch-heads'):
3912 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003913
wittman@chromium.org455dc922015-01-26 20:15:50 +00003914 return remote_branch
3915
3916
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003917def cleanup_list(l):
3918 """Fixes a list so that comma separated items are put as individual items.
3919
3920 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3921 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3922 """
3923 items = sum((i.split(',') for i in l), [])
3924 stripped_items = (i.strip() for i in items)
3925 return sorted(filter(None, stripped_items))
3926
3927
Aaron Gable4db38df2017-11-03 14:59:07 -07003928@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003929@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003930def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003931 """Uploads the current changelist to codereview.
3932
3933 Can skip dependency patchset uploads for a branch by running:
3934 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003935 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003936 git config --unset branch.branch_name.skip-deps-uploads
3937 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003938
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003939 If the name of the checked out branch starts with "bug-" or "fix-" followed
3940 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003941 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003942
3943 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003944 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003945 [git-cl] add support for hashtags
3946 Foo bar: implement foo
3947 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00003948 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003949 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3950 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003951 parser.add_option('--bypass-watchlists', action='store_true',
3952 dest='bypass_watchlists',
3953 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07003954 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003955 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003956 parser.add_option('--message', '-m', dest='message',
3957 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003958 parser.add_option('-b', '--bug',
3959 help='pre-populate the bug number(s) for this issue. '
3960 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003961 parser.add_option('--message-file', dest='message_file',
3962 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003963 parser.add_option('--title', '-t', dest='title',
3964 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003965 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003966 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003967 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003968 parser.add_option('--tbrs',
3969 action='append', default=[],
3970 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003971 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003972 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003973 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003974 parser.add_option('--hashtag', dest='hashtags',
3975 action='append', default=[],
3976 help=('Gerrit hashtag for new CL; '
3977 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00003978 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08003979 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003980 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003981 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003982 metavar='TARGET',
3983 help='Apply CL to remote ref TARGET. ' +
3984 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003985 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003986 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00003987 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003988 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07003989 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003990 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003991 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
3992 const='TBR', help='add a set of OWNERS to TBR')
3993 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
3994 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003995 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003996 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003997 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003998 'implies --send-mail')
3999 parser.add_option('-d', '--cq-dry-run',
4000 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004001 help='Send the patchset to do a CQ dry run right after '
4002 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004003 parser.add_option('--preserve-tryjobs', action='store_true',
4004 help='instruct the CQ to let tryjobs running even after '
4005 'new patchsets are uploaded instead of canceling '
4006 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004007 parser.add_option('--dependencies', action='store_true',
4008 help='Uploads CLs of all the local branches that depend on '
4009 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004010 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4011 help='Sends your change to the CQ after an approval. Only '
4012 'works on repos that have the Auto-Submit label '
4013 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004014 parser.add_option('--parallel', action='store_true',
4015 help='Run all tests specified by input_api.RunTests in all '
4016 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004017 parser.add_option('--no-autocc', action='store_true',
4018 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004019 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004020 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004021 parser.add_option('-R', '--retry-failed', action='store_true',
4022 help='Retry failed tryjobs from old patchset immediately '
4023 'after uploading new patchset. Cannot be used with '
4024 '--use-commit-queue or --cq-dry-run.')
4025 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4026 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004027 parser.add_option('--fixed', '-x',
4028 help='List of bugs that will be commented on and marked '
4029 'fixed (pre-populates "Fixed:" tag). Same format as '
4030 '-b option / "Bug:" tag. If fixing several issues, '
4031 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004032 parser.add_option('--edit-description', action='store_true', default=False,
4033 help='Modify description before upload. Cannot be used '
4034 'with --force. It is a noop when --no-squash is set '
4035 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004036
rmistry@google.com2dd99862015-06-22 12:22:18 +00004037 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004038 (options, args) = parser.parse_args(args)
4039
sbc@chromium.org71437c02015-04-09 19:29:40 +00004040 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004041 return 1
4042
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004043 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004044 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004045 options.cc = cleanup_list(options.cc)
4046
Josipe827b0f2020-01-30 00:07:20 +00004047 if options.edit_description and options.force:
4048 parser.error('Only one of --force and --edit-description allowed')
4049
tandriib80458a2016-06-23 12:20:07 -07004050 if options.message_file:
4051 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004052 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004053 options.message = gclient_utils.FileRead(options.message_file)
4054 options.message_file = None
4055
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004056 if ([options.cq_dry_run,
4057 options.use_commit_queue,
4058 options.retry_failed].count(True) > 1):
4059 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4060 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004061
Aaron Gableedbc4132017-09-11 13:22:28 -07004062 if options.use_commit_queue:
4063 options.send_mail = True
4064
Edward Lesmes0dd54822020-03-26 18:24:25 +00004065 if options.squash is None:
4066 # Load default for user, repo, squash=true, in this order.
4067 options.squash = settings.GetSquashGerritUploads()
4068
Edward Lemur934836a2019-09-09 20:16:54 +00004069 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004070 # Warm change details cache now to avoid RPCs later, reducing latency for
4071 # developers.
4072 if cl.GetIssue():
4073 cl._GetChangeDetail(
4074 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4075
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004076 if options.retry_failed and not cl.GetIssue():
4077 print('No previous patchsets, so --retry-failed has no effect.')
4078 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004079
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004080 # cl.GetMostRecentPatchset uses cached information, and can return the last
4081 # patchset before upload. Calling it here makes it clear that it's the
4082 # last patchset before upload. Note that GetMostRecentPatchset will fail
4083 # if no CL has been uploaded yet.
4084 if options.retry_failed:
4085 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004086
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004087 ret = cl.CMDUpload(options, args, orig_args)
4088
4089 if options.retry_failed:
4090 if ret != 0:
4091 print('Upload failed, so --retry-failed has no effect.')
4092 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004093 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004094 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004095 jobs = _filter_failed_for_retry(builds)
4096 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004097 print('No failed tryjobs, so --retry-failed has no effect.')
4098 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004099 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004100
4101 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004102
4103
Francois Dorayd42c6812017-05-30 15:10:20 -04004104@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004105@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004106def CMDsplit(parser, args):
4107 """Splits a branch into smaller branches and uploads CLs.
4108
4109 Creates a branch and uploads a CL for each group of files modified in the
4110 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004111 comment, the string '$directory', is replaced with the directory containing
4112 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004113 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004114 parser.add_option('-d', '--description', dest='description_file',
4115 help='A text file containing a CL description in which '
4116 '$directory will be replaced by each CL\'s directory.')
4117 parser.add_option('-c', '--comment', dest='comment_file',
4118 help='A text file containing a CL comment.')
4119 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004120 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004121 help='List the files and reviewers for each CL that would '
4122 'be created, but don\'t create branches or CLs.')
4123 parser.add_option('--cq-dry-run', action='store_true',
4124 help='If set, will do a cq dry run for each uploaded CL. '
4125 'Please be careful when doing this; more than ~10 CLs '
4126 'has the potential to overload our build '
4127 'infrastructure. Try to upload these not during high '
4128 'load times (usually 11-3 Mountain View time). Email '
4129 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004130 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4131 default=True,
4132 help='Sends your change to the CQ after an approval. Only '
4133 'works on repos that have the Auto-Submit label '
4134 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004135 options, _ = parser.parse_args(args)
4136
4137 if not options.description_file:
4138 parser.error('No --description flag specified.')
4139
4140 def WrappedCMDupload(args):
4141 return CMDupload(OptionParser(), args)
4142
Edward Lemur2c62b332020-03-12 22:12:33 +00004143 return split_cl.SplitCl(
4144 options.description_file, options.comment_file, Changelist,
4145 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4146 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004147
4148
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004149@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004150@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004151def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004152 """DEPRECATED: Used to commit the current changelist via git-svn."""
4153 message = ('git-cl no longer supports committing to SVN repositories via '
4154 'git-svn. You probably want to use `git cl land` instead.')
4155 print(message)
4156 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004157
4158
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004159@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004160@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004161def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004162 """Commits the current changelist via git.
4163
4164 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4165 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004166 """
4167 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4168 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004169 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004170 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004171 parser.add_option('--parallel', action='store_true',
4172 help='Run all tests specified by input_api.RunTests in all '
4173 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004174 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004175
Edward Lemur934836a2019-09-09 20:16:54 +00004176 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004177
Robert Iannucci2e73d432018-03-14 01:10:47 -07004178 if not cl.GetIssue():
4179 DieWithError('You must upload the change first to Gerrit.\n'
4180 ' If you would rather have `git cl land` upload '
4181 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004182 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004183 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004184
4185
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004186@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004187@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004189 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190 parser.add_option('-b', dest='newbranch',
4191 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004192 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004193 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004195 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004196
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004197 group = optparse.OptionGroup(
4198 parser,
4199 'Options for continuing work on the current issue uploaded from a '
4200 'different clone (e.g. different machine). Must be used independently '
4201 'from the other options. No issue number should be specified, and the '
4202 'branch must have an issue number associated with it')
4203 group.add_option('--reapply', action='store_true', dest='reapply',
4204 help='Reset the branch and reapply the issue.\n'
4205 'CAUTION: This will undo any local changes in this '
4206 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004207
4208 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004209 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004210 parser.add_option_group(group)
4211
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004213
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004214 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004215 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004216 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004217 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004218 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004219
Edward Lemur934836a2019-09-09 20:16:54 +00004220 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004221 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004222 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004223
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004224 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004225 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004226 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004227
4228 RunGit(['reset', '--hard', upstream])
4229 if options.pull:
4230 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004231
Edward Lemur678a6842019-10-03 22:25:05 +00004232 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4233 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004234
4235 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004236 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004237
Edward Lemurf38bc172019-09-03 21:02:13 +00004238 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004239 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004240 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004241
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004242 # We don't want uncommitted changes mixed up with the patch.
4243 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004244 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004245
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004246 if options.newbranch:
4247 if options.force:
4248 RunGit(['branch', '-D', options.newbranch],
4249 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004250 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004251
Edward Lemur678a6842019-10-03 22:25:05 +00004252 cl = Changelist(
4253 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004254
Edward Lemur678a6842019-10-03 22:25:05 +00004255 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004256 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004257
Edward Lemurf38bc172019-09-03 21:02:13 +00004258 return cl.CMDPatchWithParsedIssue(
4259 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004260
4261
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004262def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004263 """Fetches the tree status and returns either 'open', 'closed',
4264 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004265 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004266 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004267 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004268 if status.find('closed') != -1 or status == '0':
4269 return 'closed'
4270 elif status.find('open') != -1 or status == '1':
4271 return 'open'
4272 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004273 return 'unset'
4274
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004275
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276def GetTreeStatusReason():
4277 """Fetches the tree status from a json url and returns the message
4278 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004279 url = settings.GetTreeStatusUrl()
4280 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004281 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004282 status = json.loads(connection.read())
4283 connection.close()
4284 return status['message']
4285
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004286
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004287@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004288def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004289 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004290 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004291 status = GetTreeStatus()
4292 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004293 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004294 return 2
4295
vapiera7fbd5a2016-06-16 09:17:49 -07004296 print('The tree is %s' % status)
4297 print()
4298 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004299 if status != 'open':
4300 return 1
4301 return 0
4302
4303
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004304@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004305def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004306 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4307 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004308 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004309 '-b', '--bot', action='append',
4310 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4311 'times to specify multiple builders. ex: '
4312 '"-b win_rel -b win_layout". See '
4313 'the try server waterfall for the builders name and the tests '
4314 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004315 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004316 '-B', '--bucket', default='',
4317 help=('Buildbucket bucket to send the try requests.'))
4318 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004319 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004320 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004321 'be determined by the try recipe that builder runs, which usually '
4322 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004323 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004324 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004325 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004326 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004327 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004328 '--category', default='git_cl_try', help='Specify custom build category.')
4329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004330 '--project',
4331 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004332 'in recipe to determine to which repository or directory to '
4333 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004334 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004335 '-p', '--property', dest='properties', action='append', default=[],
4336 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004337 'key2=value2 etc. The value will be treated as '
4338 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004339 'NOTE: using this may make your tryjob not usable for CQ, '
4340 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004341 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004342 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4343 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004344 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004345 parser.add_option(
4346 '-R', '--retry-failed', action='store_true', default=False,
4347 help='Retry failed jobs from the latest set of tryjobs. '
4348 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004349 parser.add_option(
4350 '-i', '--issue', type=int,
4351 help='Operate on this issue instead of the current branch\'s implicit '
4352 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004353 options, args = parser.parse_args(args)
4354
machenbach@chromium.org45453142015-09-15 08:45:22 +00004355 # Make sure that all properties are prop=value pairs.
4356 bad_params = [x for x in options.properties if '=' not in x]
4357 if bad_params:
4358 parser.error('Got properties with missing "=": %s' % bad_params)
4359
maruel@chromium.org15192402012-09-06 12:38:29 +00004360 if args:
4361 parser.error('Unknown arguments: %s' % args)
4362
Edward Lemur934836a2019-09-09 20:16:54 +00004363 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004364 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004365 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004366
Edward Lemurf38bc172019-09-03 21:02:13 +00004367 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004368 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004369
tandriie113dfd2016-10-11 10:20:12 -07004370 error_message = cl.CannotTriggerTryJobReason()
4371 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004372 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004373
Edward Lemur45768512020-03-02 19:03:14 +00004374 if options.bot:
4375 if options.retry_failed:
4376 parser.error('--bot is not compatible with --retry-failed.')
4377 if not options.bucket:
4378 parser.error('A bucket (e.g. "chromium/try") is required.')
4379
4380 triggered = [b for b in options.bot if 'triggered' in b]
4381 if triggered:
4382 parser.error(
4383 'Cannot schedule builds on triggered bots: %s.\n'
4384 'This type of bot requires an initial job from a parent (usually a '
4385 'builder). Schedule a job on the parent instead.\n' % triggered)
4386
4387 if options.bucket.startswith('.master'):
4388 parser.error('Buildbot masters are not supported.')
4389
4390 project, bucket = _parse_bucket(options.bucket)
4391 if project is None or bucket is None:
4392 parser.error('Invalid bucket: %s.' % options.bucket)
4393 jobs = sorted((project, bucket, bot) for bot in options.bot)
4394 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004395 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004396 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004397 if options.verbose:
4398 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004399 jobs = _filter_failed_for_retry(builds)
4400 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004401 print('There are no failed jobs in the latest set of jobs '
4402 '(patchset #%d), doing nothing.' % patchset)
4403 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004404 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004405 if num_builders > 10:
4406 confirm_or_exit('There are %d builders with failed builds.'
4407 % num_builders, action='continue')
4408 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004409 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004410 print('git cl try with no bots now defaults to CQ dry run.')
4411 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4412 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004413
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004414 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004415 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004416 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004417 except BuildbucketResponseException as ex:
4418 print('ERROR: %s' % ex)
4419 return 1
4420 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004421
4422
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004423@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004424def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004425 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004426 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004427 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004428 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004430 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004431 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004432 '--color', action='store_true', default=setup_color.IS_TTY,
4433 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004434 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004435 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4436 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004437 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004438 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004439 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004440 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004441 parser.add_option(
4442 '-i', '--issue', type=int,
4443 help='Operate on this issue instead of the current branch\'s implicit '
4444 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004445 options, args = parser.parse_args(args)
4446 if args:
4447 parser.error('Unrecognized args: %s' % ' '.join(args))
4448
Edward Lemur934836a2019-09-09 20:16:54 +00004449 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004450 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004451 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004452
tandrii221ab252016-10-06 08:12:04 -07004453 patchset = options.patchset
4454 if not patchset:
4455 patchset = cl.GetMostRecentPatchset()
4456 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004457 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004458 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004459 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004460 cl.GetIssue())
4461
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004462 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004463 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004464 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004465 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004466 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004467 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004468 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004469 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004470 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004471 return 0
4472
4473
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004474@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004476def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004477 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004478 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004479 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004480 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004481
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004482 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004483 if args:
4484 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004485 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004486 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004487 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004488 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004489
4490 # Clear configured merge-base, if there is one.
4491 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004492 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004493 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494 return 0
4495
4496
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004497@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004498def CMDweb(parser, args):
4499 """Opens the current CL in the web browser."""
4500 _, args = parser.parse_args(args)
4501 if args:
4502 parser.error('Unrecognized args: %s' % ' '.join(args))
4503
4504 issue_url = Changelist().GetIssueURL()
4505 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004506 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004507 return 1
4508
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004509 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004510 # allows us to hide the "Created new window in existing browser session."
4511 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004512 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004513 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004514 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004515 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004516 os.open(os.devnull, os.O_RDWR)
4517 try:
4518 webbrowser.open(issue_url)
4519 finally:
4520 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004521 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004522 return 0
4523
4524
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004525@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004526def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004527 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004528 parser.add_option('-d', '--dry-run', action='store_true',
4529 help='trigger in dry run mode')
4530 parser.add_option('-c', '--clear', action='store_true',
4531 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004532 parser.add_option(
4533 '-i', '--issue', type=int,
4534 help='Operate on this issue instead of the current branch\'s implicit '
4535 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004536 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004537 if args:
4538 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004539 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004540 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004541
Edward Lemur934836a2019-09-09 20:16:54 +00004542 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004543 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004544 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004545 elif options.dry_run:
4546 state = _CQState.DRY_RUN
4547 else:
4548 state = _CQState.COMMIT
4549 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004550 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004551 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004552 return 0
4553
4554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004555@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004556def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004557 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004558 parser.add_option(
4559 '-i', '--issue', type=int,
4560 help='Operate on this issue instead of the current branch\'s implicit '
4561 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004562 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004563 if args:
4564 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004565 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004566 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004567 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004568 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004569 cl.CloseIssue()
4570 return 0
4571
4572
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004573@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004574def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004575 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004576 parser.add_option(
4577 '--stat',
4578 action='store_true',
4579 dest='stat',
4580 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004581 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004582 if args:
4583 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004584
Edward Lemur934836a2019-09-09 20:16:54 +00004585 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004586 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004587 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004588 if not issue:
4589 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004590
Aaron Gablea718c3e2017-08-28 17:47:28 -07004591 base = cl._GitGetBranchConfigValue('last-upload-hash')
4592 if not base:
4593 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4594 if not base:
4595 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4596 revision_info = detail['revisions'][detail['current_revision']]
4597 fetch_info = revision_info['fetch']['http']
4598 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4599 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004600
Aaron Gablea718c3e2017-08-28 17:47:28 -07004601 cmd = ['git', 'diff']
4602 if options.stat:
4603 cmd.append('--stat')
4604 cmd.append(base)
4605 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004606
4607 return 0
4608
4609
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004610@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004611def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004612 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004613 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004614 '--ignore-current',
4615 action='store_true',
4616 help='Ignore the CL\'s current reviewers and start from scratch.')
4617 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004618 '--ignore-self',
4619 action='store_true',
4620 help='Do not consider CL\'s author as an owners.')
4621 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004622 '--no-color',
4623 action='store_true',
4624 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004625 parser.add_option(
4626 '--batch',
4627 action='store_true',
4628 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004629 # TODO: Consider moving this to another command, since other
4630 # git-cl owners commands deal with owners for a given CL.
4631 parser.add_option(
4632 '--show-all',
4633 action='store_true',
4634 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004635 options, args = parser.parse_args(args)
4636
Edward Lemur934836a2019-09-09 20:16:54 +00004637 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004638 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004639
Yang Guo6e269a02019-06-26 11:17:02 +00004640 if options.show_all:
4641 for arg in args:
4642 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004643 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004644 database.load_data_needed_for([arg])
4645 print('Owners for %s:' % arg)
4646 for owner in sorted(database.all_possible_owners([arg], None)):
4647 print(' - %s' % owner)
4648 return 0
4649
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004650 if args:
4651 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004652 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004653 base_branch = args[0]
4654 else:
4655 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004656 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004657
Edward Lemur2c62b332020-03-12 22:12:33 +00004658 root = settings.GetRoot()
4659 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004660
4661 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004662 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004663 print('\n'.join(db.reviewers_for(affected_files, author)))
4664 return 0
4665
Edward Lemur2c62b332020-03-12 22:12:33 +00004666 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4667 original_owner_files = {
4668 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4669 for f in owner_files}
4670
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004671 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004672 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004673 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004674 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004675 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004676 fopen=open,
4677 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004678 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004679 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004680 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004681
4682
Aiden Bennerc08566e2018-10-03 17:52:42 +00004683def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004684 """Generates a diff command."""
4685 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004686 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4687
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004688 if allow_prefix:
4689 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4690 # case that diff.noprefix is set in the user's git config.
4691 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4692 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004693 diff_cmd += ['--no-prefix']
4694
4695 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004696
4697 if args:
4698 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004699 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004700 diff_cmd.append(arg)
4701 else:
4702 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004703
4704 return diff_cmd
4705
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004706
Jamie Madill5e96ad12020-01-13 16:08:35 +00004707def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4708 """Runs clang-format-diff and sets a return value if necessary."""
4709
4710 if not clang_diff_files:
4711 return 0
4712
4713 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4714 # formatted. This is used to block during the presubmit.
4715 return_value = 0
4716
4717 # Locate the clang-format binary in the checkout
4718 try:
4719 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4720 except clang_format.NotFoundError as e:
4721 DieWithError(e)
4722
4723 if opts.full or settings.GetFormatFullByDefault():
4724 cmd = [clang_format_tool]
4725 if not opts.dry_run and not opts.diff:
4726 cmd.append('-i')
4727 if opts.dry_run:
4728 for diff_file in clang_diff_files:
4729 with open(diff_file, 'r') as myfile:
4730 code = myfile.read().replace('\r\n', '\n')
4731 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4732 stdout = stdout.replace('\r\n', '\n')
4733 if opts.diff:
4734 sys.stdout.write(stdout)
4735 if code != stdout:
4736 return_value = 2
4737 else:
4738 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4739 if opts.diff:
4740 sys.stdout.write(stdout)
4741 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004742 try:
4743 script = clang_format.FindClangFormatScriptInChromiumTree(
4744 'clang-format-diff.py')
4745 except clang_format.NotFoundError as e:
4746 DieWithError(e)
4747
Edward Lesmes89624cd2020-04-06 17:51:56 +00004748 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004749 if not opts.dry_run and not opts.diff:
4750 cmd.append('-i')
4751
4752 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004753 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004754
Edward Lesmes89624cd2020-04-06 17:51:56 +00004755 env = os.environ.copy()
4756 env['PATH'] = (
4757 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4758 stdout = RunCommand(
4759 cmd, stdin=diff_output, cwd=top_dir, env=env,
4760 shell=bool(sys.platform.startswith('win32')))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004761 if opts.diff:
4762 sys.stdout.write(stdout)
4763 if opts.dry_run and len(stdout) > 0:
4764 return_value = 2
4765
4766 return return_value
4767
4768
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004769def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004770 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004771 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004772
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004773
enne@chromium.org555cfe42014-01-29 18:21:39 +00004774@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004775@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004776def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004777 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004778 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004779 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004780 parser.add_option('--full', action='store_true',
4781 help='Reformat the full content of all touched files')
4782 parser.add_option('--dry-run', action='store_true',
4783 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004784 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004785 '--no-clang-format',
4786 dest='clang_format',
4787 action='store_false',
4788 default=True,
4789 help='Disables formatting of various file types using clang-format.')
4790 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004791 '--python',
4792 action='store_true',
4793 default=None,
4794 help='Enables python formatting on all python files.')
4795 parser.add_option(
4796 '--no-python',
4797 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004798 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004799 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004800 'If neither --python or --no-python are set, python files that have a '
4801 '.style.yapf file in an ancestor directory will be formatted. '
4802 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004803 parser.add_option(
4804 '--js',
4805 action='store_true',
4806 help='Format javascript code with clang-format. '
4807 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004808 parser.add_option('--diff', action='store_true',
4809 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004810 parser.add_option('--presubmit', action='store_true',
4811 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004812 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004813
Garrett Beaty91a6f332020-01-06 16:57:24 +00004814 if opts.python is not None and opts.no_python:
4815 raise parser.error('Cannot set both --python and --no-python')
4816 if opts.no_python:
4817 opts.python = False
4818
Daniel Chengc55eecf2016-12-30 03:11:02 -08004819 # Normalize any remaining args against the current path, so paths relative to
4820 # the current directory are still resolved as expected.
4821 args = [os.path.join(os.getcwd(), arg) for arg in args]
4822
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004823 # git diff generates paths against the root of the repository. Change
4824 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004825 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004826 if rel_base_path:
4827 os.chdir(rel_base_path)
4828
digit@chromium.org29e47272013-05-17 17:01:46 +00004829 # Grab the merge-base commit, i.e. the upstream commit of the current
4830 # branch when it was created or the last time it was rebased. This is
4831 # to cover the case where the user may have called "git fetch origin",
4832 # moving the origin branch to a newer commit, but hasn't rebased yet.
4833 upstream_commit = None
4834 cl = Changelist()
4835 upstream_branch = cl.GetUpstreamBranch()
4836 if upstream_branch:
4837 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4838 upstream_commit = upstream_commit.strip()
4839
4840 if not upstream_commit:
4841 DieWithError('Could not find base commit for this branch. '
4842 'Are you in detached state?')
4843
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004844 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4845 diff_output = RunGit(changed_files_cmd)
4846 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004847 # Filter out files deleted by this CL
4848 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004849
Andreas Haas417d89c2020-02-06 10:24:27 +00004850 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004851 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004852
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004853 clang_diff_files = []
4854 if opts.clang_format:
4855 clang_diff_files = [
4856 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4857 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004858 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004859 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004860
Edward Lesmes50da7702020-03-30 19:23:43 +00004861 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004862
Jamie Madill5e96ad12020-01-13 16:08:35 +00004863 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4864 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004865
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004866 # Similar code to above, but using yapf on .py files rather than clang-format
4867 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004868 py_explicitly_disabled = opts.python is not None and not opts.python
4869 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004870 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4871 yapf_tool = os.path.join(depot_tools_path, 'yapf')
4872 if sys.platform.startswith('win'):
4873 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004874
Aiden Bennerc08566e2018-10-03 17:52:42 +00004875 # Used for caching.
4876 yapf_configs = {}
4877 for f in python_diff_files:
4878 # Find the yapf style config for the current file, defaults to depot
4879 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004880 _FindYapfConfigFile(f, yapf_configs, top_dir)
4881
4882 # Turn on python formatting by default if a yapf config is specified.
4883 # This breaks in the case of this repo though since the specified
4884 # style file is also the global default.
4885 if opts.python is None:
4886 filtered_py_files = []
4887 for f in python_diff_files:
4888 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4889 filtered_py_files.append(f)
4890 else:
4891 filtered_py_files = python_diff_files
4892
4893 # Note: yapf still seems to fix indentation of the entire file
4894 # even if line ranges are specified.
4895 # See https://github.com/google/yapf/issues/499
4896 if not opts.full and filtered_py_files:
4897 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4898
Brian Sheedyb4307d52019-12-02 19:18:17 +00004899 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4900 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4901 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004902
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004903 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004904 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4905 # Default to pep8 if not .style.yapf is found.
4906 if not yapf_style:
4907 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004908
Takuto Ikuta26b02c12020-04-27 22:40:56 +00004909 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004910
4911 has_formattable_lines = False
4912 if not opts.full:
4913 # Only run yapf over changed line ranges.
4914 for diff_start, diff_len in py_line_diffs[f]:
4915 diff_end = diff_start + diff_len - 1
4916 # Yapf errors out if diff_end < diff_start but this
4917 # is a valid line range diff for a removal.
4918 if diff_end >= diff_start:
4919 has_formattable_lines = True
4920 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
4921 # If all line diffs were removals we have nothing to format.
4922 if not has_formattable_lines:
4923 continue
4924
4925 if opts.diff or opts.dry_run:
4926 cmd += ['--diff']
4927 # Will return non-zero exit code if non-empty diff.
4928 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
4929 if opts.diff:
4930 sys.stdout.write(stdout)
4931 elif len(stdout) > 0:
4932 return_value = 2
4933 else:
4934 cmd += ['-i']
4935 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004936
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004937 # Format GN build files. Always run on full build files for canonical form.
4938 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004939 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07004940 if opts.dry_run or opts.diff:
4941 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004942 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07004943 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Edward Lesmes89624cd2020-04-06 17:51:56 +00004944 shell=bool(sys.platform.startswith('win')),
brettw4b8ed592016-08-05 16:19:12 -07004945 cwd=top_dir)
4946 if opts.dry_run and gn_ret == 2:
4947 return_value = 2 # Not formatted.
4948 elif opts.diff and gn_ret == 2:
4949 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004950 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07004951 elif gn_ret != 0:
4952 # For non-dry run cases (and non-2 return values for dry-run), a
4953 # nonzero error code indicates a failure, probably because the file
4954 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004955 DieWithError('gn format failed on ' + gn_diff_file +
4956 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004957
Ilya Shermane081cbe2017-08-15 17:51:04 -07004958 # Skip the metrics formatting from the global presubmit hook. These files have
4959 # a separate presubmit hook that issues an error if the files need formatting,
4960 # whereas the top-level presubmit script merely issues a warning. Formatting
4961 # these files is somewhat slow, so it's important not to duplicate the work.
4962 if not opts.presubmit:
4963 for xml_dir in GetDirtyMetricsDirs(diff_files):
4964 tool_dir = os.path.join(top_dir, xml_dir)
4965 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
4966 if opts.dry_run or opts.diff:
4967 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07004968 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07004969 if opts.diff:
4970 sys.stdout.write(stdout)
4971 if opts.dry_run and stdout:
4972 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05004973
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004974 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004975
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004976
Steven Holte2e664bf2017-04-21 13:10:47 -07004977def GetDirtyMetricsDirs(diff_files):
4978 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
4979 metrics_xml_dirs = [
4980 os.path.join('tools', 'metrics', 'actions'),
4981 os.path.join('tools', 'metrics', 'histograms'),
4982 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004983 os.path.join('tools', 'metrics', 'ukm'),
4984 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07004985 for xml_dir in metrics_xml_dirs:
4986 if any(file.startswith(xml_dir) for file in xml_diff_files):
4987 yield xml_dir
4988
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004989
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004990@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004991@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004992def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00004993 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004994 _, args = parser.parse_args(args)
4995
4996 if len(args) != 1:
4997 parser.print_help()
4998 return 1
4999
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005000 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005001 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005002 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005003
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005004 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005005
Edward Lemur52969c92020-02-06 18:15:28 +00005006 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005007 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005008 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005009
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005010 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005011 for key, issue in [x.split() for x in output.splitlines()]:
5012 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005013 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005014
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005015 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005016 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005017 return 1
5018 if len(branches) == 1:
5019 RunGit(['checkout', branches[0]])
5020 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005021 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005022 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005023 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005024 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005025 try:
5026 RunGit(['checkout', branches[int(which)]])
5027 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005028 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005029 return 1
5030
5031 return 0
5032
5033
maruel@chromium.org29404b52014-09-08 22:58:00 +00005034def CMDlol(parser, args):
5035 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005036 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005037 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5038 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5039 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005040 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005041 return 0
5042
5043
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005044class OptionParser(optparse.OptionParser):
5045 """Creates the option parse and add --verbose support."""
5046 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005047 optparse.OptionParser.__init__(
5048 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005049 self.add_option(
5050 '-v', '--verbose', action='count', default=0,
5051 help='Use 2 times for more debugging info')
5052
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005053 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005054 try:
5055 return self._parse_args(args)
5056 finally:
5057 # Regardless of success or failure of args parsing, we want to report
5058 # metrics, but only after logging has been initialized (if parsing
5059 # succeeded).
5060 global settings
5061 settings = Settings()
5062
5063 if not metrics.DISABLE_METRICS_COLLECTION:
5064 # GetViewVCUrl ultimately calls logging method.
5065 project_url = settings.GetViewVCUrl().strip('/+')
5066 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5067 metrics.collector.add('project_urls', [project_url])
5068
5069 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005070 # Create an optparse.Values object that will store only the actual passed
5071 # options, without the defaults.
5072 actual_options = optparse.Values()
5073 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5074 # Create an optparse.Values object with the default options.
5075 options = optparse.Values(self.get_default_values().__dict__)
5076 # Update it with the options passed by the user.
5077 options._update_careful(actual_options.__dict__)
5078 # Store the options passed by the user in an _actual_options attribute.
5079 # We store only the keys, and not the values, since the values can contain
5080 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005081 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005082
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005083 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005084 logging.basicConfig(
5085 level=levels[min(options.verbose, len(levels) - 1)],
5086 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5087 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005088
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005089 return options, args
5090
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005091
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005092def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005093 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005094 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005095 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005096 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005097
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005098 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005099 dispatcher = subcommand.CommandDispatcher(__name__)
5100 try:
5101 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005102 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005103 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005104 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005105 if e.code != 500:
5106 raise
5107 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005108 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005109 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005110 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005111
5112
5113if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005114 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5115 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005116 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005117 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005118 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005119 sys.exit(main(sys.argv[1:]))