blob: a3b19255dca2cb916498164bf79d18e36b4da24f [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 Lesmes4de54132020-05-05 19:41:33 +0000770 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
771 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000772 # Default is squash now (http://crbug.com/611892#c23).
773 self.squash_gerrit_uploads = self._GetConfig(
774 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 return self.squash_gerrit_uploads
776
Edward Lesmes4de54132020-05-05 19:41:33 +0000777 def GetSquashGerritUploadsOverride(self):
778 """Return True or False if codereview.settings should be overridden.
779
780 Returns None if no override has been defined.
781 """
782 # See also http://crbug.com/611892#c23
783 result = self._GetConfig('gerrit.override-squash-uploads').lower()
784 if result == 'true':
785 return True
786 if result == 'false':
787 return False
788 return None
789
tandrii@chromium.org28253532016-04-14 13:46:56 +0000790 def GetGerritSkipEnsureAuthenticated(self):
791 """Return True if EnsureAuthenticated should not be done for Gerrit
792 uploads."""
793 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000794 self.gerrit_skip_ensure_authenticated = self._GetConfig(
795 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000796 return self.gerrit_skip_ensure_authenticated
797
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000798 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000799 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000800 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000801 # Git requires single quotes for paths with spaces. We need to replace
802 # them with double quotes for Windows to treat such paths as a single
803 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000804 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000805 return self.git_editor or None
806
thestig@chromium.org44202a22014-03-11 19:22:18 +0000807 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000808 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000809
810 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000811 return self._GetConfig(
812 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000813
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000814 def GetFormatFullByDefault(self):
815 if self.format_full_by_default is None:
816 result = (
817 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
818 error_ok=True).strip())
819 self.format_full_by_default = (result == 'true')
820 return self.format_full_by_default
821
Edward Lemur26964072020-02-19 19:18:51 +0000822 def _GetConfig(self, key, default=''):
823 self._LazyUpdateIfNeeded()
824 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000825
826
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000827class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000828 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000829 NONE = 'none'
830 DRY_RUN = 'dry_run'
831 COMMIT = 'commit'
832
833 ALL_STATES = [NONE, DRY_RUN, COMMIT]
834
835
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000836class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000837 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000838 self.issue = issue
839 self.patchset = patchset
840 self.hostname = hostname
841
842 @property
843 def valid(self):
844 return self.issue is not None
845
846
Edward Lemurf38bc172019-09-03 21:02:13 +0000847def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000848 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
849 fail_result = _ParsedIssueNumberArgument()
850
Edward Lemur678a6842019-10-03 22:25:05 +0000851 if isinstance(arg, int):
852 return _ParsedIssueNumberArgument(issue=arg)
853 if not isinstance(arg, basestring):
854 return fail_result
855
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000856 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000857 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000858 if not arg.startswith('http'):
859 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700860
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000861 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000862 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
863 if url.startswith(short_url):
864 url = gerrit_url + url[len(short_url):]
865 break
866
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000867 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000868 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000869 except ValueError:
870 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200871
Edward Lemur678a6842019-10-03 22:25:05 +0000872 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
873 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
874 # Short urls like https://domain/<issue_number> can be used, but don't allow
875 # specifying the patchset (you'd 404), but we allow that here.
876 if parsed_url.path == '/':
877 part = parsed_url.fragment
878 else:
879 part = parsed_url.path
880
881 match = re.match(
882 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
883 if not match:
884 return fail_result
885
886 issue = int(match.group('issue'))
887 patchset = match.group('patchset')
888 return _ParsedIssueNumberArgument(
889 issue=issue,
890 patchset=int(patchset) if patchset else None,
891 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000892
893
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000894def _create_description_from_log(args):
895 """Pulls out the commit log to use as a base for the CL description."""
896 log_args = []
897 if len(args) == 1 and not args[0].endswith('.'):
898 log_args = [args[0] + '..']
899 elif len(args) == 1 and args[0].endswith('...'):
900 log_args = [args[0][:-1]]
901 elif len(args) == 2:
902 log_args = [args[0] + '..' + args[1]]
903 else:
904 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000905 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000906
907
Aaron Gablea45ee112016-11-22 15:14:38 -0800908class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700909 def __init__(self, issue, url):
910 self.issue = issue
911 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800912 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700913
914 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800915 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700916 self.issue, self.url)
917
918
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100919_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000920 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100921 # TODO(tandrii): these two aren't known in Gerrit.
922 'approval', 'disapproval'])
923
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000926 """Changelist works with one changelist in local branch.
927
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000928 Notes:
929 * Not safe for concurrent multi-{thread,process} use.
930 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700931 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000932 """
933
Edward Lemur125d60a2019-09-13 18:25:41 +0000934 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000935 """Create a new ChangeList instance.
936
Edward Lemurf38bc172019-09-03 21:02:13 +0000937 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000938 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000939 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000940 global settings
941 if not settings:
942 # Happens when git_cl.py is used as a utility library.
943 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000944
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000945 self.branchref = branchref
946 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000947 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000948 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000949 else:
950 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000952 self.lookedup_issue = False
953 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000954 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000955 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000956 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000957 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800958 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000959 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000960 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000961
Edward Lemur125d60a2019-09-13 18:25:41 +0000962 # Lazily cached values.
963 self._gerrit_host = None # e.g. chromium-review.googlesource.com
964 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
965 # Map from change number (issue) to its detail cache.
966 self._detail_cache = {}
967
968 if codereview_host is not None:
969 assert not codereview_host.startswith('https://'), codereview_host
970 self._gerrit_host = codereview_host
971 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000972
973 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700974 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000975
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700976 The return value is a string suitable for passing to git cl with the --cc
977 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000978 """
979 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000980 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800981 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000982 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
983 return self.cc
984
Daniel Cheng7227d212017-11-17 08:12:37 -0800985 def ExtendCC(self, more_cc):
986 """Extends the list of users to cc on this CL based on the changed files."""
987 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988
989 def GetBranch(self):
990 """Returns the short branch name, e.g. 'master'."""
991 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +0000992 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000993 if not branchref:
994 return None
995 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +0000996 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000997 return self.branch
998
999 def GetBranchRef(self):
1000 """Returns the full branch name, e.g. 'refs/heads/master'."""
1001 self.GetBranch() # Poke the lazy loader.
1002 return self.branchref
1003
Edward Lemur85153282020-02-14 22:06:29 +00001004 def _GitGetBranchConfigValue(self, key, default=None):
1005 return scm.GIT.GetBranchConfig(
1006 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001007
Edward Lemur85153282020-02-14 22:06:29 +00001008 def _GitSetBranchConfigValue(self, key, value):
1009 action = 'set %s to %r' % (key, value)
1010 if not value:
1011 action = 'unset %s' % key
1012 assert self.GetBranch(), 'a branch is needed to ' + action
1013 return scm.GIT.SetBranchConfig(
1014 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001015
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001016 @staticmethod
1017 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001018 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019 e.g. 'origin', 'refs/heads/master'
1020 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001021 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1022 settings.GetRoot(), branch)
1023 if not remote or not upstream_branch:
1024 DieWithError(
1025 'Unable to determine default branch to diff against.\n'
1026 'Either pass complete "git diff"-style arguments, like\n'
1027 ' git cl upload origin/master\n'
1028 'or verify this branch is set up to track another \n'
1029 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030
1031 return remote, upstream_branch
1032
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001033 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001034 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001035 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001036 DieWithError('The upstream for the current branch (%s) does not exist '
1037 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001038 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001039 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001040
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 def GetUpstreamBranch(self):
1042 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001043 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001044 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001045 upstream_branch = upstream_branch.replace('refs/heads/',
1046 'refs/remotes/%s/' % remote)
1047 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1048 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 self.upstream_branch = upstream_branch
1050 return self.upstream_branch
1051
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001052 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001053 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001054 remote, branch = None, self.GetBranch()
1055 seen_branches = set()
1056 while branch not in seen_branches:
1057 seen_branches.add(branch)
1058 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001059 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001060 if remote != '.' or branch.startswith('refs/remotes'):
1061 break
1062 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001063 remotes = RunGit(['remote'], error_ok=True).split()
1064 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001065 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001066 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001067 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001068 logging.warn('Could not determine which remote this change is '
1069 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001070 else:
1071 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001072 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001073 branch = 'HEAD'
1074 if branch.startswith('refs/remotes'):
1075 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001076 elif branch.startswith('refs/branch-heads/'):
1077 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001078 else:
1079 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001080 return self._remote
1081
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 def GetRemoteUrl(self):
1083 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1084
1085 Returns None if there is no remote.
1086 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001087 is_cached, value = self._cached_remote_url
1088 if is_cached:
1089 return value
1090
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001091 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001092 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001093
Edward Lemur298f2cf2019-02-22 21:40:39 +00001094 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001095 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001096 if host:
1097 self._cached_remote_url = (True, url)
1098 return url
1099
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001100 # If it cannot be parsed as an url, assume it is a local directory,
1101 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001102 logging.warning('"%s" doesn\'t appear to point to a git host. '
1103 'Interpreting it as a local directory.', url)
1104 if not os.path.isdir(url):
1105 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001106 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1107 'but it doesn\'t exist.',
1108 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001109 return None
1110
1111 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001112 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001113
Edward Lemur79d4f992019-11-11 23:49:02 +00001114 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001115 if not host:
1116 logging.error(
1117 'Remote "%(remote)s" for branch "%(branch)s" points to '
1118 '"%(cache_path)s", but it is misconfigured.\n'
1119 '"%(cache_path)s" must be a git repo and must have a remote named '
1120 '"%(remote)s" pointing to the git host.', {
1121 'remote': remote,
1122 'cache_path': cache_path,
1123 'branch': self.GetBranch()})
1124 return None
1125
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001126 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001127 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001129 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001130 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001131 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001132 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001133 if self.issue is not None:
1134 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001135 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136 return self.issue
1137
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001138 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140 issue = self.GetIssue()
1141 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001142 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001143 server = self.GetCodereviewServer()
1144 if short:
1145 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1146 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147
Edward Lemur6c6827c2020-02-06 21:15:18 +00001148 def FetchDescription(self, pretty=False):
1149 assert self.GetIssue(), 'issue is required to query Gerrit'
1150
Edward Lemur9aa1a962020-02-25 00:58:38 +00001151 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001152 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1153 current_rev = data['current_revision']
1154 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001155
1156 if not pretty:
1157 return self.description
1158
1159 # Set width to 72 columns + 2 space indent.
1160 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1161 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1162 lines = self.description.splitlines()
1163 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001164
1165 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001166 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001167 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001168 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001169 if self.patchset is not None:
1170 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001171 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172 return self.patchset
1173
Edward Lemur9aa1a962020-02-25 00:58:38 +00001174 def GetAuthor(self):
1175 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1176
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001177 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001178 """Set this branch's patchset. If patchset=0, clears the patchset."""
1179 assert self.GetBranch()
1180 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001181 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001182 else:
1183 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001184 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001186 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001187 """Set this branch's issue. If issue isn't given, clears the issue."""
1188 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001189 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001190 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001191 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001192 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001193 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001194 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001195 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001196 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197 else:
tandrii5d48c322016-08-18 16:19:37 -07001198 # Reset all of these just to be clean.
1199 reset_suffixes = [
1200 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001201 ISSUE_CONFIG_KEY,
1202 PATCHSET_CONFIG_KEY,
1203 CODEREVIEW_SERVER_CONFIG_KEY,
1204 'gerritsquashhash',
1205 ]
tandrii5d48c322016-08-18 16:19:37 -07001206 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001207 try:
1208 self._GitSetBranchConfigValue(prop, None)
1209 except subprocess2.CalledProcessError:
1210 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001211 msg = RunGit(['log', '-1', '--format=%B']).strip()
1212 if msg and git_footers.get_footer_change_id(msg):
1213 print('WARNING: The change patched into this branch has a Change-Id. '
1214 'Removing it.')
1215 RunGit(['commit', '--amend', '-m',
1216 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001217 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001218 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001219 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220
Edward Lemur2c62b332020-03-12 22:12:33 +00001221 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001222 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001223 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001224 except subprocess2.CalledProcessError:
1225 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001226 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001227 'This branch probably doesn\'t exist anymore. To reset the\n'
1228 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001229 ' git branch --set-upstream-to origin/master %s\n'
1230 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001231 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001232
dsansomee2d6fd92016-09-08 00:10:47 -07001233 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001234 assert self.GetIssue(), 'issue is required to update description'
1235
1236 if gerrit_util.HasPendingChangeEdit(
1237 self._GetGerritHost(), self._GerritChangeIdentifier()):
1238 if not force:
1239 confirm_or_exit(
1240 'The description cannot be modified while the issue has a pending '
1241 'unpublished edit. Either publish the edit in the Gerrit web UI '
1242 'or delete it.\n\n', action='delete the unpublished edit')
1243
1244 gerrit_util.DeletePendingChangeEdit(
1245 self._GetGerritHost(), self._GerritChangeIdentifier())
1246 gerrit_util.SetCommitMessage(
1247 self._GetGerritHost(), self._GerritChangeIdentifier(),
1248 description, notify='NONE')
1249
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001250 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001251
Edward Lemur75526302020-02-27 22:31:05 +00001252 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001253 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001254 '--root', settings.GetRoot(),
1255 '--upstream', upstream,
1256 ]
1257
1258 args.extend(['--verbose'] * verbose)
1259
Edward Lemur99df04e2020-03-05 19:39:43 +00001260 author = self.GetAuthor()
1261 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001262 issue = self.GetIssue()
1263 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001264 if author:
1265 args.extend(['--author', author])
1266 if gerrit_url:
1267 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001268 if issue:
1269 args.extend(['--issue', str(issue)])
1270 if patchset:
1271 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001272
Edward Lemur75526302020-02-27 22:31:05 +00001273 return args
1274
1275 def RunHook(
1276 self, committing, may_prompt, verbose, parallel, upstream, description,
1277 all_files):
1278 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1279 args = self._GetCommonPresubmitArgs(verbose, upstream)
1280 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001281 if may_prompt:
1282 args.append('--may_prompt')
1283 if parallel:
1284 args.append('--parallel')
1285 if all_files:
1286 args.append('--all_files')
1287
1288 with gclient_utils.temporary_file() as description_file:
1289 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001290
1291 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001292 args.extend(['--json_output', json_output])
1293 args.extend(['--description_file', description_file])
1294
1295 start = time_time()
1296 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1297 exit_code = p.wait()
1298 metrics.collector.add_repeated('sub_commands', {
1299 'command': 'presubmit',
1300 'execution_time': time_time() - start,
1301 'exit_code': exit_code,
1302 })
1303
1304 if exit_code:
1305 sys.exit(exit_code)
1306
1307 json_results = gclient_utils.FileRead(json_output)
1308 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001309
Edward Lemur75526302020-02-27 22:31:05 +00001310 def RunPostUploadHook(self, verbose, upstream, description):
1311 args = self._GetCommonPresubmitArgs(verbose, upstream)
1312 args.append('--post_upload')
1313
1314 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001315 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001316 args.extend(['--description_file', description_file])
1317 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1318 p.wait()
1319
Edward Lemur5a644f82020-03-18 16:44:57 +00001320 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1321 # Get description message for upload.
1322 if self.GetIssue():
1323 description = self.FetchDescription()
1324 elif options.message:
1325 description = options.message
1326 else:
1327 description = _create_description_from_log(git_diff_args)
1328 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001329 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001330
1331 # Extract bug number from branch name.
1332 bug = options.bug
1333 fixed = options.fixed
1334 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1335 self.GetBranch())
1336 if not bug and not fixed and match:
1337 if match.group('type') == 'bug':
1338 bug = match.group('bugnum')
1339 else:
1340 fixed = match.group('bugnum')
1341
1342 change_description = ChangeDescription(description, bug, fixed)
1343
1344 # Set the reviewer list now so that presubmit checks can access it.
1345 if options.reviewers or options.tbrs or options.add_owners_to:
1346 change_description.update_reviewers(
1347 options.reviewers, options.tbrs, options.add_owners_to, files,
1348 self.GetAuthor())
1349
1350 return change_description
1351
1352 def _GetTitleForUpload(self, options):
1353 # When not squashing, just return options.title.
1354 if not options.squash:
1355 return options.title
1356
1357 # On first upload, patchset title is always this string, while options.title
1358 # gets converted to first line of message.
1359 if not self.GetIssue():
1360 return 'Initial upload'
1361
1362 # When uploading subsequent patchsets, options.message is taken as the title
1363 # if options.title is not provided.
1364 if options.title:
1365 return options.title
1366 if options.message:
1367 return options.message.strip()
1368
1369 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001370 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Edward Lemur5a644f82020-03-18 16:44:57 +00001371 if options.force:
1372 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001373 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1374 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001375
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001376 def CMDUpload(self, options, git_diff_args, orig_args):
1377 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001378 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001379 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001380 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001381 else:
1382 if self.GetBranch() is None:
1383 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1384
1385 # Default to diffing against common ancestor of upstream branch
1386 base_branch = self.GetCommonAncestorWithUpstream()
1387 git_diff_args = [base_branch, 'HEAD']
1388
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001389 # Fast best-effort checks to abort before running potentially expensive
1390 # hooks if uploading is likely to fail anyway. Passing these checks does
1391 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001392 self.EnsureAuthenticated(force=options.force)
1393 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001394
1395 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001396 watchlist = watchlists.Watchlists(settings.GetRoot())
1397 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001398 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001399 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001400
Edward Lemur5a644f82020-03-18 16:44:57 +00001401 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001402 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001403 hook_results = self.RunHook(
1404 committing=False,
1405 may_prompt=not options.force,
1406 verbose=options.verbose,
1407 parallel=options.parallel,
1408 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001409 description=change_desc.description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001410 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001411 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001412
Aaron Gable13101a62018-02-09 13:20:41 -08001413 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001414 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001415 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001416 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001417 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001418 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001419 # Run post upload hooks, if specified.
1420 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001421 self.RunPostUploadHook(
1422 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001423
1424 # Upload all dependencies if specified.
1425 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001426 print()
1427 print('--dependencies has been specified.')
1428 print('All dependent local branches will be re-uploaded.')
1429 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001430 # Remove the dependencies flag from args so that we do not end up in a
1431 # loop.
1432 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001433 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001434 return ret
1435
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001436 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001437 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001438
1439 Issue must have been already uploaded and known.
1440 """
1441 assert new_state in _CQState.ALL_STATES
1442 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001443 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001444 vote_map = {
1445 _CQState.NONE: 0,
1446 _CQState.DRY_RUN: 1,
1447 _CQState.COMMIT: 2,
1448 }
1449 labels = {'Commit-Queue': vote_map[new_state]}
1450 notify = False if new_state == _CQState.DRY_RUN else None
1451 gerrit_util.SetReview(
1452 self._GetGerritHost(), self._GerritChangeIdentifier(),
1453 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001454 return 0
1455 except KeyboardInterrupt:
1456 raise
1457 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001458 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001459 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001460 ' * Your project has no CQ,\n'
1461 ' * You don\'t have permission to change the CQ state,\n'
1462 ' * There\'s a bug in this code (see stack trace below).\n'
1463 'Consider specifying which bots to trigger manually or asking your '
1464 'project owners for permissions or contacting Chrome Infra at:\n'
1465 'https://www.chromium.org/infra\n\n' %
1466 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001467 # Still raise exception so that stack trace is printed.
1468 raise
1469
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001470 def _GetGerritHost(self):
1471 # Lazy load of configs.
1472 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001473 if self._gerrit_host and '.' not in self._gerrit_host:
1474 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1475 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001476 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001477 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001478 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001479 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001480 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1481 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001482 return self._gerrit_host
1483
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001484 def _GetGitHost(self):
1485 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001486 remote_url = self.GetRemoteUrl()
1487 if not remote_url:
1488 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001489 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001490
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001491 def GetCodereviewServer(self):
1492 if not self._gerrit_server:
1493 # If we're on a branch then get the server potentially associated
1494 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001495 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001496 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001497 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001498 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001499 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001500 if not self._gerrit_server:
1501 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1502 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001503 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001504 parts[0] = parts[0] + '-review'
1505 self._gerrit_host = '.'.join(parts)
1506 self._gerrit_server = 'https://%s' % self._gerrit_host
1507 return self._gerrit_server
1508
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001509 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001510 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001511 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001512 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001513 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001514 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001515 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001516 if project.endswith('.git'):
1517 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001518 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1519 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1520 # gitiles/git-over-https protocol. E.g.,
1521 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1522 # as
1523 # https://chromium.googlesource.com/v8/v8
1524 if project.startswith('a/'):
1525 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001526 return project
1527
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001528 def _GerritChangeIdentifier(self):
1529 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1530
1531 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001532 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001533 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001534 project = self._GetGerritProject()
1535 if project:
1536 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1537 # Fall back on still unique, but less efficient change number.
1538 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001539
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001540 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001542 if settings.GetGerritSkipEnsureAuthenticated():
1543 # For projects with unusual authentication schemes.
1544 # See http://crbug.com/603378.
1545 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001546
1547 # Check presence of cookies only if using cookies-based auth method.
1548 cookie_auth = gerrit_util.Authenticator.get()
1549 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001550 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001551
Florian Mayerae510e82020-01-30 21:04:48 +00001552 remote_url = self.GetRemoteUrl()
1553 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001554 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001555 return
1556 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001557 logging.warning('Ignoring branch %(branch)s with non-https remote '
1558 '%(remote)s', {
1559 'branch': self.branch,
1560 'remote': self.GetRemoteUrl()
1561 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001562 return
1563
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001564 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001565 self.GetCodereviewServer()
1566 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001567 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001568
1569 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1570 git_auth = cookie_auth.get_auth_header(git_host)
1571 if gerrit_auth and git_auth:
1572 if gerrit_auth == git_auth:
1573 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001574 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001575 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001576 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001577 ' %s\n'
1578 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001579 ' Consider running the following command:\n'
1580 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001581 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001582 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001583 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001584 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001585 cookie_auth.get_new_password_message(git_host)))
1586 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001587 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001588 return
1589 else:
1590 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001591 ([] if gerrit_auth else [self._gerrit_host]) +
1592 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001593 DieWithError('Credentials for the following hosts are required:\n'
1594 ' %s\n'
1595 'These are read from %s (or legacy %s)\n'
1596 '%s' % (
1597 '\n '.join(missing),
1598 cookie_auth.get_gitcookies_path(),
1599 cookie_auth.get_netrc_path(),
1600 cookie_auth.get_new_password_message(git_host)))
1601
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001602 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001603 if not self.GetIssue():
1604 return
1605
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001606 status = self._GetChangeDetail()['status']
1607 if status in ('MERGED', 'ABANDONED'):
1608 DieWithError('Change %s has been %s, new uploads are not allowed' %
1609 (self.GetIssueURL(),
1610 'submitted' if status == 'MERGED' else 'abandoned'))
1611
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001612 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1613 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1614 # Apparently this check is not very important? Otherwise get_auth_email
1615 # could have been added to other implementations of Authenticator.
1616 cookies_auth = gerrit_util.Authenticator.get()
1617 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001618 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001619
1620 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001621 if self.GetIssueOwner() == cookies_user:
1622 return
1623 logging.debug('change %s owner is %s, cookies user is %s',
1624 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001625 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001626 # so ask what Gerrit thinks of this user.
1627 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1628 if details['email'] == self.GetIssueOwner():
1629 return
1630 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001631 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001632 'as %s.\n'
1633 'Uploading may fail due to lack of permissions.' %
1634 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1635 confirm_or_exit(action='upload')
1636
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001637 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001638 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001639 or CQ status, assuming adherence to a common workflow.
1640
1641 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001642 * 'error' - error from review tool (including deleted issues)
1643 * 'unsent' - no reviewers added
1644 * 'waiting' - waiting for review
1645 * 'reply' - waiting for uploader to reply to review
1646 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001647 * 'dry-run' - dry-running in the CQ
1648 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001649 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001650 """
1651 if not self.GetIssue():
1652 return None
1653
1654 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001655 data = self._GetChangeDetail([
1656 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001657 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001658 return 'error'
1659
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001660 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001661 return 'closed'
1662
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001663 cq_label = data['labels'].get('Commit-Queue', {})
1664 max_cq_vote = 0
1665 for vote in cq_label.get('all', []):
1666 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1667 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001668 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001669 if max_cq_vote == 1:
1670 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001671
Aaron Gable9ab38c62017-04-06 14:36:33 -07001672 if data['labels'].get('Code-Review', {}).get('approved'):
1673 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001674
1675 if not data.get('reviewers', {}).get('REVIEWER', []):
1676 return 'unsent'
1677
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001678 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001679 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001680 while messages:
1681 m = messages.pop()
1682 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001683 # Ignore replies from CQ.
1684 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001685 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001686 # Most recent message was by owner.
1687 return 'waiting'
1688 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001689 # Some reply from non-owner.
1690 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001691
1692 # Somehow there are no messages even though there are reviewers.
1693 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001694
1695 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001696 if not self.GetIssue():
1697 return None
1698
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001699 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001700 patchset = data['revisions'][data['current_revision']]['_number']
1701 self.SetPatchset(patchset)
1702 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001703
Aaron Gable636b13f2017-07-14 10:42:48 -07001704 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001705 gerrit_util.SetReview(
1706 self._GetGerritHost(), self._GerritChangeIdentifier(),
1707 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001708
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001709 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001710 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001711 # CURRENT_REVISION is included to get the latest patchset so that
1712 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001713 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001714 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1715 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001716 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001717 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001718 robot_file_comments = gerrit_util.GetChangeRobotComments(
1719 self._GetGerritHost(), self._GerritChangeIdentifier())
1720
1721 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001722 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001723 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001724 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001725 line_comments = file_comments.setdefault(path, [])
1726 line_comments.extend(
1727 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728
1729 # Build dictionary of file comments for easy access and sorting later.
1730 # {author+date: {path: {patchset: {line: url+message}}}}
1731 comments = collections.defaultdict(
1732 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001733 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001734 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001735 tag = comment.get('tag', '')
1736 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001737 continue
1738 key = (comment['author']['email'], comment['updated'])
1739 if comment.get('side', 'REVISION') == 'PARENT':
1740 patchset = 'Base'
1741 else:
1742 patchset = 'PS%d' % comment['patch_set']
1743 line = comment.get('line', 0)
1744 url = ('https://%s/c/%s/%s/%s#%s%s' %
1745 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1746 'b' if comment.get('side') == 'PARENT' else '',
1747 str(line) if line else ''))
1748 comments[key][path][patchset][line] = (url, comment['message'])
1749
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001750 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001751 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001752 summary = self._BuildCommentSummary(msg, comments, readable)
1753 if summary:
1754 summaries.append(summary)
1755 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001756
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001757 @staticmethod
1758 def _BuildCommentSummary(msg, comments, readable):
1759 key = (msg['author']['email'], msg['date'])
1760 # Don't bother showing autogenerated messages that don't have associated
1761 # file or line comments. this will filter out most autogenerated
1762 # messages, but will keep robot comments like those from Tricium.
1763 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1764 if is_autogenerated and not comments.get(key):
1765 return None
1766 message = msg['message']
1767 # Gerrit spits out nanoseconds.
1768 assert len(msg['date'].split('.')[-1]) == 9
1769 date = datetime.datetime.strptime(msg['date'][:-3],
1770 '%Y-%m-%d %H:%M:%S.%f')
1771 if key in comments:
1772 message += '\n'
1773 for path, patchsets in sorted(comments.get(key, {}).items()):
1774 if readable:
1775 message += '\n%s' % path
1776 for patchset, lines in sorted(patchsets.items()):
1777 for line, (url, content) in sorted(lines.items()):
1778 if line:
1779 line_str = 'Line %d' % line
1780 path_str = '%s:%d:' % (path, line)
1781 else:
1782 line_str = 'File comment'
1783 path_str = '%s:0:' % path
1784 if readable:
1785 message += '\n %s, %s: %s' % (patchset, line_str, url)
1786 message += '\n %s\n' % content
1787 else:
1788 message += '\n%s ' % path_str
1789 message += '\n%s\n' % content
1790
1791 return _CommentSummary(
1792 date=date,
1793 message=message,
1794 sender=msg['author']['email'],
1795 autogenerated=is_autogenerated,
1796 # These could be inferred from the text messages and correlated with
1797 # Code-Review label maximum, however this is not reliable.
1798 # Leaving as is until the need arises.
1799 approval=False,
1800 disapproval=False,
1801 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001802
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001803 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001804 gerrit_util.AbandonChange(
1805 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001806
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001807 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001808 gerrit_util.SubmitChange(
1809 self._GetGerritHost(), self._GerritChangeIdentifier(),
1810 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001811
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001812 def _GetChangeDetail(self, options=None):
1813 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001814 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001815 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001816
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001817 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001818 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001819 options.append('CURRENT_COMMIT')
1820
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001821 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001822 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001823 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001824
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001825 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1826 # Assumption: data fetched before with extra options is suitable
1827 # for return for a smaller set of options.
1828 # For example, if we cached data for
1829 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1830 # and request is for options=[CURRENT_REVISION],
1831 # THEN we can return prior cached data.
1832 if options_set.issubset(cached_options_set):
1833 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001834
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001835 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001836 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001837 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001838 except gerrit_util.GerritError as e:
1839 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001840 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001841 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001842
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001843 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001844 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001845
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001846 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001847 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001848 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001849 data = gerrit_util.GetChangeCommit(
1850 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001851 except gerrit_util.GerritError as e:
1852 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001853 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001854 raise
agable32978d92016-11-01 12:55:02 -07001855 return data
1856
Karen Qian40c19422019-03-13 21:28:29 +00001857 def _IsCqConfigured(self):
1858 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001859 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001860
Olivier Robin75ee7252018-04-13 10:02:56 +02001861 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001862 if git_common.is_dirty_git_tree('land'):
1863 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001864
tandriid60367b2016-06-22 05:25:12 -07001865 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001866 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001867 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001868 'which can test and land changes for you. '
1869 'Are you sure you wish to bypass it?\n',
1870 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001871 differs = True
tandriic4344b52016-08-29 06:04:54 -07001872 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001873 # Note: git diff outputs nothing if there is no diff.
1874 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001875 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001876 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001877 if detail['current_revision'] == last_upload:
1878 differs = False
1879 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001880 print('WARNING: Local branch contents differ from latest uploaded '
1881 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001882 if differs:
1883 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001884 confirm_or_exit(
1885 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1886 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001887 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001888 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001889 upstream = self.GetCommonAncestorWithUpstream()
1890 if self.GetIssue():
1891 description = self.FetchDescription()
1892 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001893 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001894 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001895 committing=True,
1896 may_prompt=not force,
1897 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001898 parallel=parallel,
1899 upstream=upstream,
1900 description=description,
1901 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001902
1903 self.SubmitIssue(wait_for_merge=True)
1904 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001905 links = self._GetChangeCommit().get('web_links', [])
1906 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001907 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001908 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001909 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001910 return 0
1911
Edward Lemurf38bc172019-09-03 21:02:13 +00001912 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001913 assert parsed_issue_arg.valid
1914
Edward Lemur125d60a2019-09-13 18:25:41 +00001915 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001916
1917 if parsed_issue_arg.hostname:
1918 self._gerrit_host = parsed_issue_arg.hostname
1919 self._gerrit_server = 'https://%s' % self._gerrit_host
1920
tandriic2405f52016-10-10 08:13:15 -07001921 try:
1922 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001923 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001924 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001925
1926 if not parsed_issue_arg.patchset:
1927 # Use current revision by default.
1928 revision_info = detail['revisions'][detail['current_revision']]
1929 patchset = int(revision_info['_number'])
1930 else:
1931 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001932 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001933 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1934 break
1935 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001936 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001937 (parsed_issue_arg.patchset, self.GetIssue()))
1938
Edward Lemur125d60a2019-09-13 18:25:41 +00001939 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001940 if remote_url.endswith('.git'):
1941 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001942 remote_url = remote_url.rstrip('/')
1943
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001944 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001945 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001946
1947 if remote_url != fetch_info['url']:
1948 DieWithError('Trying to patch a change from %s but this repo appears '
1949 'to be %s.' % (fetch_info['url'], remote_url))
1950
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001952
Aaron Gable62619a32017-06-16 08:22:09 -07001953 if force:
1954 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1955 print('Checked out commit for change %i patchset %i locally' %
1956 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001957 elif nocommit:
1958 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1959 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001960 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001961 RunGit(['cherry-pick', 'FETCH_HEAD'])
1962 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001963 (parsed_issue_arg.issue, patchset))
1964 print('Note: this created a local commit which does not have '
1965 'the same hash as the one uploaded for review. This will make '
1966 'uploading changes based on top of this branch difficult.\n'
1967 'If you want to do that, use "git cl patch --force" instead.')
1968
Stefan Zagerd08043c2017-10-12 12:07:02 -07001969 if self.GetBranch():
1970 self.SetIssue(parsed_issue_arg.issue)
1971 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001972 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001973 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1974 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1975 else:
1976 print('WARNING: You are in detached HEAD state.\n'
1977 'The patch has been applied to your checkout, but you will not be '
1978 'able to upload a new patch set to the gerrit issue.\n'
1979 'Try using the \'-b\' option if you would like to work on a '
1980 'branch and/or upload a new patch set.')
1981
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001982 return 0
1983
tandrii16e0b4e2016-06-07 10:34:28 -07001984 def _GerritCommitMsgHookCheck(self, offer_removal):
1985 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
1986 if not os.path.exists(hook):
1987 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001988 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
1989 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07001990 data = gclient_utils.FileRead(hook)
1991 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
1992 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001993 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07001994 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07001995 'and may interfere with it in subtle ways.\n'
1996 'We recommend you remove the commit-msg hook.')
1997 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001998 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07001999 gclient_utils.rm_file_or_tree(hook)
2000 print('Gerrit commit-msg hook removed.')
2001 else:
2002 print('OK, will keep Gerrit commit-msg hook in place.')
2003
Edward Lemur1b52d872019-05-09 21:12:12 +00002004 def _CleanUpOldTraces(self):
2005 """Keep only the last |MAX_TRACES| traces."""
2006 try:
2007 traces = sorted([
2008 os.path.join(TRACES_DIR, f)
2009 for f in os.listdir(TRACES_DIR)
2010 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2011 and not f.startswith('tmp'))
2012 ])
2013 traces_to_delete = traces[:-MAX_TRACES]
2014 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002015 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002016 except OSError:
2017 print('WARNING: Failed to remove old git traces from\n'
2018 ' %s'
2019 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002020
Edward Lemur5737f022019-05-17 01:24:00 +00002021 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002022 """Zip and write the git push traces stored in traces_dir."""
2023 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002024 traces_zip = trace_name + '-traces'
2025 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002026 # Create a temporary dir to store git config and gitcookies in. It will be
2027 # compressed and stored next to the traces.
2028 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002029 git_info_zip = trace_name + '-git-info'
2030
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002031 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002032
Edward Lemur1b52d872019-05-09 21:12:12 +00002033 git_push_metadata['trace_name'] = trace_name
2034 gclient_utils.FileWrite(
2035 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2036
2037 # Keep only the first 6 characters of the git hashes on the packet
2038 # trace. This greatly decreases size after compression.
2039 packet_traces = os.path.join(traces_dir, 'trace-packet')
2040 if os.path.isfile(packet_traces):
2041 contents = gclient_utils.FileRead(packet_traces)
2042 gclient_utils.FileWrite(
2043 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2044 shutil.make_archive(traces_zip, 'zip', traces_dir)
2045
2046 # Collect and compress the git config and gitcookies.
2047 git_config = RunGit(['config', '-l'])
2048 gclient_utils.FileWrite(
2049 os.path.join(git_info_dir, 'git-config'),
2050 git_config)
2051
2052 cookie_auth = gerrit_util.Authenticator.get()
2053 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2054 gitcookies_path = cookie_auth.get_gitcookies_path()
2055 if os.path.isfile(gitcookies_path):
2056 gitcookies = gclient_utils.FileRead(gitcookies_path)
2057 gclient_utils.FileWrite(
2058 os.path.join(git_info_dir, 'gitcookies'),
2059 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2060 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2061
Edward Lemur1b52d872019-05-09 21:12:12 +00002062 gclient_utils.rmtree(git_info_dir)
2063
2064 def _RunGitPushWithTraces(
2065 self, change_desc, refspec, refspec_opts, git_push_metadata):
2066 """Run git push and collect the traces resulting from the execution."""
2067 # Create a temporary directory to store traces in. Traces will be compressed
2068 # and stored in a 'traces' dir inside depot_tools.
2069 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002070 trace_name = os.path.join(
2071 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002072
2073 env = os.environ.copy()
2074 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2075 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002076 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002077 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2078 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2079 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2080
2081 try:
2082 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002083 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002084 before_push = time_time()
2085 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002086 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002087 env=env,
2088 print_stdout=True,
2089 # Flush after every line: useful for seeing progress when running as
2090 # recipe.
2091 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002092 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002093 except subprocess2.CalledProcessError as e:
2094 push_returncode = e.returncode
2095 DieWithError('Failed to create a change. Please examine output above '
2096 'for the reason of the failure.\n'
2097 'Hint: run command below to diagnose common Git/Gerrit '
2098 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002099 ' git cl creds-check\n'
2100 '\n'
2101 'If git-cl is not working correctly, file a bug under the '
2102 'Infra>SDK component including the files below.\n'
2103 'Review the files before upload, since they might contain '
2104 'sensitive information.\n'
2105 'Set the Restrict-View-Google label so that they are not '
2106 'publicly accessible.\n'
2107 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002108 change_desc)
2109 finally:
2110 execution_time = time_time() - before_push
2111 metrics.collector.add_repeated('sub_commands', {
2112 'command': 'git push',
2113 'execution_time': execution_time,
2114 'exit_code': push_returncode,
2115 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2116 })
2117
Edward Lemur1b52d872019-05-09 21:12:12 +00002118 git_push_metadata['execution_time'] = execution_time
2119 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002120 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002121
Edward Lemur1b52d872019-05-09 21:12:12 +00002122 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002123 gclient_utils.rmtree(traces_dir)
2124
2125 return push_stdout
2126
Edward Lemura12175c2020-03-09 16:58:26 +00002127 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002128 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002129 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002130 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002131 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002132
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002133 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002134 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002135 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002136 # User requested to change description
2137 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002138 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002139 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002140 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002141 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002142 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002143 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002144 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002145 if len(change_ids) == 1:
2146 change_id = change_ids[0]
2147 else:
2148 change_id = GenerateGerritChangeId(change_desc.description)
2149 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002150
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002151 if options.preserve_tryjobs:
2152 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002153
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002154 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002155 parent = self._ComputeParent(
2156 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002157 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002158 with gclient_utils.temporary_file() as desc_tempfile:
2159 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2160 ref_to_push = RunGit(
2161 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002162 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002163 if not git_footers.get_footer_change_id(change_desc.description):
2164 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002165 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002166 self._AddChangeIdToCommitMessage(
2167 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002168 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002169 # For no-squash mode, we assume the remote called "origin" is the one we
2170 # want. It is not worthwhile to support different workflows for
2171 # no-squash mode.
2172 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002173 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2174
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002175 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002176 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2177 ref_to_push)]).splitlines()
2178 if len(commits) > 1:
2179 print('WARNING: This will upload %d commits. Run the following command '
2180 'to see which commits will be uploaded: ' % len(commits))
2181 print('git log %s..%s' % (parent, ref_to_push))
2182 print('You can also use `git squash-branch` to squash these into a '
2183 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002184 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002185
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002186 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002187 cc = []
2188 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2189 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2190 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002191 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002192 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002193 if options.cc:
2194 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002195 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002196 if change_desc.get_cced():
2197 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002198 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2199 valid_accounts = set(reviewers + cc)
2200 # TODO(crbug/877717): relax this for all hosts.
2201 else:
2202 valid_accounts = gerrit_util.ValidAccounts(
2203 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002204 logging.info('accounts %s are recognized, %s invalid',
2205 sorted(valid_accounts),
2206 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002207
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002208 # Extra options that can be specified at push time. Doc:
2209 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002210 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002211
Aaron Gable844cf292017-06-28 11:32:59 -07002212 # By default, new changes are started in WIP mode, and subsequent patchsets
2213 # don't send email. At any time, passing --send-mail will mark the change
2214 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002215 if options.send_mail:
2216 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002217 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002218 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002219 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002220 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002221 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002222
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002223 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002224 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002225
Edward Lemur5a644f82020-03-18 16:44:57 +00002226 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002227 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002228 # Punctuation and whitespace in |title| must be percent-encoded.
2229 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002230
agablec6787972016-09-09 16:13:34 -07002231 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002232 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002233
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002234 for r in sorted(reviewers):
2235 if r in valid_accounts:
2236 refspec_opts.append('r=%s' % r)
2237 reviewers.remove(r)
2238 else:
2239 # TODO(tandrii): this should probably be a hard failure.
2240 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2241 % r)
2242 for c in sorted(cc):
2243 # refspec option will be rejected if cc doesn't correspond to an
2244 # account, even though REST call to add such arbitrary cc may succeed.
2245 if c in valid_accounts:
2246 refspec_opts.append('cc=%s' % c)
2247 cc.remove(c)
2248
rmistry9eadede2016-09-19 11:22:43 -07002249 if options.topic:
2250 # Documentation on Gerrit topics is here:
2251 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002252 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002253
Edward Lemur687ca902018-12-05 02:30:30 +00002254 if options.enable_auto_submit:
2255 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmesaf45aa82021-03-31 22:56:46 +00002256 if options.set_bot_commit:
2257 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002258 if options.use_commit_queue:
2259 refspec_opts.append('l=Commit-Queue+2')
2260 elif options.cq_dry_run:
2261 refspec_opts.append('l=Commit-Queue+1')
2262
2263 if change_desc.get_reviewers(tbr_only=True):
2264 score = gerrit_util.GetCodeReviewTbrScore(
2265 self._GetGerritHost(),
2266 self._GetGerritProject())
2267 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002268
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002269 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002270 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002271 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002272 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002273 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2274
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002275 refspec_suffix = ''
2276 if refspec_opts:
2277 refspec_suffix = '%' + ','.join(refspec_opts)
2278 assert ' ' not in refspec_suffix, (
2279 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2280 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2281
Edward Lemur1b52d872019-05-09 21:12:12 +00002282 git_push_metadata = {
2283 'gerrit_host': self._GetGerritHost(),
2284 'title': title or '<untitled>',
2285 'change_id': change_id,
2286 'description': change_desc.description,
2287 }
2288 push_stdout = self._RunGitPushWithTraces(
2289 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290
2291 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002292 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 change_numbers = [m.group(1)
2294 for m in map(regex.match, push_stdout.splitlines())
2295 if m]
2296 if len(change_numbers) != 1:
2297 DieWithError(
2298 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002299 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002300 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002301 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002302
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002303 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002304 # GetIssue() is not set in case of non-squash uploads according to tests.
2305 # TODO(agable): non-squash uploads in git cl should be removed.
2306 gerrit_util.AddReviewers(
2307 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002308 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002309 reviewers, cc,
2310 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002311
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 return 0
2313
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002314 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2315 change_desc):
2316 """Computes parent of the generated commit to be uploaded to Gerrit.
2317
2318 Returns revision or a ref name.
2319 """
2320 if custom_cl_base:
2321 # Try to avoid creating additional unintended CLs when uploading, unless
2322 # user wants to take this risk.
2323 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2324 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2325 local_ref_of_target_remote])
2326 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002327 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002328 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2329 'If you proceed with upload, more than 1 CL may be created by '
2330 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2331 'If you are certain that specified base `%s` has already been '
2332 'uploaded to Gerrit as another CL, you may proceed.\n' %
2333 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2334 if not force:
2335 confirm_or_exit(
2336 'Do you take responsibility for cleaning up potential mess '
2337 'resulting from proceeding with upload?',
2338 action='upload')
2339 return custom_cl_base
2340
Aaron Gablef97e33d2017-03-30 15:44:27 -07002341 if remote != '.':
2342 return self.GetCommonAncestorWithUpstream()
2343
2344 # If our upstream branch is local, we base our squashed commit on its
2345 # squashed version.
2346 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2347
Aaron Gablef97e33d2017-03-30 15:44:27 -07002348 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002349 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002350
2351 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002352 # TODO(tandrii): consider checking parent change in Gerrit and using its
2353 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2354 # the tree hash of the parent branch. The upside is less likely bogus
2355 # requests to reupload parent change just because it's uploadhash is
2356 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002357 parent = scm.GIT.GetBranchConfig(
2358 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002359 # Verify that the upstream branch has been uploaded too, otherwise
2360 # Gerrit will create additional CLs when uploading.
2361 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2362 RunGitSilent(['rev-parse', parent + ':'])):
2363 DieWithError(
2364 '\nUpload upstream branch %s first.\n'
2365 'It is likely that this branch has been rebased since its last '
2366 'upload, so you just need to upload it again.\n'
2367 '(If you uploaded it with --no-squash, then branch dependencies '
2368 'are not supported, and you should reupload with --squash.)'
2369 % upstream_branch_name,
2370 change_desc)
2371 return parent
2372
Edward Lemura12175c2020-03-09 16:58:26 +00002373 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002374 """Re-commits using the current message, assumes the commit hook is in
2375 place.
2376 """
Edward Lemura12175c2020-03-09 16:58:26 +00002377 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002378 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002379 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002380 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002381 return new_log_desc
2382 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002383 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384
tandriie113dfd2016-10-11 10:20:12 -07002385 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002386 try:
2387 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002388 except GerritChangeNotExists:
2389 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002390
2391 if data['status'] in ('ABANDONED', 'MERGED'):
2392 return 'CL %s is closed' % self.GetIssue()
2393
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002394 def GetGerritChange(self, patchset=None):
2395 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002396 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002397 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002398 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002399 data = self._GetChangeDetail(['ALL_REVISIONS'])
2400
2401 assert host and issue and patchset, 'CL must be uploaded first'
2402
2403 has_patchset = any(
2404 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002405 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002406 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002407 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002408 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002409
tandrii8c5a3532016-11-04 07:52:02 -07002410 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002411 'host': host,
2412 'change': issue,
2413 'project': data['project'],
2414 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002415 }
tandriie113dfd2016-10-11 10:20:12 -07002416
tandriide281ae2016-10-12 06:02:30 -07002417 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002418 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002419
Edward Lemur707d70b2018-02-07 00:50:14 +01002420 def GetReviewers(self):
2421 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002422 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002423
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002424
tandriif9aefb72016-07-01 09:06:51 -07002425def _get_bug_line_values(default_project, bugs):
2426 """Given default_project and comma separated list of bugs, yields bug line
2427 values.
2428
2429 Each bug can be either:
2430 * a number, which is combined with default_project
2431 * string, which is left as is.
2432
2433 This function may produce more than one line, because bugdroid expects one
2434 project per line.
2435
2436 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2437 ['v8:123', 'chromium:789']
2438 """
2439 default_bugs = []
2440 others = []
2441 for bug in bugs.split(','):
2442 bug = bug.strip()
2443 if bug:
2444 try:
2445 default_bugs.append(int(bug))
2446 except ValueError:
2447 others.append(bug)
2448
2449 if default_bugs:
2450 default_bugs = ','.join(map(str, default_bugs))
2451 if default_project:
2452 yield '%s:%s' % (default_project, default_bugs)
2453 else:
2454 yield default_bugs
2455 for other in sorted(others):
2456 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2457 yield other
2458
2459
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002460class ChangeDescription(object):
2461 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002462 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002463 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002464 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002465 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002466 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002467 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2468 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002469 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002470 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002471
Dan Beamd8b04ca2019-10-10 21:23:26 +00002472 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002473 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002474 if bug:
2475 regexp = re.compile(self.BUG_LINE)
2476 prefix = settings.GetBugPrefix()
2477 if not any((regexp.match(line) for line in self._description_lines)):
2478 values = list(_get_bug_line_values(prefix, bug))
2479 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002480 if fixed:
2481 regexp = re.compile(self.FIXED_LINE)
2482 prefix = settings.GetBugPrefix()
2483 if not any((regexp.match(line) for line in self._description_lines)):
2484 values = list(_get_bug_line_values(prefix, fixed))
2485 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002486
agable@chromium.org42c20792013-09-12 17:34:49 +00002487 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002488 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002489 return '\n'.join(self._description_lines)
2490
2491 def set_description(self, desc):
2492 if isinstance(desc, basestring):
2493 lines = desc.splitlines()
2494 else:
2495 lines = [line.rstrip() for line in desc]
2496 while lines and not lines[0]:
2497 lines.pop(0)
2498 while lines and not lines[-1]:
2499 lines.pop(-1)
2500 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002501
Edward Lemur5a644f82020-03-18 16:44:57 +00002502 def ensure_change_id(self, change_id):
2503 description = self.description
2504 footer_change_ids = git_footers.get_footer_change_id(description)
2505 # Make sure that the Change-Id in the description matches the given one.
2506 if footer_change_ids != [change_id]:
2507 if footer_change_ids:
2508 # Remove any existing Change-Id footers since they don't match the
2509 # expected change_id footer.
2510 description = git_footers.remove_footer(description, 'Change-Id')
2511 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2512 'if you want to set a new one.')
2513 # Add the expected Change-Id footer.
2514 description = git_footers.add_footer_change_id(description, change_id)
2515 self.set_description(description)
2516
Edward Lemur2c62b332020-03-12 22:12:33 +00002517 def update_reviewers(
2518 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002519 """Rewrites the R=/TBR= line(s) as a single line each.
2520
2521 Args:
2522 reviewers (list(str)) - list of additional emails to use for reviewers.
2523 tbrs (list(str)) - list of additional emails to use for TBRs.
2524 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2525 the change that are missing OWNER coverage. If this is not None, you
2526 must also pass a value for `change`.
2527 change (Change) - The Change that should be used for OWNERS lookups.
2528 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002529 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002530 assert isinstance(tbrs, list), tbrs
2531
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002532 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002533 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002534
2535 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002536 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002537
2538 reviewers = set(reviewers)
2539 tbrs = set(tbrs)
2540 LOOKUP = {
2541 'TBR': tbrs,
2542 'R': reviewers,
2543 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002544
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002545 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002546 regexp = re.compile(self.R_LINE)
2547 matches = [regexp.match(line) for line in self._description_lines]
2548 new_desc = [l for i, l in enumerate(self._description_lines)
2549 if not matches[i]]
2550 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002551
agable@chromium.org42c20792013-09-12 17:34:49 +00002552 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002553
2554 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002555 for match in matches:
2556 if not match:
2557 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002558 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2559
2560 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002561 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002562 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002563 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002564 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002565 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002566 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002567 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002568
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002569 # If any folks ended up in both groups, remove them from tbrs.
2570 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002571
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002572 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2573 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002574
2575 # Put the new lines in the description where the old first R= line was.
2576 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2577 if 0 <= line_loc < len(self._description_lines):
2578 if new_tbr_line:
2579 self._description_lines.insert(line_loc, new_tbr_line)
2580 if new_r_line:
2581 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002582 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002583 if new_r_line:
2584 self.append_footer(new_r_line)
2585 if new_tbr_line:
2586 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002587
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002588 def set_preserve_tryjobs(self):
2589 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2590 footers = git_footers.parse_footers(self.description)
2591 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2592 if v.lower() == 'true':
2593 return
2594 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2595
Anthony Polito8b955342019-09-24 19:01:36 +00002596 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002597 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002598 self.set_description([
2599 '# Enter a description of the change.',
2600 '# This will be displayed on the codereview site.',
2601 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002602 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002603 '--------------------',
2604 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002605 bug_regexp = re.compile(self.BUG_LINE)
2606 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002607 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002608 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2609 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002610 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002611
agable@chromium.org42c20792013-09-12 17:34:49 +00002612 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002613 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002614 if not content:
2615 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002616 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002617
Bruce Dawson2377b012018-01-11 16:46:49 -08002618 # Strip off comments and default inserted "Bug:" line.
2619 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002620 (line.startswith('#') or
2621 line.rstrip() == "Bug:" or
2622 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002623 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002624 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002625 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002626
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002627 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002628 """Adds a footer line to the description.
2629
2630 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2631 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2632 that Gerrit footers are always at the end.
2633 """
2634 parsed_footer_line = git_footers.parse_footer(line)
2635 if parsed_footer_line:
2636 # Line is a gerrit footer in the form: Footer-Key: any value.
2637 # Thus, must be appended observing Gerrit footer rules.
2638 self.set_description(
2639 git_footers.add_footer(self.description,
2640 key=parsed_footer_line[0],
2641 value=parsed_footer_line[1]))
2642 return
2643
2644 if not self._description_lines:
2645 self._description_lines.append(line)
2646 return
2647
2648 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2649 if gerrit_footers:
2650 # git_footers.split_footers ensures that there is an empty line before
2651 # actual (gerrit) footers, if any. We have to keep it that way.
2652 assert top_lines and top_lines[-1] == ''
2653 top_lines, separator = top_lines[:-1], top_lines[-1:]
2654 else:
2655 separator = [] # No need for separator if there are no gerrit_footers.
2656
2657 prev_line = top_lines[-1] if top_lines else ''
2658 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2659 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2660 top_lines.append('')
2661 top_lines.append(line)
2662 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002663
tandrii99a72f22016-08-17 14:33:24 -07002664 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002665 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002666 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002667 reviewers = [match.group(2).strip()
2668 for match in matches
2669 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002670 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002671
bradnelsond975b302016-10-23 12:20:23 -07002672 def get_cced(self):
2673 """Retrieves the list of reviewers."""
2674 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2675 cced = [match.group(2).strip() for match in matches if match]
2676 return cleanup_list(cced)
2677
Nodir Turakulov23b82142017-11-16 11:04:25 -08002678 def get_hash_tags(self):
2679 """Extracts and sanitizes a list of Gerrit hashtags."""
2680 subject = (self._description_lines or ('',))[0]
2681 subject = re.sub(
2682 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2683
2684 tags = []
2685 start = 0
2686 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2687 while True:
2688 m = bracket_exp.match(subject, start)
2689 if not m:
2690 break
2691 tags.append(self.sanitize_hash_tag(m.group(1)))
2692 start = m.end()
2693
2694 if not tags:
2695 # Try "Tag: " prefix.
2696 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2697 if m:
2698 tags.append(self.sanitize_hash_tag(m.group(1)))
2699 return tags
2700
2701 @classmethod
2702 def sanitize_hash_tag(cls, tag):
2703 """Returns a sanitized Gerrit hash tag.
2704
2705 A sanitized hashtag can be used as a git push refspec parameter value.
2706 """
2707 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2708
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002709
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002710def FindCodereviewSettingsFile(filename='codereview.settings'):
2711 """Finds the given file starting in the cwd and going up.
2712
2713 Only looks up to the top of the repository unless an
2714 'inherit-review-settings-ok' file exists in the root of the repository.
2715 """
2716 inherit_ok_file = 'inherit-review-settings-ok'
2717 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002718 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002719 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2720 root = '/'
2721 while True:
2722 if filename in os.listdir(cwd):
2723 if os.path.isfile(os.path.join(cwd, filename)):
2724 return open(os.path.join(cwd, filename))
2725 if cwd == root:
2726 break
2727 cwd = os.path.dirname(cwd)
2728
2729
2730def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002731 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002732 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002733
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002734 def SetProperty(name, setting, unset_error_ok=False):
2735 fullname = 'rietveld.' + name
2736 if setting in keyvals:
2737 RunGit(['config', fullname, keyvals[setting]])
2738 else:
2739 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2740
tandrii48df5812016-10-17 03:55:37 -07002741 if not keyvals.get('GERRIT_HOST', False):
2742 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002743 # Only server setting is required. Other settings can be absent.
2744 # In that case, we ignore errors raised during option deletion attempt.
2745 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2746 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2747 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002748 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002749 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2750 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002751 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2752 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002753 SetProperty(
2754 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002755
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002756 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002757 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002758
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002759 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002760 RunGit(['config', 'gerrit.squash-uploads',
2761 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002762
tandrii@chromium.org28253532016-04-14 13:46:56 +00002763 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002764 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002765 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2766
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002767 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002768 # should be of the form
2769 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2770 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002771 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2772 keyvals['ORIGIN_URL_CONFIG']])
2773
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002774
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002775def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002776 """Downloads a network object to a local file, like urllib.urlretrieve.
2777
2778 This is necessary because urllib is broken for SSL connections via a proxy.
2779 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002780 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002781 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002782
2783
ukai@chromium.org712d6102013-11-27 00:52:58 +00002784def hasSheBang(fname):
2785 """Checks fname is a #! script."""
2786 with open(fname) as f:
2787 return f.read(2).startswith('#!')
2788
2789
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002790def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002791 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002792
2793 Args:
2794 force: True to update hooks. False to install hooks if not present.
2795 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002796 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002797 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2798 if not os.access(dst, os.X_OK):
2799 if os.path.exists(dst):
2800 if not force:
2801 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002802 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002803 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002804 if not hasSheBang(dst):
2805 DieWithError('Not a script: %s\n'
2806 'You need to download from\n%s\n'
2807 'into .git/hooks/commit-msg and '
2808 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002809 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2810 except Exception:
2811 if os.path.exists(dst):
2812 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002813 DieWithError('\nFailed to download hooks.\n'
2814 'You need to download from\n%s\n'
2815 'into .git/hooks/commit-msg and '
2816 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002817
2818
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002819class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002820 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002821
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002822 _GOOGLESOURCE = 'googlesource.com'
2823
2824 def __init__(self):
2825 # Cached list of [host, identity, source], where source is either
2826 # .gitcookies or .netrc.
2827 self._all_hosts = None
2828
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002829 def ensure_configured_gitcookies(self):
2830 """Runs checks and suggests fixes to make git use .gitcookies from default
2831 path."""
2832 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2833 configured_path = RunGitSilent(
2834 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002835 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002836 if configured_path:
2837 self._ensure_default_gitcookies_path(configured_path, default)
2838 else:
2839 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002840
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002841 @staticmethod
2842 def _ensure_default_gitcookies_path(configured_path, default_path):
2843 assert configured_path
2844 if configured_path == default_path:
2845 print('git is already configured to use your .gitcookies from %s' %
2846 configured_path)
2847 return
2848
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002849 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002850 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2851 (configured_path, default_path))
2852
2853 if not os.path.exists(configured_path):
2854 print('However, your configured .gitcookies file is missing.')
2855 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2856 action='reconfigure')
2857 RunGit(['config', '--global', 'http.cookiefile', default_path])
2858 return
2859
2860 if os.path.exists(default_path):
2861 print('WARNING: default .gitcookies file already exists %s' %
2862 default_path)
2863 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2864 default_path)
2865
2866 confirm_or_exit('Move existing .gitcookies to default location?',
2867 action='move')
2868 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002869 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002870 print('Moved and reconfigured git to use .gitcookies from %s' %
2871 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002872
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002873 @staticmethod
2874 def _configure_gitcookies_path(default_path):
2875 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2876 if os.path.exists(netrc_path):
2877 print('You seem to be using outdated .netrc for git credentials: %s' %
2878 netrc_path)
2879 print('This tool will guide you through setting up recommended '
2880 '.gitcookies store for git credentials.\n'
2881 '\n'
2882 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2883 ' git config --global --unset http.cookiefile\n'
2884 ' mv %s %s.backup\n\n' % (default_path, default_path))
2885 confirm_or_exit(action='setup .gitcookies')
2886 RunGit(['config', '--global', 'http.cookiefile', default_path])
2887 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002888
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002889 def get_hosts_with_creds(self, include_netrc=False):
2890 if self._all_hosts is None:
2891 a = gerrit_util.CookiesAuthenticator()
2892 self._all_hosts = [
2893 (h, u, s)
2894 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002895 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2896 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002897 )
2898 if h.endswith(self._GOOGLESOURCE)
2899 ]
2900
2901 if include_netrc:
2902 return self._all_hosts
2903 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2904
2905 def print_current_creds(self, include_netrc=False):
2906 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2907 if not hosts:
2908 print('No Git/Gerrit credentials found')
2909 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002910 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002911 header = [('Host', 'User', 'Which file'),
2912 ['=' * l for l in lengths]]
2913 for row in (header + hosts):
2914 print('\t'.join((('%%+%ds' % l) % s)
2915 for l, s in zip(lengths, row)))
2916
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002917 @staticmethod
2918 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002919 """Parses identity "git-<username>.domain" into <username> and domain."""
2920 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002921 # distinguishable from sub-domains. But we do know typical domains:
2922 if identity.endswith('.chromium.org'):
2923 domain = 'chromium.org'
2924 username = identity[:-len('.chromium.org')]
2925 else:
2926 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002927 if username.startswith('git-'):
2928 username = username[len('git-'):]
2929 return username, domain
2930
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002931 def _canonical_git_googlesource_host(self, host):
2932 """Normalizes Gerrit hosts (with '-review') to Git host."""
2933 assert host.endswith(self._GOOGLESOURCE)
2934 # Prefix doesn't include '.' at the end.
2935 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2936 if prefix.endswith('-review'):
2937 prefix = prefix[:-len('-review')]
2938 return prefix + '.' + self._GOOGLESOURCE
2939
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002940 def _canonical_gerrit_googlesource_host(self, host):
2941 git_host = self._canonical_git_googlesource_host(host)
2942 prefix = git_host.split('.', 1)[0]
2943 return prefix + '-review.' + self._GOOGLESOURCE
2944
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002945 def _get_counterpart_host(self, host):
2946 assert host.endswith(self._GOOGLESOURCE)
2947 git = self._canonical_git_googlesource_host(host)
2948 gerrit = self._canonical_gerrit_googlesource_host(git)
2949 return git if gerrit == host else gerrit
2950
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002951 def has_generic_host(self):
2952 """Returns whether generic .googlesource.com has been configured.
2953
2954 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2955 """
2956 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2957 if host == '.' + self._GOOGLESOURCE:
2958 return True
2959 return False
2960
2961 def _get_git_gerrit_identity_pairs(self):
2962 """Returns map from canonic host to pair of identities (Git, Gerrit).
2963
2964 One of identities might be None, meaning not configured.
2965 """
2966 host_to_identity_pairs = {}
2967 for host, identity, _ in self.get_hosts_with_creds():
2968 canonical = self._canonical_git_googlesource_host(host)
2969 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2970 idx = 0 if canonical == host else 1
2971 pair[idx] = identity
2972 return host_to_identity_pairs
2973
2974 def get_partially_configured_hosts(self):
2975 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002976 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002977 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002978 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002979
2980 def get_conflicting_hosts(self):
2981 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002982 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002983 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002984 if None not in (i1, i2) and i1 != i2)
2985
2986 def get_duplicated_hosts(self):
2987 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002988 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002989
2990 _EXPECTED_HOST_IDENTITY_DOMAINS = {
2991 'chromium.googlesource.com': 'chromium.org',
2992 'chrome-internal.googlesource.com': 'google.com',
2993 }
2994
2995 def get_hosts_with_wrong_identities(self):
2996 """Finds hosts which **likely** reference wrong identities.
2997
2998 Note: skips hosts which have conflicting identities for Git and Gerrit.
2999 """
3000 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003001 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003002 pair = self._get_git_gerrit_identity_pairs().get(host)
3003 if pair and pair[0] == pair[1]:
3004 _, domain = self._parse_identity(pair[0])
3005 if domain != expected:
3006 hosts.add(host)
3007 return hosts
3008
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003009 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003010 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003011 hosts = sorted(hosts)
3012 assert hosts
3013 if extra_column_func is None:
3014 extras = [''] * len(hosts)
3015 else:
3016 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003017 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3018 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003019 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003020 lines.append(tmpl % he)
3021 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003022
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003023 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003024 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003025 yield ('.googlesource.com wildcard record detected',
3026 ['Chrome Infrastructure team recommends to list full host names '
3027 'explicitly.'],
3028 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003029
3030 dups = self.get_duplicated_hosts()
3031 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003032 yield ('The following hosts were defined twice',
3033 self._format_hosts(dups),
3034 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003035
3036 partial = self.get_partially_configured_hosts()
3037 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003038 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3039 'These hosts are missing',
3040 self._format_hosts(partial, lambda host: 'but %s defined' %
3041 self._get_counterpart_host(host)),
3042 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003043
3044 conflicting = self.get_conflicting_hosts()
3045 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003046 yield ('The following Git hosts have differing credentials from their '
3047 'Gerrit counterparts',
3048 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3049 tuple(self._get_git_gerrit_identity_pairs()[host])),
3050 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003051
3052 wrong = self.get_hosts_with_wrong_identities()
3053 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003054 yield ('These hosts likely use wrong identity',
3055 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3056 (self._get_git_gerrit_identity_pairs()[host][0],
3057 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3058 wrong)
3059
3060 def find_and_report_problems(self):
3061 """Returns True if there was at least one problem, else False."""
3062 found = False
3063 bad_hosts = set()
3064 for title, sublines, hosts in self._find_problems():
3065 if not found:
3066 found = True
3067 print('\n\n.gitcookies problem report:\n')
3068 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003069 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003070 if sublines:
3071 print()
3072 print(' %s' % '\n '.join(sublines))
3073 print()
3074
3075 if bad_hosts:
3076 assert found
3077 print(' You can manually remove corresponding lines in your %s file and '
3078 'visit the following URLs with correct account to generate '
3079 'correct credential lines:\n' %
3080 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3081 print(' %s' % '\n '.join(sorted(set(
3082 gerrit_util.CookiesAuthenticator().get_new_password_url(
3083 self._canonical_git_googlesource_host(host))
3084 for host in bad_hosts
3085 ))))
3086 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003087
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003088
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003089@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003090def CMDcreds_check(parser, args):
3091 """Checks credentials and suggests changes."""
3092 _, _ = parser.parse_args(args)
3093
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003094 # Code below checks .gitcookies. Abort if using something else.
3095 authn = gerrit_util.Authenticator.get()
3096 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003097 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003098 'This command is not designed for bot environment. It checks '
3099 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003100 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3101 if isinstance(authn, gerrit_util.GceAuthenticator):
3102 message += (
3103 '\n'
3104 'If you need to run this on GCE or a cloudtop instance, '
3105 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3106 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003107
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003108 checker = _GitCookiesChecker()
3109 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003110
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003111 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003112 checker.print_current_creds(include_netrc=True)
3113
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003114 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003115 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003116 return 0
3117 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003118
3119
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003120@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003121def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003122 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003123 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003124 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003125 _, args = parser.parse_args(args)
3126 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003127 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003128 return RunGit(['config', 'branch.%s.base-url' % branch],
3129 error_ok=False).strip()
3130 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003131 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003132 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3133 error_ok=False).strip()
3134
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003135
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003136def color_for_status(status):
3137 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003138 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003139 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003140 'unsent': BOLD + Fore.YELLOW,
3141 'waiting': BOLD + Fore.RED,
3142 'reply': BOLD + Fore.YELLOW,
3143 'not lgtm': BOLD + Fore.RED,
3144 'lgtm': BOLD + Fore.GREEN,
3145 'commit': BOLD + Fore.MAGENTA,
3146 'closed': BOLD + Fore.CYAN,
3147 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003148 }.get(status, Fore.WHITE)
3149
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003150
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003151def get_cl_statuses(changes, fine_grained, max_processes=None):
3152 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003153
3154 If fine_grained is true, this will fetch CL statuses from the server.
3155 Otherwise, simply indicate if there's a matching url for the given branches.
3156
3157 If max_processes is specified, it is used as the maximum number of processes
3158 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3159 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003160
3161 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003162 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003163 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003164 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003165
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003166 if not fine_grained:
3167 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003168 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003169 for cl in changes:
3170 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003171 return
3172
3173 # First, sort out authentication issues.
3174 logging.debug('ensuring credentials exist')
3175 for cl in changes:
3176 cl.EnsureAuthenticated(force=False, refresh=True)
3177
3178 def fetch(cl):
3179 try:
3180 return (cl, cl.GetStatus())
3181 except:
3182 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003183 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003184 raise
3185
3186 threads_count = len(changes)
3187 if max_processes:
3188 threads_count = max(1, min(threads_count, max_processes))
3189 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3190
Edward Lemur61bf4172020-02-24 23:22:37 +00003191 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003192 fetched_cls = set()
3193 try:
3194 it = pool.imap_unordered(fetch, changes).__iter__()
3195 while True:
3196 try:
3197 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003198 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003199 break
3200 fetched_cls.add(cl)
3201 yield cl, status
3202 finally:
3203 pool.close()
3204
3205 # Add any branches that failed to fetch.
3206 for cl in set(changes) - fetched_cls:
3207 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003208
rmistry@google.com2dd99862015-06-22 12:22:18 +00003209
Jose Lopes3863fc52020-04-07 17:00:25 +00003210def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003211 """Uploads CLs of local branches that are dependents of the current branch.
3212
3213 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003214
3215 test1 -> test2.1 -> test3.1
3216 -> test3.2
3217 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003218
3219 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3220 run on the dependent branches in this order:
3221 test2.1, test3.1, test3.2, test2.2, test3.3
3222
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003223 Note: This function does not rebase your local dependent branches. Use it
3224 when you make a change to the parent branch that will not conflict
3225 with its dependent branches, and you would like their dependencies
3226 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003227 """
3228 if git_common.is_dirty_git_tree('upload-branch-deps'):
3229 return 1
3230
3231 root_branch = cl.GetBranch()
3232 if root_branch is None:
3233 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3234 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003235 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003236 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3237 'patchset dependencies without an uploaded CL.')
3238
3239 branches = RunGit(['for-each-ref',
3240 '--format=%(refname:short) %(upstream:short)',
3241 'refs/heads'])
3242 if not branches:
3243 print('No local branches found.')
3244 return 0
3245
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003246 # Create a dictionary of all local branches to the branches that are
3247 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003248 tracked_to_dependents = collections.defaultdict(list)
3249 for b in branches.splitlines():
3250 tokens = b.split()
3251 if len(tokens) == 2:
3252 branch_name, tracked = tokens
3253 tracked_to_dependents[tracked].append(branch_name)
3254
vapiera7fbd5a2016-06-16 09:17:49 -07003255 print()
3256 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003257 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003258
rmistry@google.com2dd99862015-06-22 12:22:18 +00003259 def traverse_dependents_preorder(branch, padding=''):
3260 dependents_to_process = tracked_to_dependents.get(branch, [])
3261 padding += ' '
3262 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003263 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003264 dependents.append(dependent)
3265 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003266
rmistry@google.com2dd99862015-06-22 12:22:18 +00003267 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003268 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003269
3270 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003271 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003272 return 0
3273
Jose Lopes3863fc52020-04-07 17:00:25 +00003274 if not force:
3275 confirm_or_exit('This command will checkout all dependent branches and run '
3276 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003277
rmistry@google.com2dd99862015-06-22 12:22:18 +00003278 # Record all dependents that failed to upload.
3279 failures = {}
3280 # Go through all dependents, checkout the branch and upload.
3281 try:
3282 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003283 print()
3284 print('--------------------------------------')
3285 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003286 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003287 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003288 try:
3289 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003290 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003291 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003292 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003293 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003294 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003295 finally:
3296 # Swap back to the original root branch.
3297 RunGit(['checkout', '-q', root_branch])
3298
vapiera7fbd5a2016-06-16 09:17:49 -07003299 print()
3300 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003301 for dependent_branch in dependents:
3302 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003303 print(' %s : %s' % (dependent_branch, upload_status))
3304 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003305
3306 return 0
3307
3308
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003309def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003310 """Given a proposed tag name, returns a tag name that is guaranteed to be
3311 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3312 or 'foo-3', and so on."""
3313
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003314 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003315 for suffix_num in itertools.count(1):
3316 if suffix_num == 1:
3317 to_check = proposed_tag
3318 else:
3319 to_check = '%s-%d' % (proposed_tag, suffix_num)
3320
3321 if to_check not in existing_tags:
3322 return to_check
3323
3324
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003325@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003326def CMDarchive(parser, args):
3327 """Archives and deletes branches associated with closed changelists."""
3328 parser.add_option(
3329 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003330 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003331 parser.add_option(
3332 '-f', '--force', action='store_true',
3333 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003334 parser.add_option(
3335 '-d', '--dry-run', action='store_true',
3336 help='Skip the branch tagging and removal steps.')
3337 parser.add_option(
3338 '-t', '--notags', action='store_true',
3339 help='Do not tag archived branches. '
3340 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003341 parser.add_option(
3342 '-p',
3343 '--pattern',
3344 default='git-cl-archived-{issue}-{branch}',
3345 help='Format string for archive tags. '
3346 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003347
kmarshall3bff56b2016-06-06 18:31:47 -07003348 options, args = parser.parse_args(args)
3349 if args:
3350 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003351
3352 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3353 if not branches:
3354 return 0
3355
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003356 tags = RunGit(['for-each-ref', '--format=%(refname)',
3357 'refs/tags']).splitlines() or []
3358 tags = [t.split('/')[-1] for t in tags]
3359
vapiera7fbd5a2016-06-16 09:17:49 -07003360 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003361 changes = [Changelist(branchref=b)
3362 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003363 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3364 statuses = get_cl_statuses(changes,
3365 fine_grained=True,
3366 max_processes=options.maxjobs)
3367 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003368 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3369 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003370 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003371 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003372 proposal.sort()
3373
3374 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003375 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003376 return 0
3377
Edward Lemur85153282020-02-14 22:06:29 +00003378 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003379
vapiera7fbd5a2016-06-16 09:17:49 -07003380 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003381 if options.notags:
3382 for next_item in proposal:
3383 print(' ' + next_item[0])
3384 else:
3385 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3386 for next_item in proposal:
3387 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003388
kmarshall9249e012016-08-23 12:02:16 -07003389 # Quit now on precondition failure or if instructed by the user, either
3390 # via an interactive prompt or by command line flags.
3391 if options.dry_run:
3392 print('\nNo changes were made (dry run).\n')
3393 return 0
3394 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003395 print('You are currently on a branch \'%s\' which is associated with a '
3396 'closed codereview issue, so archive cannot proceed. Please '
3397 'checkout another branch and run this command again.' %
3398 current_branch)
3399 return 1
kmarshall9249e012016-08-23 12:02:16 -07003400 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003401 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003402 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003403 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003404 return 1
3405
3406 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003407 if not options.notags:
3408 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003409
3410 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3411 # Clean up the tag if we failed to delete the branch.
3412 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003413
vapiera7fbd5a2016-06-16 09:17:49 -07003414 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003415
3416 return 0
3417
3418
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003419@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003420def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003421 """Show status of changelists.
3422
3423 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003424 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003425 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003426 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003427 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003428 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003429 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003430 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003431
3432 Also see 'git cl comments'.
3433 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003434 parser.add_option(
3435 '--no-branch-color',
3436 action='store_true',
3437 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003438 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003439 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003440 parser.add_option('-f', '--fast', action='store_true',
3441 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003442 parser.add_option(
3443 '-j', '--maxjobs', action='store', type=int,
3444 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003445 parser.add_option(
3446 '-i', '--issue', type=int,
3447 help='Operate on this issue instead of the current branch\'s implicit '
3448 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003449 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003450 if args:
3451 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452
iannuccie53c9352016-08-17 14:40:40 -07003453 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003454 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003455
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003457 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003458 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003459 if cl.GetIssue():
3460 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003461 elif options.field == 'id':
3462 issueid = cl.GetIssue()
3463 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003464 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003465 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003466 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003467 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003468 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003469 elif options.field == 'status':
3470 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003471 elif options.field == 'url':
3472 url = cl.GetIssueURL()
3473 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003474 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003475 return 0
3476
3477 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3478 if not branches:
3479 print('No local branch found.')
3480 return 0
3481
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003482 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003483 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003484 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003485 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003486 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003487 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003488 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003489
Edward Lemur85153282020-02-14 22:06:29 +00003490 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003491
3492 def FormatBranchName(branch, colorize=False):
3493 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3494 an asterisk when it is the current branch."""
3495
3496 asterisk = ""
3497 color = Fore.RESET
3498 if branch == current_branch:
3499 asterisk = "* "
3500 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003501 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003502
3503 if colorize:
3504 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003505 return asterisk + branch_name
3506
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003507 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003508
3509 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003510 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3511 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003512 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003513 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003514 branch_statuses[c.GetBranch()] = status
3515 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003516 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003517 if url and (not status or status == 'error'):
3518 # The issue probably doesn't exist anymore.
3519 url += ' (broken)'
3520
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003521 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003522 # Turn off bold as well as colors.
3523 END = '\033[0m'
3524 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003525 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003526 color = ''
3527 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003528 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003529
Alan Cuttera3be9a52019-03-04 18:50:33 +00003530 branch_display = FormatBranchName(branch)
3531 padding = ' ' * (alignment - len(branch_display))
3532 if not options.no_branch_color:
3533 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003534
Alan Cuttera3be9a52019-03-04 18:50:33 +00003535 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3536 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003537
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003539 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003540 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003541 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003542 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003543 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003544 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003545 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003546 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003547 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003548 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003549 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003550 return 0
3551
3552
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003553def colorize_CMDstatus_doc():
3554 """To be called once in main() to add colors to git cl status help."""
3555 colors = [i for i in dir(Fore) if i[0].isupper()]
3556
3557 def colorize_line(line):
3558 for color in colors:
3559 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003560 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003561 indent = len(line) - len(line.lstrip(' ')) + 1
3562 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3563 return line
3564
3565 lines = CMDstatus.__doc__.splitlines()
3566 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3567
3568
phajdan.jre328cf92016-08-22 04:12:17 -07003569def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003570 if path == '-':
3571 json.dump(contents, sys.stdout)
3572 else:
3573 with open(path, 'w') as f:
3574 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003575
3576
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003577@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003578@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003579def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003580 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003581
3582 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003583 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003584 parser.add_option('-r', '--reverse', action='store_true',
3585 help='Lookup the branch(es) for the specified issues. If '
3586 'no issues are specified, all branches with mapped '
3587 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003588 parser.add_option('--json',
3589 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003590 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003591
dnj@chromium.org406c4402015-03-03 17:22:28 +00003592 if options.reverse:
3593 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003594 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003595 # Reverse issue lookup.
3596 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003597
3598 git_config = {}
3599 for config in RunGit(['config', '--get-regexp',
3600 r'branch\..*issue']).splitlines():
3601 name, _space, val = config.partition(' ')
3602 git_config[name] = val
3603
dnj@chromium.org406c4402015-03-03 17:22:28 +00003604 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003605 issue = git_config.get(
3606 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003607 if issue:
3608 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003609 if not args:
3610 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003611 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003612 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003613 try:
3614 issue_num = int(issue)
3615 except ValueError:
3616 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003617 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003618 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003620 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003621 if options.json:
3622 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003623 return 0
3624
3625 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003626 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003627 if not issue.valid:
3628 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3629 'or no argument to list it.\n'
3630 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003631 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003632 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003633 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003634 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003635 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3636 if options.json:
3637 write_json(options.json, {
3638 'issue': cl.GetIssue(),
3639 'issue_url': cl.GetIssueURL(),
3640 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003641 return 0
3642
3643
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003644@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003645def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003646 """Shows or posts review comments for any changelist."""
3647 parser.add_option('-a', '--add-comment', dest='comment',
3648 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003649 parser.add_option('-p', '--publish', action='store_true',
3650 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003651 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003652 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003653 parser.add_option('-m', '--machine-readable', dest='readable',
3654 action='store_false', default=True,
3655 help='output comments in a format compatible with '
3656 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003657 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003658 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003659 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003660
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003661 issue = None
3662 if options.issue:
3663 try:
3664 issue = int(options.issue)
3665 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003666 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003667
Edward Lemur934836a2019-09-09 20:16:54 +00003668 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003669
3670 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003671 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003672 return 0
3673
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003674 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3675 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003676 for comment in summary:
3677 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003678 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003679 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003680 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003681 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003682 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003683 elif comment.autogenerated:
3684 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003685 else:
3686 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003687 print('\n%s%s %s%s\n%s' % (
3688 color,
3689 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3690 comment.sender,
3691 Fore.RESET,
3692 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3693
smut@google.comc85ac942015-09-15 16:34:43 +00003694 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003695 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003696 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003697 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3698 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003699 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003700 return 0
3701
3702
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003703@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003704@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003705def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003706 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003707 parser.add_option('-d', '--display', action='store_true',
3708 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003709 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003710 help='New description to set for this issue (- for stdin, '
3711 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003712 parser.add_option('-f', '--force', action='store_true',
3713 help='Delete any unpublished Gerrit edits for this issue '
3714 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003715
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003716 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003717
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003718 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003719 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003720 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003721 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003722 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003723
Edward Lemur934836a2019-09-09 20:16:54 +00003724 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003725 if target_issue_arg:
3726 kwargs['issue'] = target_issue_arg.issue
3727 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003728
3729 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003730 if not cl.GetIssue():
3731 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003732
Edward Lemur678a6842019-10-03 22:25:05 +00003733 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003734 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003735
Edward Lemur6c6827c2020-02-06 21:15:18 +00003736 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003737
smut@google.com34fb6b12015-07-13 20:03:26 +00003738 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003740 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003741
3742 if options.new_description:
3743 text = options.new_description
3744 if text == '-':
3745 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003746 elif text == '+':
3747 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003748 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003749
3750 description.set_description(text)
3751 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003752 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003753 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003754 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003755 return 0
3756
3757
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003758@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003759def CMDlint(parser, args):
3760 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003761 parser.add_option('--filter', action='append', metavar='-x,+y',
3762 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003763 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003764
3765 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003766 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003767 try:
3768 import cpplint
3769 import cpplint_chromium
3770 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003771 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003772 return 1
3773
3774 # Change the current working directory before calling lint so that it
3775 # shows the correct base.
3776 previous_cwd = os.getcwd()
3777 os.chdir(settings.GetRoot())
3778 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003779 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003780 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003781 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003782 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003783 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003784
3785 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003786 command = args + files
3787 if options.filter:
3788 command = ['--filter=' + ','.join(options.filter)] + command
3789 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003790
3791 white_regex = re.compile(settings.GetLintRegex())
3792 black_regex = re.compile(settings.GetLintIgnoreRegex())
3793 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3794 for filename in filenames:
3795 if white_regex.match(filename):
3796 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003797 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003798 else:
3799 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3800 extra_check_functions)
3801 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003803 finally:
3804 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003805 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003806 if cpplint._cpplint_state.error_count != 0:
3807 return 1
3808 return 0
3809
3810
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003811@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003812def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003813 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003814 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003815 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003816 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003817 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003818 parser.add_option('--all', action='store_true',
3819 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003820 parser.add_option('--parallel', action='store_true',
3821 help='Run all tests specified by input_api.RunTests in all '
3822 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003823 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003824
sbc@chromium.org71437c02015-04-09 19:29:40 +00003825 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 return 1
3828
Edward Lemur934836a2019-09-09 20:16:54 +00003829 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003830 if args:
3831 base_branch = args[0]
3832 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003833 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003834 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003836 if cl.GetIssue():
3837 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003838 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003839 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003840
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003841 cl.RunHook(
3842 committing=not options.upload,
3843 may_prompt=False,
3844 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003845 parallel=options.parallel,
3846 upstream=base_branch,
3847 description=description,
3848 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003849 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850
3851
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003852def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003853 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003854
3855 Works the same way as
3856 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3857 but can be called on demand on all platforms.
3858
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003859 The basic idea is to generate git hash of a state of the tree, original
3860 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003861 """
3862 lines = []
3863 tree_hash = RunGitSilent(['write-tree'])
3864 lines.append('tree %s' % tree_hash.strip())
3865 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3866 if code == 0:
3867 lines.append('parent %s' % parent.strip())
3868 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3869 lines.append('author %s' % author.strip())
3870 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3871 lines.append('committer %s' % committer.strip())
3872 lines.append('')
3873 # Note: Gerrit's commit-hook actually cleans message of some lines and
3874 # whitespace. This code is not doing this, but it clearly won't decrease
3875 # entropy.
3876 lines.append(message)
3877 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003878 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003879 return 'I%s' % change_hash.strip()
3880
3881
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003882def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003883 """Computes the remote branch ref to use for the CL.
3884
3885 Args:
3886 remote (str): The git remote for the CL.
3887 remote_branch (str): The git remote branch for the CL.
3888 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003889 """
3890 if not (remote and remote_branch):
3891 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003892
wittman@chromium.org455dc922015-01-26 20:15:50 +00003893 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003894 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003895 # refs, which are then translated into the remote full symbolic refs
3896 # below.
3897 if '/' not in target_branch:
3898 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3899 else:
3900 prefix_replacements = (
3901 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3902 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3903 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3904 )
3905 match = None
3906 for regex, replacement in prefix_replacements:
3907 match = re.search(regex, target_branch)
3908 if match:
3909 remote_branch = target_branch.replace(match.group(0), replacement)
3910 break
3911 if not match:
3912 # This is a branch path but not one we recognize; use as-is.
3913 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003914 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3915 # Handle the refs that need to land in different refs.
3916 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003917
wittman@chromium.org455dc922015-01-26 20:15:50 +00003918 # Create the true path to the remote branch.
3919 # Does the following translation:
3920 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3921 # * refs/remotes/origin/master -> refs/heads/master
3922 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3923 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3924 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3925 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3926 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3927 'refs/heads/')
3928 elif remote_branch.startswith('refs/remotes/branch-heads'):
3929 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003930
wittman@chromium.org455dc922015-01-26 20:15:50 +00003931 return remote_branch
3932
3933
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003934def cleanup_list(l):
3935 """Fixes a list so that comma separated items are put as individual items.
3936
3937 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3938 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3939 """
3940 items = sum((i.split(',') for i in l), [])
3941 stripped_items = (i.strip() for i in items)
3942 return sorted(filter(None, stripped_items))
3943
3944
Aaron Gable4db38df2017-11-03 14:59:07 -07003945@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003946@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003947def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003948 """Uploads the current changelist to codereview.
3949
3950 Can skip dependency patchset uploads for a branch by running:
3951 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003952 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003953 git config --unset branch.branch_name.skip-deps-uploads
3954 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003955
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003956 If the name of the checked out branch starts with "bug-" or "fix-" followed
3957 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003958 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003959
3960 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003961 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003962 [git-cl] add support for hashtags
3963 Foo bar: implement foo
3964 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00003965 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003966 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3967 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003968 parser.add_option('--bypass-watchlists', action='store_true',
3969 dest='bypass_watchlists',
3970 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07003971 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003972 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003973 parser.add_option('--message', '-m', dest='message',
3974 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003975 parser.add_option('-b', '--bug',
3976 help='pre-populate the bug number(s) for this issue. '
3977 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003978 parser.add_option('--message-file', dest='message_file',
3979 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003980 parser.add_option('--title', '-t', dest='title',
3981 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003982 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003983 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003984 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003985 parser.add_option('--tbrs',
3986 action='append', default=[],
3987 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003988 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003989 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003990 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003991 parser.add_option('--hashtag', dest='hashtags',
3992 action='append', default=[],
3993 help=('Gerrit hashtag for new CL; '
3994 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00003995 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08003996 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003997 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003998 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003999 metavar='TARGET',
4000 help='Apply CL to remote ref TARGET. ' +
4001 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004002 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004003 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004004 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004005 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004006 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004007 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004008 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4009 const='TBR', help='add a set of OWNERS to TBR')
4010 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4011 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004012 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004013 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004014 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004015 'implies --send-mail')
4016 parser.add_option('-d', '--cq-dry-run',
4017 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004018 help='Send the patchset to do a CQ dry run right after '
4019 'upload.')
Edward Lesmesaf45aa82021-03-31 22:56:46 +00004020 parser.add_option('--set-bot-commit', action='store_true',
4021 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004022 parser.add_option('--preserve-tryjobs', action='store_true',
4023 help='instruct the CQ to let tryjobs running even after '
4024 'new patchsets are uploaded instead of canceling '
4025 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004026 parser.add_option('--dependencies', action='store_true',
4027 help='Uploads CLs of all the local branches that depend on '
4028 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004029 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4030 help='Sends your change to the CQ after an approval. Only '
4031 'works on repos that have the Auto-Submit label '
4032 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004033 parser.add_option('--parallel', action='store_true',
4034 help='Run all tests specified by input_api.RunTests in all '
4035 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004036 parser.add_option('--no-autocc', action='store_true',
4037 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004038 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004039 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004040 parser.add_option('-R', '--retry-failed', action='store_true',
4041 help='Retry failed tryjobs from old patchset immediately '
4042 'after uploading new patchset. Cannot be used with '
4043 '--use-commit-queue or --cq-dry-run.')
4044 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4045 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004046 parser.add_option('--fixed', '-x',
4047 help='List of bugs that will be commented on and marked '
4048 'fixed (pre-populates "Fixed:" tag). Same format as '
4049 '-b option / "Bug:" tag. If fixing several issues, '
4050 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004051 parser.add_option('--edit-description', action='store_true', default=False,
4052 help='Modify description before upload. Cannot be used '
4053 'with --force. It is a noop when --no-squash is set '
4054 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004055
rmistry@google.com2dd99862015-06-22 12:22:18 +00004056 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004057 (options, args) = parser.parse_args(args)
4058
sbc@chromium.org71437c02015-04-09 19:29:40 +00004059 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004060 return 1
4061
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004062 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004063 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004064 options.cc = cleanup_list(options.cc)
4065
Josipe827b0f2020-01-30 00:07:20 +00004066 if options.edit_description and options.force:
4067 parser.error('Only one of --force and --edit-description allowed')
4068
tandriib80458a2016-06-23 12:20:07 -07004069 if options.message_file:
4070 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004071 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004072 options.message = gclient_utils.FileRead(options.message_file)
4073 options.message_file = None
4074
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004075 if ([options.cq_dry_run,
4076 options.use_commit_queue,
4077 options.retry_failed].count(True) > 1):
4078 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4079 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004080
Aaron Gableedbc4132017-09-11 13:22:28 -07004081 if options.use_commit_queue:
4082 options.send_mail = True
4083
Edward Lesmes0dd54822020-03-26 18:24:25 +00004084 if options.squash is None:
4085 # Load default for user, repo, squash=true, in this order.
4086 options.squash = settings.GetSquashGerritUploads()
4087
Edward Lemur934836a2019-09-09 20:16:54 +00004088 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004089 # Warm change details cache now to avoid RPCs later, reducing latency for
4090 # developers.
4091 if cl.GetIssue():
4092 cl._GetChangeDetail(
4093 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4094
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004095 if options.retry_failed and not cl.GetIssue():
4096 print('No previous patchsets, so --retry-failed has no effect.')
4097 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004098
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004099 # cl.GetMostRecentPatchset uses cached information, and can return the last
4100 # patchset before upload. Calling it here makes it clear that it's the
4101 # last patchset before upload. Note that GetMostRecentPatchset will fail
4102 # if no CL has been uploaded yet.
4103 if options.retry_failed:
4104 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004105
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004106 ret = cl.CMDUpload(options, args, orig_args)
4107
4108 if options.retry_failed:
4109 if ret != 0:
4110 print('Upload failed, so --retry-failed has no effect.')
4111 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004112 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004113 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004114 jobs = _filter_failed_for_retry(builds)
4115 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004116 print('No failed tryjobs, so --retry-failed has no effect.')
4117 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004118 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004119
4120 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004121
4122
Francois Dorayd42c6812017-05-30 15:10:20 -04004123@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004124@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004125def CMDsplit(parser, args):
4126 """Splits a branch into smaller branches and uploads CLs.
4127
4128 Creates a branch and uploads a CL for each group of files modified in the
4129 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004130 comment, the string '$directory', is replaced with the directory containing
4131 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004132 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004133 parser.add_option('-d', '--description', dest='description_file',
4134 help='A text file containing a CL description in which '
4135 '$directory will be replaced by each CL\'s directory.')
4136 parser.add_option('-c', '--comment', dest='comment_file',
4137 help='A text file containing a CL comment.')
4138 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004139 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004140 help='List the files and reviewers for each CL that would '
4141 'be created, but don\'t create branches or CLs.')
4142 parser.add_option('--cq-dry-run', action='store_true',
4143 help='If set, will do a cq dry run for each uploaded CL. '
4144 'Please be careful when doing this; more than ~10 CLs '
4145 'has the potential to overload our build '
4146 'infrastructure. Try to upload these not during high '
4147 'load times (usually 11-3 Mountain View time). Email '
4148 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004149 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4150 default=True,
4151 help='Sends your change to the CQ after an approval. Only '
4152 'works on repos that have the Auto-Submit label '
4153 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004154 options, _ = parser.parse_args(args)
4155
4156 if not options.description_file:
4157 parser.error('No --description flag specified.')
4158
4159 def WrappedCMDupload(args):
4160 return CMDupload(OptionParser(), args)
4161
Edward Lemur2c62b332020-03-12 22:12:33 +00004162 return split_cl.SplitCl(
4163 options.description_file, options.comment_file, Changelist,
4164 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4165 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004166
4167
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004168@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004169@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004170def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004171 """DEPRECATED: Used to commit the current changelist via git-svn."""
4172 message = ('git-cl no longer supports committing to SVN repositories via '
4173 'git-svn. You probably want to use `git cl land` instead.')
4174 print(message)
4175 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004176
4177
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004178@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004179@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004180def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004181 """Commits the current changelist via git.
4182
4183 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4184 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004185 """
4186 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4187 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004188 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004189 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004190 parser.add_option('--parallel', action='store_true',
4191 help='Run all tests specified by input_api.RunTests in all '
4192 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004193 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004194
Edward Lemur934836a2019-09-09 20:16:54 +00004195 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004196
Robert Iannucci2e73d432018-03-14 01:10:47 -07004197 if not cl.GetIssue():
4198 DieWithError('You must upload the change first to Gerrit.\n'
4199 ' If you would rather have `git cl land` upload '
4200 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004201 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004202 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004203
4204
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004205@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004206@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004208 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004209 parser.add_option('-b', dest='newbranch',
4210 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004211 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004212 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004213 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004214 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004215
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004216 group = optparse.OptionGroup(
4217 parser,
4218 'Options for continuing work on the current issue uploaded from a '
4219 'different clone (e.g. different machine). Must be used independently '
4220 'from the other options. No issue number should be specified, and the '
4221 'branch must have an issue number associated with it')
4222 group.add_option('--reapply', action='store_true', dest='reapply',
4223 help='Reset the branch and reapply the issue.\n'
4224 'CAUTION: This will undo any local changes in this '
4225 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004226
4227 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004228 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004229 parser.add_option_group(group)
4230
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004231 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004232
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004233 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004234 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004235 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004236 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004237 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004238
Edward Lemur934836a2019-09-09 20:16:54 +00004239 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004240 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004241 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004242
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004243 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004244 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004245 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004246
4247 RunGit(['reset', '--hard', upstream])
4248 if options.pull:
4249 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004250
Edward Lemur678a6842019-10-03 22:25:05 +00004251 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4252 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004253
4254 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004255 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004256
Edward Lemurf38bc172019-09-03 21:02:13 +00004257 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004258 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004259 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004260
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004261 # We don't want uncommitted changes mixed up with the patch.
4262 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004263 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004265 if options.newbranch:
4266 if options.force:
4267 RunGit(['branch', '-D', options.newbranch],
4268 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004269 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004270
Edward Lemur678a6842019-10-03 22:25:05 +00004271 cl = Changelist(
4272 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004273
Edward Lemur678a6842019-10-03 22:25:05 +00004274 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004275 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004276
Edward Lemurf38bc172019-09-03 21:02:13 +00004277 return cl.CMDPatchWithParsedIssue(
4278 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004279
4280
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004281def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004282 """Fetches the tree status and returns either 'open', 'closed',
4283 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004284 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004285 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004286 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004287 if status.find('closed') != -1 or status == '0':
4288 return 'closed'
4289 elif status.find('open') != -1 or status == '1':
4290 return 'open'
4291 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004292 return 'unset'
4293
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004295def GetTreeStatusReason():
4296 """Fetches the tree status from a json url and returns the message
4297 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004298 url = settings.GetTreeStatusUrl()
4299 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004300 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004301 status = json.loads(connection.read())
4302 connection.close()
4303 return status['message']
4304
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004305
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004306@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004307def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004308 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004309 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004310 status = GetTreeStatus()
4311 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004312 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004313 return 2
4314
vapiera7fbd5a2016-06-16 09:17:49 -07004315 print('The tree is %s' % status)
4316 print()
4317 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004318 if status != 'open':
4319 return 1
4320 return 0
4321
4322
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004323@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004324def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004325 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4326 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004327 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004328 '-b', '--bot', action='append',
4329 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4330 'times to specify multiple builders. ex: '
4331 '"-b win_rel -b win_layout". See '
4332 'the try server waterfall for the builders name and the tests '
4333 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004334 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004335 '-B', '--bucket', default='',
4336 help=('Buildbucket bucket to send the try requests.'))
4337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004338 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004339 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004340 'be determined by the try recipe that builder runs, which usually '
4341 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004342 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004343 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004344 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004345 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004346 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004347 '--category', default='git_cl_try', help='Specify custom build category.')
4348 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004349 '--project',
4350 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004351 'in recipe to determine to which repository or directory to '
4352 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004353 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004354 '-p', '--property', dest='properties', action='append', default=[],
4355 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004356 'key2=value2 etc. The value will be treated as '
4357 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004358 'NOTE: using this may make your tryjob not usable for CQ, '
4359 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004360 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004361 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4362 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004363 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004364 parser.add_option(
4365 '-R', '--retry-failed', action='store_true', default=False,
4366 help='Retry failed jobs from the latest set of tryjobs. '
4367 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004368 parser.add_option(
4369 '-i', '--issue', type=int,
4370 help='Operate on this issue instead of the current branch\'s implicit '
4371 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004372 options, args = parser.parse_args(args)
4373
machenbach@chromium.org45453142015-09-15 08:45:22 +00004374 # Make sure that all properties are prop=value pairs.
4375 bad_params = [x for x in options.properties if '=' not in x]
4376 if bad_params:
4377 parser.error('Got properties with missing "=": %s' % bad_params)
4378
maruel@chromium.org15192402012-09-06 12:38:29 +00004379 if args:
4380 parser.error('Unknown arguments: %s' % args)
4381
Edward Lemur934836a2019-09-09 20:16:54 +00004382 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004383 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004384 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004385
Edward Lemurf38bc172019-09-03 21:02:13 +00004386 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004387 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004388
tandriie113dfd2016-10-11 10:20:12 -07004389 error_message = cl.CannotTriggerTryJobReason()
4390 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004391 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004392
Edward Lemur45768512020-03-02 19:03:14 +00004393 if options.bot:
4394 if options.retry_failed:
4395 parser.error('--bot is not compatible with --retry-failed.')
4396 if not options.bucket:
4397 parser.error('A bucket (e.g. "chromium/try") is required.')
4398
4399 triggered = [b for b in options.bot if 'triggered' in b]
4400 if triggered:
4401 parser.error(
4402 'Cannot schedule builds on triggered bots: %s.\n'
4403 'This type of bot requires an initial job from a parent (usually a '
4404 'builder). Schedule a job on the parent instead.\n' % triggered)
4405
4406 if options.bucket.startswith('.master'):
4407 parser.error('Buildbot masters are not supported.')
4408
4409 project, bucket = _parse_bucket(options.bucket)
4410 if project is None or bucket is None:
4411 parser.error('Invalid bucket: %s.' % options.bucket)
4412 jobs = sorted((project, bucket, bot) for bot in options.bot)
4413 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004414 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004415 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004416 if options.verbose:
4417 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004418 jobs = _filter_failed_for_retry(builds)
4419 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004420 print('There are no failed jobs in the latest set of jobs '
4421 '(patchset #%d), doing nothing.' % patchset)
4422 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004423 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004424 if num_builders > 10:
4425 confirm_or_exit('There are %d builders with failed builds.'
4426 % num_builders, action='continue')
4427 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004428 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004429 print('git cl try with no bots now defaults to CQ dry run.')
4430 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4431 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004432
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004433 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004434 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004435 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004436 except BuildbucketResponseException as ex:
4437 print('ERROR: %s' % ex)
4438 return 1
4439 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004440
4441
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004442@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004443def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004444 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004445 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004446 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004447 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004448 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004449 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004450 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004451 '--color', action='store_true', default=setup_color.IS_TTY,
4452 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004453 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004454 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4455 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004456 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004457 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004458 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004459 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004460 parser.add_option(
4461 '-i', '--issue', type=int,
4462 help='Operate on this issue instead of the current branch\'s implicit '
4463 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004464 options, args = parser.parse_args(args)
4465 if args:
4466 parser.error('Unrecognized args: %s' % ' '.join(args))
4467
Edward Lemur934836a2019-09-09 20:16:54 +00004468 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004469 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004470 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004471
tandrii221ab252016-10-06 08:12:04 -07004472 patchset = options.patchset
4473 if not patchset:
4474 patchset = cl.GetMostRecentPatchset()
4475 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004476 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004477 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004478 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004479 cl.GetIssue())
4480
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004481 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004482 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004483 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004484 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004485 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004486 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004487 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004488 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004489 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004490 return 0
4491
4492
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004493@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004494@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004495def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004496 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004497 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004498 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004499 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004500
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004502 if args:
4503 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004504 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004505 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004506 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004507 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004508
4509 # Clear configured merge-base, if there is one.
4510 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004511 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004512 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004513 return 0
4514
4515
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004516@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004517def CMDweb(parser, args):
4518 """Opens the current CL in the web browser."""
4519 _, args = parser.parse_args(args)
4520 if args:
4521 parser.error('Unrecognized args: %s' % ' '.join(args))
4522
4523 issue_url = Changelist().GetIssueURL()
4524 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004525 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004526 return 1
4527
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004528 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004529 # allows us to hide the "Created new window in existing browser session."
4530 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004531 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004532 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004533 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004534 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004535 os.open(os.devnull, os.O_RDWR)
4536 try:
4537 webbrowser.open(issue_url)
4538 finally:
4539 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004540 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004541 return 0
4542
4543
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004544@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004545def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004546 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004547 parser.add_option('-d', '--dry-run', action='store_true',
4548 help='trigger in dry run mode')
4549 parser.add_option('-c', '--clear', action='store_true',
4550 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004551 parser.add_option(
4552 '-i', '--issue', type=int,
4553 help='Operate on this issue instead of the current branch\'s implicit '
4554 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004555 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004556 if args:
4557 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004558 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004559 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004560
Edward Lemur934836a2019-09-09 20:16:54 +00004561 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004562 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004563 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004564 elif options.dry_run:
4565 state = _CQState.DRY_RUN
4566 else:
4567 state = _CQState.COMMIT
4568 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004569 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004570 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004571 return 0
4572
4573
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004575def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004576 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004577 parser.add_option(
4578 '-i', '--issue', type=int,
4579 help='Operate on this issue instead of the current branch\'s implicit '
4580 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004581 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004582 if args:
4583 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004584 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004585 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004586 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004587 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004588 cl.CloseIssue()
4589 return 0
4590
4591
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004592@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004593def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004594 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004595 parser.add_option(
4596 '--stat',
4597 action='store_true',
4598 dest='stat',
4599 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004600 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004601 if args:
4602 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004603
Edward Lemur934836a2019-09-09 20:16:54 +00004604 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004605 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004606 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004607 if not issue:
4608 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004609
Aaron Gablea718c3e2017-08-28 17:47:28 -07004610 base = cl._GitGetBranchConfigValue('last-upload-hash')
4611 if not base:
4612 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4613 if not base:
4614 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4615 revision_info = detail['revisions'][detail['current_revision']]
4616 fetch_info = revision_info['fetch']['http']
4617 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4618 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004619
Aaron Gablea718c3e2017-08-28 17:47:28 -07004620 cmd = ['git', 'diff']
4621 if options.stat:
4622 cmd.append('--stat')
4623 cmd.append(base)
4624 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004625
4626 return 0
4627
4628
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004629@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004630def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004631 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004632 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004633 '--ignore-current',
4634 action='store_true',
4635 help='Ignore the CL\'s current reviewers and start from scratch.')
4636 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004637 '--ignore-self',
4638 action='store_true',
4639 help='Do not consider CL\'s author as an owners.')
4640 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004641 '--no-color',
4642 action='store_true',
4643 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004644 parser.add_option(
4645 '--batch',
4646 action='store_true',
4647 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004648 # TODO: Consider moving this to another command, since other
4649 # git-cl owners commands deal with owners for a given CL.
4650 parser.add_option(
4651 '--show-all',
4652 action='store_true',
4653 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004654 options, args = parser.parse_args(args)
4655
Edward Lemur934836a2019-09-09 20:16:54 +00004656 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004657 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004658
Yang Guo6e269a02019-06-26 11:17:02 +00004659 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004660 if len(args) == 0:
4661 print('No files specified for --show-all. Nothing to do.')
4662 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004663 for arg in args:
4664 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004665 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004666 database.load_data_needed_for([arg])
4667 print('Owners for %s:' % arg)
4668 for owner in sorted(database.all_possible_owners([arg], None)):
4669 print(' - %s' % owner)
4670 return 0
4671
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004672 if args:
4673 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004674 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004675 base_branch = args[0]
4676 else:
4677 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004678 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004679
Edward Lemur2c62b332020-03-12 22:12:33 +00004680 root = settings.GetRoot()
4681 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004682
4683 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004684 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004685 print('\n'.join(db.reviewers_for(affected_files, author)))
4686 return 0
4687
Edward Lemur2c62b332020-03-12 22:12:33 +00004688 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4689 original_owner_files = {
4690 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4691 for f in owner_files}
4692
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004693 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004694 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004695 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004696 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004697 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004698 fopen=open,
4699 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004700 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004701 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004702 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004703
4704
Aiden Bennerc08566e2018-10-03 17:52:42 +00004705def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004706 """Generates a diff command."""
4707 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004708 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4709
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004710 if allow_prefix:
4711 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4712 # case that diff.noprefix is set in the user's git config.
4713 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4714 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004715 diff_cmd += ['--no-prefix']
4716
4717 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004718
4719 if args:
4720 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004721 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004722 diff_cmd.append(arg)
4723 else:
4724 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004725
4726 return diff_cmd
4727
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004728
Jamie Madill5e96ad12020-01-13 16:08:35 +00004729def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4730 """Runs clang-format-diff and sets a return value if necessary."""
4731
4732 if not clang_diff_files:
4733 return 0
4734
4735 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4736 # formatted. This is used to block during the presubmit.
4737 return_value = 0
4738
4739 # Locate the clang-format binary in the checkout
4740 try:
4741 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4742 except clang_format.NotFoundError as e:
4743 DieWithError(e)
4744
4745 if opts.full or settings.GetFormatFullByDefault():
4746 cmd = [clang_format_tool]
4747 if not opts.dry_run and not opts.diff:
4748 cmd.append('-i')
4749 if opts.dry_run:
4750 for diff_file in clang_diff_files:
4751 with open(diff_file, 'r') as myfile:
4752 code = myfile.read().replace('\r\n', '\n')
4753 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4754 stdout = stdout.replace('\r\n', '\n')
4755 if opts.diff:
4756 sys.stdout.write(stdout)
4757 if code != stdout:
4758 return_value = 2
4759 else:
4760 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4761 if opts.diff:
4762 sys.stdout.write(stdout)
4763 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004764 try:
4765 script = clang_format.FindClangFormatScriptInChromiumTree(
4766 'clang-format-diff.py')
4767 except clang_format.NotFoundError as e:
4768 DieWithError(e)
4769
Edward Lesmes89624cd2020-04-06 17:51:56 +00004770 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004771 if not opts.dry_run and not opts.diff:
4772 cmd.append('-i')
4773
4774 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004775 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004776
Edward Lesmes89624cd2020-04-06 17:51:56 +00004777 env = os.environ.copy()
4778 env['PATH'] = (
4779 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4780 stdout = RunCommand(
4781 cmd, stdin=diff_output, cwd=top_dir, env=env,
4782 shell=bool(sys.platform.startswith('win32')))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004783 if opts.diff:
4784 sys.stdout.write(stdout)
4785 if opts.dry_run and len(stdout) > 0:
4786 return_value = 2
4787
4788 return return_value
4789
4790
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004791def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004792 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004793 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004794
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004795
enne@chromium.org555cfe42014-01-29 18:21:39 +00004796@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004797@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004798def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004799 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004800 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004801 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004802 parser.add_option('--full', action='store_true',
4803 help='Reformat the full content of all touched files')
4804 parser.add_option('--dry-run', action='store_true',
4805 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004806 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004807 '--no-clang-format',
4808 dest='clang_format',
4809 action='store_false',
4810 default=True,
4811 help='Disables formatting of various file types using clang-format.')
4812 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004813 '--python',
4814 action='store_true',
4815 default=None,
4816 help='Enables python formatting on all python files.')
4817 parser.add_option(
4818 '--no-python',
4819 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004820 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004821 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004822 'If neither --python or --no-python are set, python files that have a '
4823 '.style.yapf file in an ancestor directory will be formatted. '
4824 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004825 parser.add_option(
4826 '--js',
4827 action='store_true',
4828 help='Format javascript code with clang-format. '
4829 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004830 parser.add_option('--diff', action='store_true',
4831 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004832 parser.add_option('--presubmit', action='store_true',
4833 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004834 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004835
Garrett Beaty91a6f332020-01-06 16:57:24 +00004836 if opts.python is not None and opts.no_python:
4837 raise parser.error('Cannot set both --python and --no-python')
4838 if opts.no_python:
4839 opts.python = False
4840
Daniel Chengc55eecf2016-12-30 03:11:02 -08004841 # Normalize any remaining args against the current path, so paths relative to
4842 # the current directory are still resolved as expected.
4843 args = [os.path.join(os.getcwd(), arg) for arg in args]
4844
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004845 # git diff generates paths against the root of the repository. Change
4846 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004847 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004848 if rel_base_path:
4849 os.chdir(rel_base_path)
4850
digit@chromium.org29e47272013-05-17 17:01:46 +00004851 # Grab the merge-base commit, i.e. the upstream commit of the current
4852 # branch when it was created or the last time it was rebased. This is
4853 # to cover the case where the user may have called "git fetch origin",
4854 # moving the origin branch to a newer commit, but hasn't rebased yet.
4855 upstream_commit = None
4856 cl = Changelist()
4857 upstream_branch = cl.GetUpstreamBranch()
4858 if upstream_branch:
4859 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4860 upstream_commit = upstream_commit.strip()
4861
4862 if not upstream_commit:
4863 DieWithError('Could not find base commit for this branch. '
4864 'Are you in detached state?')
4865
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004866 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4867 diff_output = RunGit(changed_files_cmd)
4868 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004869 # Filter out files deleted by this CL
4870 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004871
Andreas Haas417d89c2020-02-06 10:24:27 +00004872 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004873 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004874
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004875 clang_diff_files = []
4876 if opts.clang_format:
4877 clang_diff_files = [
4878 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4879 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004880 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004881 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004882
Edward Lesmes50da7702020-03-30 19:23:43 +00004883 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004884
Jamie Madill5e96ad12020-01-13 16:08:35 +00004885 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4886 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004887
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004888 # Similar code to above, but using yapf on .py files rather than clang-format
4889 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004890 py_explicitly_disabled = opts.python is not None and not opts.python
4891 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004892 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4893 yapf_tool = os.path.join(depot_tools_path, 'yapf')
4894 if sys.platform.startswith('win'):
4895 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004896
Aiden Bennerc08566e2018-10-03 17:52:42 +00004897 # Used for caching.
4898 yapf_configs = {}
4899 for f in python_diff_files:
4900 # Find the yapf style config for the current file, defaults to depot
4901 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004902 _FindYapfConfigFile(f, yapf_configs, top_dir)
4903
4904 # Turn on python formatting by default if a yapf config is specified.
4905 # This breaks in the case of this repo though since the specified
4906 # style file is also the global default.
4907 if opts.python is None:
4908 filtered_py_files = []
4909 for f in python_diff_files:
4910 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4911 filtered_py_files.append(f)
4912 else:
4913 filtered_py_files = python_diff_files
4914
4915 # Note: yapf still seems to fix indentation of the entire file
4916 # even if line ranges are specified.
4917 # See https://github.com/google/yapf/issues/499
4918 if not opts.full and filtered_py_files:
4919 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4920
Brian Sheedyb4307d52019-12-02 19:18:17 +00004921 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4922 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4923 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004924
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004925 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004926 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4927 # Default to pep8 if not .style.yapf is found.
4928 if not yapf_style:
4929 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004930
Takuto Ikuta26b02c12020-04-27 22:40:56 +00004931 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004932
4933 has_formattable_lines = False
4934 if not opts.full:
4935 # Only run yapf over changed line ranges.
4936 for diff_start, diff_len in py_line_diffs[f]:
4937 diff_end = diff_start + diff_len - 1
4938 # Yapf errors out if diff_end < diff_start but this
4939 # is a valid line range diff for a removal.
4940 if diff_end >= diff_start:
4941 has_formattable_lines = True
4942 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
4943 # If all line diffs were removals we have nothing to format.
4944 if not has_formattable_lines:
4945 continue
4946
4947 if opts.diff or opts.dry_run:
4948 cmd += ['--diff']
4949 # Will return non-zero exit code if non-empty diff.
4950 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
4951 if opts.diff:
4952 sys.stdout.write(stdout)
4953 elif len(stdout) > 0:
4954 return_value = 2
4955 else:
4956 cmd += ['-i']
4957 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004958
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004959 # Format GN build files. Always run on full build files for canonical form.
4960 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004961 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07004962 if opts.dry_run or opts.diff:
4963 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004964 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07004965 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Edward Lesmes89624cd2020-04-06 17:51:56 +00004966 shell=bool(sys.platform.startswith('win')),
brettw4b8ed592016-08-05 16:19:12 -07004967 cwd=top_dir)
4968 if opts.dry_run and gn_ret == 2:
4969 return_value = 2 # Not formatted.
4970 elif opts.diff and gn_ret == 2:
4971 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004972 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07004973 elif gn_ret != 0:
4974 # For non-dry run cases (and non-2 return values for dry-run), a
4975 # nonzero error code indicates a failure, probably because the file
4976 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004977 DieWithError('gn format failed on ' + gn_diff_file +
4978 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004979
Ilya Shermane081cbe2017-08-15 17:51:04 -07004980 # Skip the metrics formatting from the global presubmit hook. These files have
4981 # a separate presubmit hook that issues an error if the files need formatting,
4982 # whereas the top-level presubmit script merely issues a warning. Formatting
4983 # these files is somewhat slow, so it's important not to duplicate the work.
4984 if not opts.presubmit:
4985 for xml_dir in GetDirtyMetricsDirs(diff_files):
4986 tool_dir = os.path.join(top_dir, xml_dir)
4987 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
4988 if opts.dry_run or opts.diff:
4989 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07004990 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07004991 if opts.diff:
4992 sys.stdout.write(stdout)
4993 if opts.dry_run and stdout:
4994 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05004995
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004996 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004997
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004998
Steven Holte2e664bf2017-04-21 13:10:47 -07004999def GetDirtyMetricsDirs(diff_files):
5000 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5001 metrics_xml_dirs = [
5002 os.path.join('tools', 'metrics', 'actions'),
5003 os.path.join('tools', 'metrics', 'histograms'),
5004 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005005 os.path.join('tools', 'metrics', 'ukm'),
5006 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005007 for xml_dir in metrics_xml_dirs:
5008 if any(file.startswith(xml_dir) for file in xml_diff_files):
5009 yield xml_dir
5010
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005011
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005012@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005013@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005014def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005015 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005016 _, args = parser.parse_args(args)
5017
5018 if len(args) != 1:
5019 parser.print_help()
5020 return 1
5021
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005022 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005023 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005024 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005025
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005026 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005027
Edward Lemur52969c92020-02-06 18:15:28 +00005028 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005029 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005030 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005031
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005032 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005033 for key, issue in [x.split() for x in output.splitlines()]:
5034 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005035 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005036
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005037 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005038 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005039 return 1
5040 if len(branches) == 1:
5041 RunGit(['checkout', branches[0]])
5042 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005043 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005044 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005045 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005046 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005047 try:
5048 RunGit(['checkout', branches[int(which)]])
5049 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005050 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005051 return 1
5052
5053 return 0
5054
5055
maruel@chromium.org29404b52014-09-08 22:58:00 +00005056def CMDlol(parser, args):
5057 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005058 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005059 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5060 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5061 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005062 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005063 return 0
5064
5065
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005066class OptionParser(optparse.OptionParser):
5067 """Creates the option parse and add --verbose support."""
5068 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005069 optparse.OptionParser.__init__(
5070 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005071 self.add_option(
5072 '-v', '--verbose', action='count', default=0,
5073 help='Use 2 times for more debugging info')
5074
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005075 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005076 try:
5077 return self._parse_args(args)
5078 finally:
5079 # Regardless of success or failure of args parsing, we want to report
5080 # metrics, but only after logging has been initialized (if parsing
5081 # succeeded).
5082 global settings
5083 settings = Settings()
5084
5085 if not metrics.DISABLE_METRICS_COLLECTION:
5086 # GetViewVCUrl ultimately calls logging method.
5087 project_url = settings.GetViewVCUrl().strip('/+')
5088 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5089 metrics.collector.add('project_urls', [project_url])
5090
5091 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005092 # Create an optparse.Values object that will store only the actual passed
5093 # options, without the defaults.
5094 actual_options = optparse.Values()
5095 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5096 # Create an optparse.Values object with the default options.
5097 options = optparse.Values(self.get_default_values().__dict__)
5098 # Update it with the options passed by the user.
5099 options._update_careful(actual_options.__dict__)
5100 # Store the options passed by the user in an _actual_options attribute.
5101 # We store only the keys, and not the values, since the values can contain
5102 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005103 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005104
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005105 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005106 logging.basicConfig(
5107 level=levels[min(options.verbose, len(levels) - 1)],
5108 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5109 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005110
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005111 return options, args
5112
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005114def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005115 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005116 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005117 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005118 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005119
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005120 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005121 dispatcher = subcommand.CommandDispatcher(__name__)
5122 try:
5123 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005124 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005125 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005126 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005127 if e.code != 500:
5128 raise
5129 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005130 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005131 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005132 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005133
5134
5135if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005136 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5137 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005138 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005139 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005140 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005141 sys.exit(main(sys.argv[1:]))