blob: 90ebae095fc1d4b96765277a103a29e852c49bbb [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000045import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
thestig@chromium.org44202a22014-03-11 19:22:18 +0000111# Valid extensions for files we want to lint.
112DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
113DEFAULT_LINT_IGNORE_REGEX = r"$^"
114
Aiden Bennerc08566e2018-10-03 17:52:42 +0000115# File name for yapf style config files.
116YAPF_CONFIG_FILENAME = '.style.yapf'
117
Edward Lesmes50da7702020-03-30 19:23:43 +0000118# The issue, patchset and codereview server are stored on git config for each
119# branch under branch.<branch-name>.<config-key>.
120ISSUE_CONFIG_KEY = 'gerritissue'
121PATCHSET_CONFIG_KEY = 'gerritpatchset'
122CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
123
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000124# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000125Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000126
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000127# Initialized in main()
128settings = None
129
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100130# Used by tests/git_cl_test.py to add extra logging.
131# Inside the weirdly failing test, add this:
132# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700133# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134_IS_BEING_TESTED = False
135
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000136
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000137_KNOWN_GERRIT_TO_SHORT_URLS = {
138 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
139 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
140}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000141assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
142 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000143
144
Christopher Lamf732cd52017-01-24 12:40:11 +1100145def DieWithError(message, change_desc=None):
146 if change_desc:
147 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000148 print('\n ** Content of CL description **\n' +
149 '='*72 + '\n' +
150 change_desc.description + '\n' +
151 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100152
vapiera7fbd5a2016-06-16 09:17:49 -0700153 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000154 sys.exit(1)
155
156
Christopher Lamf732cd52017-01-24 12:40:11 +1100157def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000158 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000159 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000160 with open(backup_path, 'w') as backup_file:
161 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100162
163
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000164def GetNoGitPagerEnv():
165 env = os.environ.copy()
166 # 'cat' is a magical git string that disables pagers on all platforms.
167 env['GIT_PAGER'] = 'cat'
168 return env
169
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000170
bsep@chromium.org627d9002016-04-29 00:00:52 +0000171def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000172 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000173 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
174 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000175 except subprocess2.CalledProcessError as e:
176 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000177 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000178 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
179 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
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!
Manh Nguyene3644862020-08-05 18:25:46 +0000905 return RunGit(['log', '--pretty=format:%B%n'] + 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
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001275 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001276 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001277 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1278 args = self._GetCommonPresubmitArgs(verbose, upstream)
1279 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001280 if may_prompt:
1281 args.append('--may_prompt')
1282 if parallel:
1283 args.append('--parallel')
1284 if all_files:
1285 args.append('--all_files')
1286
1287 with gclient_utils.temporary_file() as description_file:
1288 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001289
1290 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001291 args.extend(['--json_output', json_output])
1292 args.extend(['--description_file', description_file])
Saagar Sanghavi531d9922020-08-10 20:14:01 +00001293 args.extend(['--gerrit_project', self._GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001294
1295 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001296 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001297 if resultdb and realm:
1298 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1299 elif resultdb:
1300 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1301 # it is not required to pass the realm flag
1302 print('Note: ResultDB reporting will NOT be performed because --realm'
1303 ' was not specified. To enable ResultDB, please run the command'
1304 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001305
1306 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001307 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001308
Edward Lemur227d5102020-02-25 23:45:35 +00001309 metrics.collector.add_repeated('sub_commands', {
1310 'command': 'presubmit',
1311 'execution_time': time_time() - start,
1312 'exit_code': exit_code,
1313 })
1314
1315 if exit_code:
1316 sys.exit(exit_code)
1317
1318 json_results = gclient_utils.FileRead(json_output)
1319 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001320
Edward Lemur75526302020-02-27 22:31:05 +00001321 def RunPostUploadHook(self, verbose, upstream, description):
1322 args = self._GetCommonPresubmitArgs(verbose, upstream)
1323 args.append('--post_upload')
1324
1325 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001326 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001327 args.extend(['--description_file', description_file])
1328 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1329 p.wait()
1330
Edward Lemur5a644f82020-03-18 16:44:57 +00001331 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1332 # Get description message for upload.
1333 if self.GetIssue():
1334 description = self.FetchDescription()
1335 elif options.message:
1336 description = options.message
1337 else:
1338 description = _create_description_from_log(git_diff_args)
1339 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001340 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001341
1342 # Extract bug number from branch name.
1343 bug = options.bug
1344 fixed = options.fixed
1345 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1346 self.GetBranch())
1347 if not bug and not fixed and match:
1348 if match.group('type') == 'bug':
1349 bug = match.group('bugnum')
1350 else:
1351 fixed = match.group('bugnum')
1352
1353 change_description = ChangeDescription(description, bug, fixed)
1354
1355 # Set the reviewer list now so that presubmit checks can access it.
1356 if options.reviewers or options.tbrs or options.add_owners_to:
1357 change_description.update_reviewers(
1358 options.reviewers, options.tbrs, options.add_owners_to, files,
1359 self.GetAuthor())
1360
1361 return change_description
1362
1363 def _GetTitleForUpload(self, options):
1364 # When not squashing, just return options.title.
1365 if not options.squash:
1366 return options.title
1367
1368 # On first upload, patchset title is always this string, while options.title
1369 # gets converted to first line of message.
1370 if not self.GetIssue():
1371 return 'Initial upload'
1372
1373 # When uploading subsequent patchsets, options.message is taken as the title
1374 # if options.title is not provided.
1375 if options.title:
1376 return options.title
1377 if options.message:
1378 return options.message.strip()
1379
1380 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001381 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001382 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001383 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001384 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1385 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001386
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001387 def CMDUpload(self, options, git_diff_args, orig_args):
1388 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001389 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001390 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001392 else:
1393 if self.GetBranch() is None:
1394 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1395
1396 # Default to diffing against common ancestor of upstream branch
1397 base_branch = self.GetCommonAncestorWithUpstream()
1398 git_diff_args = [base_branch, 'HEAD']
1399
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001400 # Fast best-effort checks to abort before running potentially expensive
1401 # hooks if uploading is likely to fail anyway. Passing these checks does
1402 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001403 self.EnsureAuthenticated(force=options.force)
1404 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001405
1406 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001407 watchlist = watchlists.Watchlists(settings.GetRoot())
1408 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001409 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001410 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001411
Edward Lemur5a644f82020-03-18 16:44:57 +00001412 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001413 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001414 hook_results = self.RunHook(
1415 committing=False,
1416 may_prompt=not options.force,
1417 verbose=options.verbose,
1418 parallel=options.parallel,
1419 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001420 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001421 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001422 resultdb=options.resultdb,
1423 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001424 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001425
Aaron Gable13101a62018-02-09 13:20:41 -08001426 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001427 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001428 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001429 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001430 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001431 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001432 # Run post upload hooks, if specified.
1433 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001434 self.RunPostUploadHook(
1435 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001436
1437 # Upload all dependencies if specified.
1438 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001439 print()
1440 print('--dependencies has been specified.')
1441 print('All dependent local branches will be re-uploaded.')
1442 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001443 # Remove the dependencies flag from args so that we do not end up in a
1444 # loop.
1445 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001446 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001447 return ret
1448
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001449 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001450 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001451
1452 Issue must have been already uploaded and known.
1453 """
1454 assert new_state in _CQState.ALL_STATES
1455 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001456 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001457 vote_map = {
1458 _CQState.NONE: 0,
1459 _CQState.DRY_RUN: 1,
1460 _CQState.COMMIT: 2,
1461 }
1462 labels = {'Commit-Queue': vote_map[new_state]}
1463 notify = False if new_state == _CQState.DRY_RUN else None
1464 gerrit_util.SetReview(
1465 self._GetGerritHost(), self._GerritChangeIdentifier(),
1466 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001467 return 0
1468 except KeyboardInterrupt:
1469 raise
1470 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001471 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001472 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001473 ' * Your project has no CQ,\n'
1474 ' * You don\'t have permission to change the CQ state,\n'
1475 ' * There\'s a bug in this code (see stack trace below).\n'
1476 'Consider specifying which bots to trigger manually or asking your '
1477 'project owners for permissions or contacting Chrome Infra at:\n'
1478 'https://www.chromium.org/infra\n\n' %
1479 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001480 # Still raise exception so that stack trace is printed.
1481 raise
1482
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001483 def _GetGerritHost(self):
1484 # Lazy load of configs.
1485 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001486 if self._gerrit_host and '.' not in self._gerrit_host:
1487 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1488 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001489 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001490 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001491 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001492 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001493 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1494 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001495 return self._gerrit_host
1496
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001497 def _GetGitHost(self):
1498 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001499 remote_url = self.GetRemoteUrl()
1500 if not remote_url:
1501 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001502 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001503
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001504 def GetCodereviewServer(self):
1505 if not self._gerrit_server:
1506 # If we're on a branch then get the server potentially associated
1507 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001508 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001509 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001510 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001511 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001512 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001513 if not self._gerrit_server:
1514 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1515 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001516 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517 parts[0] = parts[0] + '-review'
1518 self._gerrit_host = '.'.join(parts)
1519 self._gerrit_server = 'https://%s' % self._gerrit_host
1520 return self._gerrit_server
1521
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001522 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001523 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001524 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001525 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001526 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001527 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001528 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001529 if project.endswith('.git'):
1530 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001531 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1532 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1533 # gitiles/git-over-https protocol. E.g.,
1534 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1535 # as
1536 # https://chromium.googlesource.com/v8/v8
1537 if project.startswith('a/'):
1538 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001539 return project
1540
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001541 def _GerritChangeIdentifier(self):
1542 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1543
1544 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001545 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001546 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001547 project = self._GetGerritProject()
1548 if project:
1549 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1550 # Fall back on still unique, but less efficient change number.
1551 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001552
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001553 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001554 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001555 if settings.GetGerritSkipEnsureAuthenticated():
1556 # For projects with unusual authentication schemes.
1557 # See http://crbug.com/603378.
1558 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001559
1560 # Check presence of cookies only if using cookies-based auth method.
1561 cookie_auth = gerrit_util.Authenticator.get()
1562 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001563 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001564
Florian Mayerae510e82020-01-30 21:04:48 +00001565 remote_url = self.GetRemoteUrl()
1566 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001567 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001568 return
1569 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001570 logging.warning('Ignoring branch %(branch)s with non-https remote '
1571 '%(remote)s', {
1572 'branch': self.branch,
1573 'remote': self.GetRemoteUrl()
1574 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001575 return
1576
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001577 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001578 self.GetCodereviewServer()
1579 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001580 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001581
1582 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1583 git_auth = cookie_auth.get_auth_header(git_host)
1584 if gerrit_auth and git_auth:
1585 if gerrit_auth == git_auth:
1586 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001587 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001588 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001589 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001590 ' %s\n'
1591 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001592 ' Consider running the following command:\n'
1593 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001594 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001595 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001596 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001597 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598 cookie_auth.get_new_password_message(git_host)))
1599 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001600 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001601 return
1602 else:
1603 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001604 ([] if gerrit_auth else [self._gerrit_host]) +
1605 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001606 DieWithError('Credentials for the following hosts are required:\n'
1607 ' %s\n'
1608 'These are read from %s (or legacy %s)\n'
1609 '%s' % (
1610 '\n '.join(missing),
1611 cookie_auth.get_gitcookies_path(),
1612 cookie_auth.get_netrc_path(),
1613 cookie_auth.get_new_password_message(git_host)))
1614
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001615 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001616 if not self.GetIssue():
1617 return
1618
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001619 status = self._GetChangeDetail()['status']
1620 if status in ('MERGED', 'ABANDONED'):
1621 DieWithError('Change %s has been %s, new uploads are not allowed' %
1622 (self.GetIssueURL(),
1623 'submitted' if status == 'MERGED' else 'abandoned'))
1624
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001625 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1626 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1627 # Apparently this check is not very important? Otherwise get_auth_email
1628 # could have been added to other implementations of Authenticator.
1629 cookies_auth = gerrit_util.Authenticator.get()
1630 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001631 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001632
1633 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001634 if self.GetIssueOwner() == cookies_user:
1635 return
1636 logging.debug('change %s owner is %s, cookies user is %s',
1637 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001638 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001639 # so ask what Gerrit thinks of this user.
1640 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1641 if details['email'] == self.GetIssueOwner():
1642 return
1643 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001644 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001645 'as %s.\n'
1646 'Uploading may fail due to lack of permissions.' %
1647 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1648 confirm_or_exit(action='upload')
1649
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001650 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001651 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001652 or CQ status, assuming adherence to a common workflow.
1653
1654 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001655 * 'error' - error from review tool (including deleted issues)
1656 * 'unsent' - no reviewers added
1657 * 'waiting' - waiting for review
1658 * 'reply' - waiting for uploader to reply to review
1659 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001660 * 'dry-run' - dry-running in the CQ
1661 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001662 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001663 """
1664 if not self.GetIssue():
1665 return None
1666
1667 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001668 data = self._GetChangeDetail([
1669 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001670 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001671 return 'error'
1672
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001673 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001674 return 'closed'
1675
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001676 cq_label = data['labels'].get('Commit-Queue', {})
1677 max_cq_vote = 0
1678 for vote in cq_label.get('all', []):
1679 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1680 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001681 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001682 if max_cq_vote == 1:
1683 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001684
Aaron Gable9ab38c62017-04-06 14:36:33 -07001685 if data['labels'].get('Code-Review', {}).get('approved'):
1686 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001687
1688 if not data.get('reviewers', {}).get('REVIEWER', []):
1689 return 'unsent'
1690
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001691 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001692 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001693 while messages:
1694 m = messages.pop()
1695 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001696 # Ignore replies from CQ.
1697 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001698 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001699 # Most recent message was by owner.
1700 return 'waiting'
1701 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001702 # Some reply from non-owner.
1703 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001704
1705 # Somehow there are no messages even though there are reviewers.
1706 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001707
1708 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001709 if not self.GetIssue():
1710 return None
1711
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001712 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001713 patchset = data['revisions'][data['current_revision']]['_number']
1714 self.SetPatchset(patchset)
1715 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001716
Aaron Gable636b13f2017-07-14 10:42:48 -07001717 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001718 gerrit_util.SetReview(
1719 self._GetGerritHost(), self._GerritChangeIdentifier(),
1720 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001721
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001722 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001723 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001724 # CURRENT_REVISION is included to get the latest patchset so that
1725 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001726 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001727 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1728 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001729 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001730 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001731 robot_file_comments = gerrit_util.GetChangeRobotComments(
1732 self._GetGerritHost(), self._GerritChangeIdentifier())
1733
1734 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001735 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001736 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001737 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001738 line_comments = file_comments.setdefault(path, [])
1739 line_comments.extend(
1740 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001741
1742 # Build dictionary of file comments for easy access and sorting later.
1743 # {author+date: {path: {patchset: {line: url+message}}}}
1744 comments = collections.defaultdict(
1745 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001746 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001747 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001748 tag = comment.get('tag', '')
1749 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001750 continue
1751 key = (comment['author']['email'], comment['updated'])
1752 if comment.get('side', 'REVISION') == 'PARENT':
1753 patchset = 'Base'
1754 else:
1755 patchset = 'PS%d' % comment['patch_set']
1756 line = comment.get('line', 0)
1757 url = ('https://%s/c/%s/%s/%s#%s%s' %
1758 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1759 'b' if comment.get('side') == 'PARENT' else '',
1760 str(line) if line else ''))
1761 comments[key][path][patchset][line] = (url, comment['message'])
1762
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001763 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001764 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001765 summary = self._BuildCommentSummary(msg, comments, readable)
1766 if summary:
1767 summaries.append(summary)
1768 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001769
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001770 @staticmethod
1771 def _BuildCommentSummary(msg, comments, readable):
1772 key = (msg['author']['email'], msg['date'])
1773 # Don't bother showing autogenerated messages that don't have associated
1774 # file or line comments. this will filter out most autogenerated
1775 # messages, but will keep robot comments like those from Tricium.
1776 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1777 if is_autogenerated and not comments.get(key):
1778 return None
1779 message = msg['message']
1780 # Gerrit spits out nanoseconds.
1781 assert len(msg['date'].split('.')[-1]) == 9
1782 date = datetime.datetime.strptime(msg['date'][:-3],
1783 '%Y-%m-%d %H:%M:%S.%f')
1784 if key in comments:
1785 message += '\n'
1786 for path, patchsets in sorted(comments.get(key, {}).items()):
1787 if readable:
1788 message += '\n%s' % path
1789 for patchset, lines in sorted(patchsets.items()):
1790 for line, (url, content) in sorted(lines.items()):
1791 if line:
1792 line_str = 'Line %d' % line
1793 path_str = '%s:%d:' % (path, line)
1794 else:
1795 line_str = 'File comment'
1796 path_str = '%s:0:' % path
1797 if readable:
1798 message += '\n %s, %s: %s' % (patchset, line_str, url)
1799 message += '\n %s\n' % content
1800 else:
1801 message += '\n%s ' % path_str
1802 message += '\n%s\n' % content
1803
1804 return _CommentSummary(
1805 date=date,
1806 message=message,
1807 sender=msg['author']['email'],
1808 autogenerated=is_autogenerated,
1809 # These could be inferred from the text messages and correlated with
1810 # Code-Review label maximum, however this is not reliable.
1811 # Leaving as is until the need arises.
1812 approval=False,
1813 disapproval=False,
1814 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001815
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001817 gerrit_util.AbandonChange(
1818 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001819
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001820 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001821 gerrit_util.SubmitChange(
1822 self._GetGerritHost(), self._GerritChangeIdentifier(),
1823 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001824
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001825 def _GetChangeDetail(self, options=None):
1826 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001827 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001828 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001829
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001830 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001831 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001832 options.append('CURRENT_COMMIT')
1833
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001834 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001835 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001836 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001837
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001838 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1839 # Assumption: data fetched before with extra options is suitable
1840 # for return for a smaller set of options.
1841 # For example, if we cached data for
1842 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1843 # and request is for options=[CURRENT_REVISION],
1844 # THEN we can return prior cached data.
1845 if options_set.issubset(cached_options_set):
1846 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001847
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001848 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001849 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001850 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001851 except gerrit_util.GerritError as e:
1852 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001853 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001854 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001855
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001856 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001857 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001858
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001859 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001860 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001861 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001862 data = gerrit_util.GetChangeCommit(
1863 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001864 except gerrit_util.GerritError as e:
1865 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001866 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001867 raise
agable32978d92016-11-01 12:55:02 -07001868 return data
1869
Karen Qian40c19422019-03-13 21:28:29 +00001870 def _IsCqConfigured(self):
1871 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001872 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001873
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001874 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001875 if git_common.is_dirty_git_tree('land'):
1876 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001877
tandriid60367b2016-06-22 05:25:12 -07001878 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001879 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001880 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001881 'which can test and land changes for you. '
1882 'Are you sure you wish to bypass it?\n',
1883 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001884 differs = True
tandriic4344b52016-08-29 06:04:54 -07001885 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001886 # Note: git diff outputs nothing if there is no diff.
1887 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001888 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001889 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001890 if detail['current_revision'] == last_upload:
1891 differs = False
1892 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001893 print('WARNING: Local branch contents differ from latest uploaded '
1894 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001895 if differs:
1896 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001897 confirm_or_exit(
1898 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1899 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001900 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001901 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001902 upstream = self.GetCommonAncestorWithUpstream()
1903 if self.GetIssue():
1904 description = self.FetchDescription()
1905 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001906 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001907 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001908 committing=True,
1909 may_prompt=not force,
1910 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001911 parallel=parallel,
1912 upstream=upstream,
1913 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001914 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001915 resultdb=resultdb,
1916 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001917
1918 self.SubmitIssue(wait_for_merge=True)
1919 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001920 links = self._GetChangeCommit().get('web_links', [])
1921 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001922 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001923 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001924 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001925 return 0
1926
Edward Lemurf38bc172019-09-03 21:02:13 +00001927 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001928 assert parsed_issue_arg.valid
1929
Edward Lemur125d60a2019-09-13 18:25:41 +00001930 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001931
1932 if parsed_issue_arg.hostname:
1933 self._gerrit_host = parsed_issue_arg.hostname
1934 self._gerrit_server = 'https://%s' % self._gerrit_host
1935
tandriic2405f52016-10-10 08:13:15 -07001936 try:
1937 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001938 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001939 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001940
1941 if not parsed_issue_arg.patchset:
1942 # Use current revision by default.
1943 revision_info = detail['revisions'][detail['current_revision']]
1944 patchset = int(revision_info['_number'])
1945 else:
1946 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001947 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001948 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1949 break
1950 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001951 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001952 (parsed_issue_arg.patchset, self.GetIssue()))
1953
Edward Lemur125d60a2019-09-13 18:25:41 +00001954 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001955 if remote_url.endswith('.git'):
1956 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001957 remote_url = remote_url.rstrip('/')
1958
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001959 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001960 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001961
1962 if remote_url != fetch_info['url']:
1963 DieWithError('Trying to patch a change from %s but this repo appears '
1964 'to be %s.' % (fetch_info['url'], remote_url))
1965
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001966 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001967
Aaron Gable62619a32017-06-16 08:22:09 -07001968 if force:
1969 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1970 print('Checked out commit for change %i patchset %i locally' %
1971 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001972 elif nocommit:
1973 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1974 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001975 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001976 RunGit(['cherry-pick', 'FETCH_HEAD'])
1977 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001978 (parsed_issue_arg.issue, patchset))
1979 print('Note: this created a local commit which does not have '
1980 'the same hash as the one uploaded for review. This will make '
1981 'uploading changes based on top of this branch difficult.\n'
1982 'If you want to do that, use "git cl patch --force" instead.')
1983
Stefan Zagerd08043c2017-10-12 12:07:02 -07001984 if self.GetBranch():
1985 self.SetIssue(parsed_issue_arg.issue)
1986 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001987 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001988 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1989 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1990 else:
1991 print('WARNING: You are in detached HEAD state.\n'
1992 'The patch has been applied to your checkout, but you will not be '
1993 'able to upload a new patch set to the gerrit issue.\n'
1994 'Try using the \'-b\' option if you would like to work on a '
1995 'branch and/or upload a new patch set.')
1996
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 return 0
1998
tandrii16e0b4e2016-06-07 10:34:28 -07001999 def _GerritCommitMsgHookCheck(self, offer_removal):
2000 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2001 if not os.path.exists(hook):
2002 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002003 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2004 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002005 data = gclient_utils.FileRead(hook)
2006 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2007 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002008 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002009 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002010 'and may interfere with it in subtle ways.\n'
2011 'We recommend you remove the commit-msg hook.')
2012 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002013 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002014 gclient_utils.rm_file_or_tree(hook)
2015 print('Gerrit commit-msg hook removed.')
2016 else:
2017 print('OK, will keep Gerrit commit-msg hook in place.')
2018
Edward Lemur1b52d872019-05-09 21:12:12 +00002019 def _CleanUpOldTraces(self):
2020 """Keep only the last |MAX_TRACES| traces."""
2021 try:
2022 traces = sorted([
2023 os.path.join(TRACES_DIR, f)
2024 for f in os.listdir(TRACES_DIR)
2025 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2026 and not f.startswith('tmp'))
2027 ])
2028 traces_to_delete = traces[:-MAX_TRACES]
2029 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002030 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002031 except OSError:
2032 print('WARNING: Failed to remove old git traces from\n'
2033 ' %s'
2034 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002035
Edward Lemur5737f022019-05-17 01:24:00 +00002036 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002037 """Zip and write the git push traces stored in traces_dir."""
2038 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002039 traces_zip = trace_name + '-traces'
2040 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002041 # Create a temporary dir to store git config and gitcookies in. It will be
2042 # compressed and stored next to the traces.
2043 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002044 git_info_zip = trace_name + '-git-info'
2045
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002046 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002047
Edward Lemur1b52d872019-05-09 21:12:12 +00002048 git_push_metadata['trace_name'] = trace_name
2049 gclient_utils.FileWrite(
2050 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2051
2052 # Keep only the first 6 characters of the git hashes on the packet
2053 # trace. This greatly decreases size after compression.
2054 packet_traces = os.path.join(traces_dir, 'trace-packet')
2055 if os.path.isfile(packet_traces):
2056 contents = gclient_utils.FileRead(packet_traces)
2057 gclient_utils.FileWrite(
2058 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2059 shutil.make_archive(traces_zip, 'zip', traces_dir)
2060
2061 # Collect and compress the git config and gitcookies.
2062 git_config = RunGit(['config', '-l'])
2063 gclient_utils.FileWrite(
2064 os.path.join(git_info_dir, 'git-config'),
2065 git_config)
2066
2067 cookie_auth = gerrit_util.Authenticator.get()
2068 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2069 gitcookies_path = cookie_auth.get_gitcookies_path()
2070 if os.path.isfile(gitcookies_path):
2071 gitcookies = gclient_utils.FileRead(gitcookies_path)
2072 gclient_utils.FileWrite(
2073 os.path.join(git_info_dir, 'gitcookies'),
2074 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2075 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2076
Edward Lemur1b52d872019-05-09 21:12:12 +00002077 gclient_utils.rmtree(git_info_dir)
2078
2079 def _RunGitPushWithTraces(
2080 self, change_desc, refspec, refspec_opts, git_push_metadata):
2081 """Run git push and collect the traces resulting from the execution."""
2082 # Create a temporary directory to store traces in. Traces will be compressed
2083 # and stored in a 'traces' dir inside depot_tools.
2084 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002085 trace_name = os.path.join(
2086 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002087
2088 env = os.environ.copy()
2089 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2090 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002091 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002092 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2093 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2094 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2095
2096 try:
2097 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002098 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002099 before_push = time_time()
2100 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002101 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002102 env=env,
2103 print_stdout=True,
2104 # Flush after every line: useful for seeing progress when running as
2105 # recipe.
2106 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002107 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002108 except subprocess2.CalledProcessError as e:
2109 push_returncode = e.returncode
2110 DieWithError('Failed to create a change. Please examine output above '
2111 'for the reason of the failure.\n'
2112 'Hint: run command below to diagnose common Git/Gerrit '
2113 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002114 ' git cl creds-check\n'
2115 '\n'
2116 'If git-cl is not working correctly, file a bug under the '
2117 'Infra>SDK component including the files below.\n'
2118 'Review the files before upload, since they might contain '
2119 'sensitive information.\n'
2120 'Set the Restrict-View-Google label so that they are not '
2121 'publicly accessible.\n'
2122 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002123 change_desc)
2124 finally:
2125 execution_time = time_time() - before_push
2126 metrics.collector.add_repeated('sub_commands', {
2127 'command': 'git push',
2128 'execution_time': execution_time,
2129 'exit_code': push_returncode,
2130 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2131 })
2132
Edward Lemur1b52d872019-05-09 21:12:12 +00002133 git_push_metadata['execution_time'] = execution_time
2134 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002135 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002136
Edward Lemur1b52d872019-05-09 21:12:12 +00002137 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002138 gclient_utils.rmtree(traces_dir)
2139
2140 return push_stdout
2141
Edward Lemura12175c2020-03-09 16:58:26 +00002142 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002143 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002144 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002145 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002146 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002147
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002149 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002150 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002151 # User requested to change description
2152 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002153 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002154 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002155 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002156 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002157 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002158 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002159 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002160 if len(change_ids) == 1:
2161 change_id = change_ids[0]
2162 else:
2163 change_id = GenerateGerritChangeId(change_desc.description)
2164 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002165
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002166 if options.preserve_tryjobs:
2167 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002168
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002169 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002170 parent = self._ComputeParent(
2171 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002172 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002173 with gclient_utils.temporary_file() as desc_tempfile:
2174 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2175 ref_to_push = RunGit(
2176 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002177 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002178 if not git_footers.get_footer_change_id(change_desc.description):
2179 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002180 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002181 self._AddChangeIdToCommitMessage(
2182 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002183 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002184 # For no-squash mode, we assume the remote called "origin" is the one we
2185 # want. It is not worthwhile to support different workflows for
2186 # no-squash mode.
2187 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002188 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2189
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002190 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002191 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2192 ref_to_push)]).splitlines()
2193 if len(commits) > 1:
2194 print('WARNING: This will upload %d commits. Run the following command '
2195 'to see which commits will be uploaded: ' % len(commits))
2196 print('git log %s..%s' % (parent, ref_to_push))
2197 print('You can also use `git squash-branch` to squash these into a '
2198 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002199 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002200
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002201 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002202 cc = []
2203 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2204 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2205 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002206 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002207 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002208 if options.cc:
2209 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002210 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002211 if change_desc.get_cced():
2212 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002213 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2214 valid_accounts = set(reviewers + cc)
2215 # TODO(crbug/877717): relax this for all hosts.
2216 else:
2217 valid_accounts = gerrit_util.ValidAccounts(
2218 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002219 logging.info('accounts %s are recognized, %s invalid',
2220 sorted(valid_accounts),
2221 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002222
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002223 # Extra options that can be specified at push time. Doc:
2224 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002225 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002226
Aaron Gable844cf292017-06-28 11:32:59 -07002227 # By default, new changes are started in WIP mode, and subsequent patchsets
2228 # don't send email. At any time, passing --send-mail will mark the change
2229 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002230 if options.send_mail:
2231 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002232 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002233 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002234 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002235 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002236 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002237
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002238 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002239 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002240
Edward Lemur5a644f82020-03-18 16:44:57 +00002241 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002242 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002243 # Punctuation and whitespace in |title| must be percent-encoded.
2244 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002245
agablec6787972016-09-09 16:13:34 -07002246 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002247 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002248
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002249 for r in sorted(reviewers):
2250 if r in valid_accounts:
2251 refspec_opts.append('r=%s' % r)
2252 reviewers.remove(r)
2253 else:
2254 # TODO(tandrii): this should probably be a hard failure.
2255 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2256 % r)
2257 for c in sorted(cc):
2258 # refspec option will be rejected if cc doesn't correspond to an
2259 # account, even though REST call to add such arbitrary cc may succeed.
2260 if c in valid_accounts:
2261 refspec_opts.append('cc=%s' % c)
2262 cc.remove(c)
2263
rmistry9eadede2016-09-19 11:22:43 -07002264 if options.topic:
2265 # Documentation on Gerrit topics is here:
2266 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002267 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002268
Edward Lemur687ca902018-12-05 02:30:30 +00002269 if options.enable_auto_submit:
2270 refspec_opts.append('l=Auto-Submit+1')
2271 if options.use_commit_queue:
2272 refspec_opts.append('l=Commit-Queue+2')
2273 elif options.cq_dry_run:
2274 refspec_opts.append('l=Commit-Queue+1')
2275
2276 if change_desc.get_reviewers(tbr_only=True):
2277 score = gerrit_util.GetCodeReviewTbrScore(
2278 self._GetGerritHost(),
2279 self._GetGerritProject())
2280 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002281
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002282 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002283 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002284 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002285 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002286 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2287
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002288 refspec_suffix = ''
2289 if refspec_opts:
2290 refspec_suffix = '%' + ','.join(refspec_opts)
2291 assert ' ' not in refspec_suffix, (
2292 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2293 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2294
Edward Lemur1b52d872019-05-09 21:12:12 +00002295 git_push_metadata = {
2296 'gerrit_host': self._GetGerritHost(),
2297 'title': title or '<untitled>',
2298 'change_id': change_id,
2299 'description': change_desc.description,
2300 }
2301 push_stdout = self._RunGitPushWithTraces(
2302 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303
2304 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002305 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002306 change_numbers = [m.group(1)
2307 for m in map(regex.match, push_stdout.splitlines())
2308 if m]
2309 if len(change_numbers) != 1:
2310 DieWithError(
2311 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002312 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002314 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002315
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002316 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002317 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002318 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002319 gerrit_util.AddReviewers(
2320 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002321 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002322 reviewers, cc,
2323 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002324
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 return 0
2326
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002327 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2328 change_desc):
2329 """Computes parent of the generated commit to be uploaded to Gerrit.
2330
2331 Returns revision or a ref name.
2332 """
2333 if custom_cl_base:
2334 # Try to avoid creating additional unintended CLs when uploading, unless
2335 # user wants to take this risk.
2336 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2337 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2338 local_ref_of_target_remote])
2339 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002340 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002341 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2342 'If you proceed with upload, more than 1 CL may be created by '
2343 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2344 'If you are certain that specified base `%s` has already been '
2345 'uploaded to Gerrit as another CL, you may proceed.\n' %
2346 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2347 if not force:
2348 confirm_or_exit(
2349 'Do you take responsibility for cleaning up potential mess '
2350 'resulting from proceeding with upload?',
2351 action='upload')
2352 return custom_cl_base
2353
Aaron Gablef97e33d2017-03-30 15:44:27 -07002354 if remote != '.':
2355 return self.GetCommonAncestorWithUpstream()
2356
2357 # If our upstream branch is local, we base our squashed commit on its
2358 # squashed version.
2359 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2360
Aaron Gablef97e33d2017-03-30 15:44:27 -07002361 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002362 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002363
2364 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002365 # TODO(tandrii): consider checking parent change in Gerrit and using its
2366 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2367 # the tree hash of the parent branch. The upside is less likely bogus
2368 # requests to reupload parent change just because it's uploadhash is
2369 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002370 parent = scm.GIT.GetBranchConfig(
2371 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002372 # Verify that the upstream branch has been uploaded too, otherwise
2373 # Gerrit will create additional CLs when uploading.
2374 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2375 RunGitSilent(['rev-parse', parent + ':'])):
2376 DieWithError(
2377 '\nUpload upstream branch %s first.\n'
2378 'It is likely that this branch has been rebased since its last '
2379 'upload, so you just need to upload it again.\n'
2380 '(If you uploaded it with --no-squash, then branch dependencies '
2381 'are not supported, and you should reupload with --squash.)'
2382 % upstream_branch_name,
2383 change_desc)
2384 return parent
2385
Edward Lemura12175c2020-03-09 16:58:26 +00002386 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002387 """Re-commits using the current message, assumes the commit hook is in
2388 place.
2389 """
Edward Lemura12175c2020-03-09 16:58:26 +00002390 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002391 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002392 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002393 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002394 return new_log_desc
2395 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002396 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002397
tandriie113dfd2016-10-11 10:20:12 -07002398 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002399 try:
2400 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002401 except GerritChangeNotExists:
2402 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002403
2404 if data['status'] in ('ABANDONED', 'MERGED'):
2405 return 'CL %s is closed' % self.GetIssue()
2406
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002407 def GetGerritChange(self, patchset=None):
2408 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002409 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002410 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002411 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002412 data = self._GetChangeDetail(['ALL_REVISIONS'])
2413
2414 assert host and issue and patchset, 'CL must be uploaded first'
2415
2416 has_patchset = any(
2417 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002418 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002419 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002420 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002421 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002422
tandrii8c5a3532016-11-04 07:52:02 -07002423 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002424 'host': host,
2425 'change': issue,
2426 'project': data['project'],
2427 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002428 }
tandriie113dfd2016-10-11 10:20:12 -07002429
tandriide281ae2016-10-12 06:02:30 -07002430 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002431 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002432
Edward Lemur707d70b2018-02-07 00:50:14 +01002433 def GetReviewers(self):
2434 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002435 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002436
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002437
Lei Zhang8a0efc12020-08-05 19:58:45 +00002438def _get_bug_line_values(default_project_prefix, bugs):
2439 """Given default_project_prefix and comma separated list of bugs, yields bug
2440 line values.
tandriif9aefb72016-07-01 09:06:51 -07002441
2442 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002443 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002444 * string, which is left as is.
2445
2446 This function may produce more than one line, because bugdroid expects one
2447 project per line.
2448
Lei Zhang8a0efc12020-08-05 19:58:45 +00002449 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002450 ['v8:123', 'chromium:789']
2451 """
2452 default_bugs = []
2453 others = []
2454 for bug in bugs.split(','):
2455 bug = bug.strip()
2456 if bug:
2457 try:
2458 default_bugs.append(int(bug))
2459 except ValueError:
2460 others.append(bug)
2461
2462 if default_bugs:
2463 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002464 if default_project_prefix:
2465 if not default_project_prefix.endswith(':'):
2466 default_project_prefix += ':'
2467 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002468 else:
2469 yield default_bugs
2470 for other in sorted(others):
2471 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2472 yield other
2473
2474
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002475class ChangeDescription(object):
2476 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002477 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002478 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002479 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002480 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002481 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002482 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2483 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002484 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002485 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002486
Dan Beamd8b04ca2019-10-10 21:23:26 +00002487 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002488 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002489 if bug:
2490 regexp = re.compile(self.BUG_LINE)
2491 prefix = settings.GetBugPrefix()
2492 if not any((regexp.match(line) for line in self._description_lines)):
2493 values = list(_get_bug_line_values(prefix, bug))
2494 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002495 if fixed:
2496 regexp = re.compile(self.FIXED_LINE)
2497 prefix = settings.GetBugPrefix()
2498 if not any((regexp.match(line) for line in self._description_lines)):
2499 values = list(_get_bug_line_values(prefix, fixed))
2500 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002501
agable@chromium.org42c20792013-09-12 17:34:49 +00002502 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002503 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002504 return '\n'.join(self._description_lines)
2505
2506 def set_description(self, desc):
2507 if isinstance(desc, basestring):
2508 lines = desc.splitlines()
2509 else:
2510 lines = [line.rstrip() for line in desc]
2511 while lines and not lines[0]:
2512 lines.pop(0)
2513 while lines and not lines[-1]:
2514 lines.pop(-1)
2515 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002516
Edward Lemur5a644f82020-03-18 16:44:57 +00002517 def ensure_change_id(self, change_id):
2518 description = self.description
2519 footer_change_ids = git_footers.get_footer_change_id(description)
2520 # Make sure that the Change-Id in the description matches the given one.
2521 if footer_change_ids != [change_id]:
2522 if footer_change_ids:
2523 # Remove any existing Change-Id footers since they don't match the
2524 # expected change_id footer.
2525 description = git_footers.remove_footer(description, 'Change-Id')
2526 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2527 'if you want to set a new one.')
2528 # Add the expected Change-Id footer.
2529 description = git_footers.add_footer_change_id(description, change_id)
2530 self.set_description(description)
2531
Edward Lemur2c62b332020-03-12 22:12:33 +00002532 def update_reviewers(
2533 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002534 """Rewrites the R=/TBR= line(s) as a single line each.
2535
2536 Args:
2537 reviewers (list(str)) - list of additional emails to use for reviewers.
2538 tbrs (list(str)) - list of additional emails to use for TBRs.
2539 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2540 the change that are missing OWNER coverage. If this is not None, you
2541 must also pass a value for `change`.
2542 change (Change) - The Change that should be used for OWNERS lookups.
2543 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002544 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002545 assert isinstance(tbrs, list), tbrs
2546
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002547 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002548 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002549
2550 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002551 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002552
2553 reviewers = set(reviewers)
2554 tbrs = set(tbrs)
2555 LOOKUP = {
2556 'TBR': tbrs,
2557 'R': reviewers,
2558 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002559
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002560 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002561 regexp = re.compile(self.R_LINE)
2562 matches = [regexp.match(line) for line in self._description_lines]
2563 new_desc = [l for i, l in enumerate(self._description_lines)
2564 if not matches[i]]
2565 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002566
agable@chromium.org42c20792013-09-12 17:34:49 +00002567 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002568
2569 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002570 for match in matches:
2571 if not match:
2572 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002573 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2574
2575 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002576 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002577 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002578 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002579 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002580 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002581 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002582 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002583
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002584 # If any folks ended up in both groups, remove them from tbrs.
2585 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002586
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002587 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2588 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002589
2590 # Put the new lines in the description where the old first R= line was.
2591 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2592 if 0 <= line_loc < len(self._description_lines):
2593 if new_tbr_line:
2594 self._description_lines.insert(line_loc, new_tbr_line)
2595 if new_r_line:
2596 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002597 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002598 if new_r_line:
2599 self.append_footer(new_r_line)
2600 if new_tbr_line:
2601 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002602
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002603 def set_preserve_tryjobs(self):
2604 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2605 footers = git_footers.parse_footers(self.description)
2606 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2607 if v.lower() == 'true':
2608 return
2609 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2610
Anthony Polito8b955342019-09-24 19:01:36 +00002611 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002612 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002613 self.set_description([
2614 '# Enter a description of the change.',
2615 '# This will be displayed on the codereview site.',
2616 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002617 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002618 '--------------------',
2619 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002620 bug_regexp = re.compile(self.BUG_LINE)
2621 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002622 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002623 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2624 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002625 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002626
agable@chromium.org42c20792013-09-12 17:34:49 +00002627 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002628 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002629 if not content:
2630 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002631 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002632
Bruce Dawson2377b012018-01-11 16:46:49 -08002633 # Strip off comments and default inserted "Bug:" line.
2634 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002635 (line.startswith('#') or
2636 line.rstrip() == "Bug:" or
2637 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002638 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002639 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002640 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002641
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002642 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002643 """Adds a footer line to the description.
2644
2645 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2646 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2647 that Gerrit footers are always at the end.
2648 """
2649 parsed_footer_line = git_footers.parse_footer(line)
2650 if parsed_footer_line:
2651 # Line is a gerrit footer in the form: Footer-Key: any value.
2652 # Thus, must be appended observing Gerrit footer rules.
2653 self.set_description(
2654 git_footers.add_footer(self.description,
2655 key=parsed_footer_line[0],
2656 value=parsed_footer_line[1]))
2657 return
2658
2659 if not self._description_lines:
2660 self._description_lines.append(line)
2661 return
2662
2663 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2664 if gerrit_footers:
2665 # git_footers.split_footers ensures that there is an empty line before
2666 # actual (gerrit) footers, if any. We have to keep it that way.
2667 assert top_lines and top_lines[-1] == ''
2668 top_lines, separator = top_lines[:-1], top_lines[-1:]
2669 else:
2670 separator = [] # No need for separator if there are no gerrit_footers.
2671
2672 prev_line = top_lines[-1] if top_lines else ''
2673 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2674 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2675 top_lines.append('')
2676 top_lines.append(line)
2677 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002678
tandrii99a72f22016-08-17 14:33:24 -07002679 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002680 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002681 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002682 reviewers = [match.group(2).strip()
2683 for match in matches
2684 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002685 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002686
bradnelsond975b302016-10-23 12:20:23 -07002687 def get_cced(self):
2688 """Retrieves the list of reviewers."""
2689 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2690 cced = [match.group(2).strip() for match in matches if match]
2691 return cleanup_list(cced)
2692
Nodir Turakulov23b82142017-11-16 11:04:25 -08002693 def get_hash_tags(self):
2694 """Extracts and sanitizes a list of Gerrit hashtags."""
2695 subject = (self._description_lines or ('',))[0]
2696 subject = re.sub(
2697 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2698
2699 tags = []
2700 start = 0
2701 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2702 while True:
2703 m = bracket_exp.match(subject, start)
2704 if not m:
2705 break
2706 tags.append(self.sanitize_hash_tag(m.group(1)))
2707 start = m.end()
2708
2709 if not tags:
2710 # Try "Tag: " prefix.
2711 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2712 if m:
2713 tags.append(self.sanitize_hash_tag(m.group(1)))
2714 return tags
2715
2716 @classmethod
2717 def sanitize_hash_tag(cls, tag):
2718 """Returns a sanitized Gerrit hash tag.
2719
2720 A sanitized hashtag can be used as a git push refspec parameter value.
2721 """
2722 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2723
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002724
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002725def FindCodereviewSettingsFile(filename='codereview.settings'):
2726 """Finds the given file starting in the cwd and going up.
2727
2728 Only looks up to the top of the repository unless an
2729 'inherit-review-settings-ok' file exists in the root of the repository.
2730 """
2731 inherit_ok_file = 'inherit-review-settings-ok'
2732 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002733 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002734 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2735 root = '/'
2736 while True:
2737 if filename in os.listdir(cwd):
2738 if os.path.isfile(os.path.join(cwd, filename)):
2739 return open(os.path.join(cwd, filename))
2740 if cwd == root:
2741 break
2742 cwd = os.path.dirname(cwd)
2743
2744
2745def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002746 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002747 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002748
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002749 def SetProperty(name, setting, unset_error_ok=False):
2750 fullname = 'rietveld.' + name
2751 if setting in keyvals:
2752 RunGit(['config', fullname, keyvals[setting]])
2753 else:
2754 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2755
tandrii48df5812016-10-17 03:55:37 -07002756 if not keyvals.get('GERRIT_HOST', False):
2757 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002758 # Only server setting is required. Other settings can be absent.
2759 # In that case, we ignore errors raised during option deletion attempt.
2760 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2761 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2762 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002763 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002764 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2765 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002766 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2767 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002768 SetProperty(
2769 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002770
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002771 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002772 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002773
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002774 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002775 RunGit(['config', 'gerrit.squash-uploads',
2776 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002777
tandrii@chromium.org28253532016-04-14 13:46:56 +00002778 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002779 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002780 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2781
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002782 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002783 # should be of the form
2784 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2785 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002786 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2787 keyvals['ORIGIN_URL_CONFIG']])
2788
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002789
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002790def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002791 """Downloads a network object to a local file, like urllib.urlretrieve.
2792
2793 This is necessary because urllib is broken for SSL connections via a proxy.
2794 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002795 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002796 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002797
2798
ukai@chromium.org712d6102013-11-27 00:52:58 +00002799def hasSheBang(fname):
2800 """Checks fname is a #! script."""
2801 with open(fname) as f:
2802 return f.read(2).startswith('#!')
2803
2804
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002805def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002806 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002807
2808 Args:
2809 force: True to update hooks. False to install hooks if not present.
2810 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002811 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002812 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2813 if not os.access(dst, os.X_OK):
2814 if os.path.exists(dst):
2815 if not force:
2816 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002817 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002818 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002819 if not hasSheBang(dst):
2820 DieWithError('Not a script: %s\n'
2821 'You need to download from\n%s\n'
2822 'into .git/hooks/commit-msg and '
2823 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002824 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2825 except Exception:
2826 if os.path.exists(dst):
2827 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002828 DieWithError('\nFailed to download hooks.\n'
2829 'You need to download from\n%s\n'
2830 'into .git/hooks/commit-msg and '
2831 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002832
2833
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002834class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002835 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002836
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002837 _GOOGLESOURCE = 'googlesource.com'
2838
2839 def __init__(self):
2840 # Cached list of [host, identity, source], where source is either
2841 # .gitcookies or .netrc.
2842 self._all_hosts = None
2843
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002844 def ensure_configured_gitcookies(self):
2845 """Runs checks and suggests fixes to make git use .gitcookies from default
2846 path."""
2847 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2848 configured_path = RunGitSilent(
2849 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002850 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002851 if configured_path:
2852 self._ensure_default_gitcookies_path(configured_path, default)
2853 else:
2854 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002855
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002856 @staticmethod
2857 def _ensure_default_gitcookies_path(configured_path, default_path):
2858 assert configured_path
2859 if configured_path == default_path:
2860 print('git is already configured to use your .gitcookies from %s' %
2861 configured_path)
2862 return
2863
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002864 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002865 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2866 (configured_path, default_path))
2867
2868 if not os.path.exists(configured_path):
2869 print('However, your configured .gitcookies file is missing.')
2870 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2871 action='reconfigure')
2872 RunGit(['config', '--global', 'http.cookiefile', default_path])
2873 return
2874
2875 if os.path.exists(default_path):
2876 print('WARNING: default .gitcookies file already exists %s' %
2877 default_path)
2878 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2879 default_path)
2880
2881 confirm_or_exit('Move existing .gitcookies to default location?',
2882 action='move')
2883 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002884 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002885 print('Moved and reconfigured git to use .gitcookies from %s' %
2886 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002887
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002888 @staticmethod
2889 def _configure_gitcookies_path(default_path):
2890 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2891 if os.path.exists(netrc_path):
2892 print('You seem to be using outdated .netrc for git credentials: %s' %
2893 netrc_path)
2894 print('This tool will guide you through setting up recommended '
2895 '.gitcookies store for git credentials.\n'
2896 '\n'
2897 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2898 ' git config --global --unset http.cookiefile\n'
2899 ' mv %s %s.backup\n\n' % (default_path, default_path))
2900 confirm_or_exit(action='setup .gitcookies')
2901 RunGit(['config', '--global', 'http.cookiefile', default_path])
2902 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002903
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002904 def get_hosts_with_creds(self, include_netrc=False):
2905 if self._all_hosts is None:
2906 a = gerrit_util.CookiesAuthenticator()
2907 self._all_hosts = [
2908 (h, u, s)
2909 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002910 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2911 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002912 )
2913 if h.endswith(self._GOOGLESOURCE)
2914 ]
2915
2916 if include_netrc:
2917 return self._all_hosts
2918 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2919
2920 def print_current_creds(self, include_netrc=False):
2921 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2922 if not hosts:
2923 print('No Git/Gerrit credentials found')
2924 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002925 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002926 header = [('Host', 'User', 'Which file'),
2927 ['=' * l for l in lengths]]
2928 for row in (header + hosts):
2929 print('\t'.join((('%%+%ds' % l) % s)
2930 for l, s in zip(lengths, row)))
2931
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002932 @staticmethod
2933 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002934 """Parses identity "git-<username>.domain" into <username> and domain."""
2935 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002936 # distinguishable from sub-domains. But we do know typical domains:
2937 if identity.endswith('.chromium.org'):
2938 domain = 'chromium.org'
2939 username = identity[:-len('.chromium.org')]
2940 else:
2941 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002942 if username.startswith('git-'):
2943 username = username[len('git-'):]
2944 return username, domain
2945
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002946 def _canonical_git_googlesource_host(self, host):
2947 """Normalizes Gerrit hosts (with '-review') to Git host."""
2948 assert host.endswith(self._GOOGLESOURCE)
2949 # Prefix doesn't include '.' at the end.
2950 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2951 if prefix.endswith('-review'):
2952 prefix = prefix[:-len('-review')]
2953 return prefix + '.' + self._GOOGLESOURCE
2954
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002955 def _canonical_gerrit_googlesource_host(self, host):
2956 git_host = self._canonical_git_googlesource_host(host)
2957 prefix = git_host.split('.', 1)[0]
2958 return prefix + '-review.' + self._GOOGLESOURCE
2959
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002960 def _get_counterpart_host(self, host):
2961 assert host.endswith(self._GOOGLESOURCE)
2962 git = self._canonical_git_googlesource_host(host)
2963 gerrit = self._canonical_gerrit_googlesource_host(git)
2964 return git if gerrit == host else gerrit
2965
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002966 def has_generic_host(self):
2967 """Returns whether generic .googlesource.com has been configured.
2968
2969 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2970 """
2971 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2972 if host == '.' + self._GOOGLESOURCE:
2973 return True
2974 return False
2975
2976 def _get_git_gerrit_identity_pairs(self):
2977 """Returns map from canonic host to pair of identities (Git, Gerrit).
2978
2979 One of identities might be None, meaning not configured.
2980 """
2981 host_to_identity_pairs = {}
2982 for host, identity, _ in self.get_hosts_with_creds():
2983 canonical = self._canonical_git_googlesource_host(host)
2984 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2985 idx = 0 if canonical == host else 1
2986 pair[idx] = identity
2987 return host_to_identity_pairs
2988
2989 def get_partially_configured_hosts(self):
2990 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002991 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002992 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002993 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002994
2995 def get_conflicting_hosts(self):
2996 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002997 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002998 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002999 if None not in (i1, i2) and i1 != i2)
3000
3001 def get_duplicated_hosts(self):
3002 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003003 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003004
3005 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3006 'chromium.googlesource.com': 'chromium.org',
3007 'chrome-internal.googlesource.com': 'google.com',
3008 }
3009
3010 def get_hosts_with_wrong_identities(self):
3011 """Finds hosts which **likely** reference wrong identities.
3012
3013 Note: skips hosts which have conflicting identities for Git and Gerrit.
3014 """
3015 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003016 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003017 pair = self._get_git_gerrit_identity_pairs().get(host)
3018 if pair and pair[0] == pair[1]:
3019 _, domain = self._parse_identity(pair[0])
3020 if domain != expected:
3021 hosts.add(host)
3022 return hosts
3023
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003024 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003025 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003026 hosts = sorted(hosts)
3027 assert hosts
3028 if extra_column_func is None:
3029 extras = [''] * len(hosts)
3030 else:
3031 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003032 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3033 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003034 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003035 lines.append(tmpl % he)
3036 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003037
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003038 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003039 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003040 yield ('.googlesource.com wildcard record detected',
3041 ['Chrome Infrastructure team recommends to list full host names '
3042 'explicitly.'],
3043 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003044
3045 dups = self.get_duplicated_hosts()
3046 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003047 yield ('The following hosts were defined twice',
3048 self._format_hosts(dups),
3049 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003050
3051 partial = self.get_partially_configured_hosts()
3052 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003053 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3054 'These hosts are missing',
3055 self._format_hosts(partial, lambda host: 'but %s defined' %
3056 self._get_counterpart_host(host)),
3057 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003058
3059 conflicting = self.get_conflicting_hosts()
3060 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003061 yield ('The following Git hosts have differing credentials from their '
3062 'Gerrit counterparts',
3063 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3064 tuple(self._get_git_gerrit_identity_pairs()[host])),
3065 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003066
3067 wrong = self.get_hosts_with_wrong_identities()
3068 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003069 yield ('These hosts likely use wrong identity',
3070 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3071 (self._get_git_gerrit_identity_pairs()[host][0],
3072 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3073 wrong)
3074
3075 def find_and_report_problems(self):
3076 """Returns True if there was at least one problem, else False."""
3077 found = False
3078 bad_hosts = set()
3079 for title, sublines, hosts in self._find_problems():
3080 if not found:
3081 found = True
3082 print('\n\n.gitcookies problem report:\n')
3083 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003084 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003085 if sublines:
3086 print()
3087 print(' %s' % '\n '.join(sublines))
3088 print()
3089
3090 if bad_hosts:
3091 assert found
3092 print(' You can manually remove corresponding lines in your %s file and '
3093 'visit the following URLs with correct account to generate '
3094 'correct credential lines:\n' %
3095 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3096 print(' %s' % '\n '.join(sorted(set(
3097 gerrit_util.CookiesAuthenticator().get_new_password_url(
3098 self._canonical_git_googlesource_host(host))
3099 for host in bad_hosts
3100 ))))
3101 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003102
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003103
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003104@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003105def CMDcreds_check(parser, args):
3106 """Checks credentials and suggests changes."""
3107 _, _ = parser.parse_args(args)
3108
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003109 # Code below checks .gitcookies. Abort if using something else.
3110 authn = gerrit_util.Authenticator.get()
3111 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003112 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003113 'This command is not designed for bot environment. It checks '
3114 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003115 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3116 if isinstance(authn, gerrit_util.GceAuthenticator):
3117 message += (
3118 '\n'
3119 'If you need to run this on GCE or a cloudtop instance, '
3120 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3121 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003122
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003123 checker = _GitCookiesChecker()
3124 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003125
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003126 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003127 checker.print_current_creds(include_netrc=True)
3128
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003129 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003130 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003131 return 0
3132 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003133
3134
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003135@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003136def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003137 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003138 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003139 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003140 _, args = parser.parse_args(args)
3141 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003142 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003143 return RunGit(['config', 'branch.%s.base-url' % branch],
3144 error_ok=False).strip()
3145 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003146 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003147 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3148 error_ok=False).strip()
3149
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003150
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003151def color_for_status(status):
3152 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003153 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003154 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003155 'unsent': BOLD + Fore.YELLOW,
3156 'waiting': BOLD + Fore.RED,
3157 'reply': BOLD + Fore.YELLOW,
3158 'not lgtm': BOLD + Fore.RED,
3159 'lgtm': BOLD + Fore.GREEN,
3160 'commit': BOLD + Fore.MAGENTA,
3161 'closed': BOLD + Fore.CYAN,
3162 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003163 }.get(status, Fore.WHITE)
3164
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003165
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003166def get_cl_statuses(changes, fine_grained, max_processes=None):
3167 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003168
3169 If fine_grained is true, this will fetch CL statuses from the server.
3170 Otherwise, simply indicate if there's a matching url for the given branches.
3171
3172 If max_processes is specified, it is used as the maximum number of processes
3173 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3174 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003175
3176 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003177 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003178 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003179 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003180
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003181 if not fine_grained:
3182 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003183 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003184 for cl in changes:
3185 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003186 return
3187
3188 # First, sort out authentication issues.
3189 logging.debug('ensuring credentials exist')
3190 for cl in changes:
3191 cl.EnsureAuthenticated(force=False, refresh=True)
3192
3193 def fetch(cl):
3194 try:
3195 return (cl, cl.GetStatus())
3196 except:
3197 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003198 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003199 raise
3200
3201 threads_count = len(changes)
3202 if max_processes:
3203 threads_count = max(1, min(threads_count, max_processes))
3204 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3205
Edward Lemur61bf4172020-02-24 23:22:37 +00003206 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003207 fetched_cls = set()
3208 try:
3209 it = pool.imap_unordered(fetch, changes).__iter__()
3210 while True:
3211 try:
3212 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003213 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003214 break
3215 fetched_cls.add(cl)
3216 yield cl, status
3217 finally:
3218 pool.close()
3219
3220 # Add any branches that failed to fetch.
3221 for cl in set(changes) - fetched_cls:
3222 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003223
rmistry@google.com2dd99862015-06-22 12:22:18 +00003224
Jose Lopes3863fc52020-04-07 17:00:25 +00003225def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003226 """Uploads CLs of local branches that are dependents of the current branch.
3227
3228 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003229
3230 test1 -> test2.1 -> test3.1
3231 -> test3.2
3232 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003233
3234 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3235 run on the dependent branches in this order:
3236 test2.1, test3.1, test3.2, test2.2, test3.3
3237
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003238 Note: This function does not rebase your local dependent branches. Use it
3239 when you make a change to the parent branch that will not conflict
3240 with its dependent branches, and you would like their dependencies
3241 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003242 """
3243 if git_common.is_dirty_git_tree('upload-branch-deps'):
3244 return 1
3245
3246 root_branch = cl.GetBranch()
3247 if root_branch is None:
3248 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3249 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003250 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003251 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3252 'patchset dependencies without an uploaded CL.')
3253
3254 branches = RunGit(['for-each-ref',
3255 '--format=%(refname:short) %(upstream:short)',
3256 'refs/heads'])
3257 if not branches:
3258 print('No local branches found.')
3259 return 0
3260
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003261 # Create a dictionary of all local branches to the branches that are
3262 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003263 tracked_to_dependents = collections.defaultdict(list)
3264 for b in branches.splitlines():
3265 tokens = b.split()
3266 if len(tokens) == 2:
3267 branch_name, tracked = tokens
3268 tracked_to_dependents[tracked].append(branch_name)
3269
vapiera7fbd5a2016-06-16 09:17:49 -07003270 print()
3271 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003272 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003273
rmistry@google.com2dd99862015-06-22 12:22:18 +00003274 def traverse_dependents_preorder(branch, padding=''):
3275 dependents_to_process = tracked_to_dependents.get(branch, [])
3276 padding += ' '
3277 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003278 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003279 dependents.append(dependent)
3280 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003281
rmistry@google.com2dd99862015-06-22 12:22:18 +00003282 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003283 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003284
3285 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003286 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003287 return 0
3288
Jose Lopes3863fc52020-04-07 17:00:25 +00003289 if not force:
3290 confirm_or_exit('This command will checkout all dependent branches and run '
3291 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003292
rmistry@google.com2dd99862015-06-22 12:22:18 +00003293 # Record all dependents that failed to upload.
3294 failures = {}
3295 # Go through all dependents, checkout the branch and upload.
3296 try:
3297 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003298 print()
3299 print('--------------------------------------')
3300 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003301 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003302 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003303 try:
3304 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003305 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003306 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003307 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003308 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003309 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003310 finally:
3311 # Swap back to the original root branch.
3312 RunGit(['checkout', '-q', root_branch])
3313
vapiera7fbd5a2016-06-16 09:17:49 -07003314 print()
3315 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003316 for dependent_branch in dependents:
3317 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003318 print(' %s : %s' % (dependent_branch, upload_status))
3319 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003320
3321 return 0
3322
3323
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003324def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003325 """Given a proposed tag name, returns a tag name that is guaranteed to be
3326 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3327 or 'foo-3', and so on."""
3328
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003329 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003330 for suffix_num in itertools.count(1):
3331 if suffix_num == 1:
3332 to_check = proposed_tag
3333 else:
3334 to_check = '%s-%d' % (proposed_tag, suffix_num)
3335
3336 if to_check not in existing_tags:
3337 return to_check
3338
3339
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003340@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003341def CMDarchive(parser, args):
3342 """Archives and deletes branches associated with closed changelists."""
3343 parser.add_option(
3344 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003345 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003346 parser.add_option(
3347 '-f', '--force', action='store_true',
3348 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003349 parser.add_option(
3350 '-d', '--dry-run', action='store_true',
3351 help='Skip the branch tagging and removal steps.')
3352 parser.add_option(
3353 '-t', '--notags', action='store_true',
3354 help='Do not tag archived branches. '
3355 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003356 parser.add_option(
3357 '-p',
3358 '--pattern',
3359 default='git-cl-archived-{issue}-{branch}',
3360 help='Format string for archive tags. '
3361 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003362
kmarshall3bff56b2016-06-06 18:31:47 -07003363 options, args = parser.parse_args(args)
3364 if args:
3365 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003366
3367 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3368 if not branches:
3369 return 0
3370
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003371 tags = RunGit(['for-each-ref', '--format=%(refname)',
3372 'refs/tags']).splitlines() or []
3373 tags = [t.split('/')[-1] for t in tags]
3374
vapiera7fbd5a2016-06-16 09:17:49 -07003375 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003376 changes = [Changelist(branchref=b)
3377 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003378 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3379 statuses = get_cl_statuses(changes,
3380 fine_grained=True,
3381 max_processes=options.maxjobs)
3382 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003383 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3384 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003385 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003386 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003387 proposal.sort()
3388
3389 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003390 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003391 return 0
3392
Edward Lemur85153282020-02-14 22:06:29 +00003393 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003394
vapiera7fbd5a2016-06-16 09:17:49 -07003395 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003396 if options.notags:
3397 for next_item in proposal:
3398 print(' ' + next_item[0])
3399 else:
3400 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3401 for next_item in proposal:
3402 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003403
kmarshall9249e012016-08-23 12:02:16 -07003404 # Quit now on precondition failure or if instructed by the user, either
3405 # via an interactive prompt or by command line flags.
3406 if options.dry_run:
3407 print('\nNo changes were made (dry run).\n')
3408 return 0
3409 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003410 print('You are currently on a branch \'%s\' which is associated with a '
3411 'closed codereview issue, so archive cannot proceed. Please '
3412 'checkout another branch and run this command again.' %
3413 current_branch)
3414 return 1
kmarshall9249e012016-08-23 12:02:16 -07003415 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003416 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003417 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003418 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003419 return 1
3420
3421 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003422 if not options.notags:
3423 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003424
3425 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3426 # Clean up the tag if we failed to delete the branch.
3427 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003428
vapiera7fbd5a2016-06-16 09:17:49 -07003429 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003430
3431 return 0
3432
3433
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003434@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003436 """Show status of changelists.
3437
3438 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003439 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003440 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003441 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003442 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003443 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003444 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003445 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003446
3447 Also see 'git cl comments'.
3448 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003449 parser.add_option(
3450 '--no-branch-color',
3451 action='store_true',
3452 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003453 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003454 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003455 parser.add_option('-f', '--fast', action='store_true',
3456 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003457 parser.add_option(
3458 '-j', '--maxjobs', action='store', type=int,
3459 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003460 parser.add_option(
3461 '-i', '--issue', type=int,
3462 help='Operate on this issue instead of the current branch\'s implicit '
3463 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003464 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003465 if args:
3466 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003467
iannuccie53c9352016-08-17 14:40:40 -07003468 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003469 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003470
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003471 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003472 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003473 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003474 if cl.GetIssue():
3475 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003476 elif options.field == 'id':
3477 issueid = cl.GetIssue()
3478 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003479 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003480 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003481 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003482 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003483 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003484 elif options.field == 'status':
3485 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003486 elif options.field == 'url':
3487 url = cl.GetIssueURL()
3488 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003489 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003490 return 0
3491
3492 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3493 if not branches:
3494 print('No local branch found.')
3495 return 0
3496
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003497 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003498 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003499 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003500 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003501 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003502 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003503 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003504
Edward Lemur85153282020-02-14 22:06:29 +00003505 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003506
3507 def FormatBranchName(branch, colorize=False):
3508 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3509 an asterisk when it is the current branch."""
3510
3511 asterisk = ""
3512 color = Fore.RESET
3513 if branch == current_branch:
3514 asterisk = "* "
3515 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003516 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003517
3518 if colorize:
3519 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003520 return asterisk + branch_name
3521
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003522 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003523
3524 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003525 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3526 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003527 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003528 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003529 branch_statuses[c.GetBranch()] = status
3530 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003531 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003532 if url and (not status or status == 'error'):
3533 # The issue probably doesn't exist anymore.
3534 url += ' (broken)'
3535
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003536 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003537 # Turn off bold as well as colors.
3538 END = '\033[0m'
3539 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003540 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003541 color = ''
3542 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003543 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003544
Alan Cuttera3be9a52019-03-04 18:50:33 +00003545 branch_display = FormatBranchName(branch)
3546 padding = ' ' * (alignment - len(branch_display))
3547 if not options.no_branch_color:
3548 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003549
Alan Cuttera3be9a52019-03-04 18:50:33 +00003550 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3551 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003552
vapiera7fbd5a2016-06-16 09:17:49 -07003553 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003554 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003555 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003556 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003557 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003558 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003560 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003561 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003562 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003563 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003564 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003565 return 0
3566
3567
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003568def colorize_CMDstatus_doc():
3569 """To be called once in main() to add colors to git cl status help."""
3570 colors = [i for i in dir(Fore) if i[0].isupper()]
3571
3572 def colorize_line(line):
3573 for color in colors:
3574 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003575 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003576 indent = len(line) - len(line.lstrip(' ')) + 1
3577 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3578 return line
3579
3580 lines = CMDstatus.__doc__.splitlines()
3581 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3582
3583
phajdan.jre328cf92016-08-22 04:12:17 -07003584def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003585 if path == '-':
3586 json.dump(contents, sys.stdout)
3587 else:
3588 with open(path, 'w') as f:
3589 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003590
3591
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003592@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003593@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003594def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003595 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003596
3597 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003598 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003599 parser.add_option('-r', '--reverse', action='store_true',
3600 help='Lookup the branch(es) for the specified issues. If '
3601 'no issues are specified, all branches with mapped '
3602 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003603 parser.add_option('--json',
3604 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003605 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003606
dnj@chromium.org406c4402015-03-03 17:22:28 +00003607 if options.reverse:
3608 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003609 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003610 # Reverse issue lookup.
3611 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003612
3613 git_config = {}
3614 for config in RunGit(['config', '--get-regexp',
3615 r'branch\..*issue']).splitlines():
3616 name, _space, val = config.partition(' ')
3617 git_config[name] = val
3618
dnj@chromium.org406c4402015-03-03 17:22:28 +00003619 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003620 issue = git_config.get(
3621 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003622 if issue:
3623 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003624 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003625 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003626 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003627 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003628 try:
3629 issue_num = int(issue)
3630 except ValueError:
3631 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003632 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003633 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003634 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003635 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003636 if options.json:
3637 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003638 return 0
3639
3640 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003641 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003642 if not issue.valid:
3643 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3644 'or no argument to list it.\n'
3645 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003646 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003647 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003648 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003649 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003650 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3651 if options.json:
3652 write_json(options.json, {
3653 'issue': cl.GetIssue(),
3654 'issue_url': cl.GetIssueURL(),
3655 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003656 return 0
3657
3658
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003659@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003660def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003661 """Shows or posts review comments for any changelist."""
3662 parser.add_option('-a', '--add-comment', dest='comment',
3663 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003664 parser.add_option('-p', '--publish', action='store_true',
3665 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003666 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003667 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003668 parser.add_option('-m', '--machine-readable', dest='readable',
3669 action='store_false', default=True,
3670 help='output comments in a format compatible with '
3671 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003672 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003673 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003674 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003675
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003676 issue = None
3677 if options.issue:
3678 try:
3679 issue = int(options.issue)
3680 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003681 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003682
Edward Lemur934836a2019-09-09 20:16:54 +00003683 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003684
3685 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003686 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003687 return 0
3688
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003689 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3690 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003691 for comment in summary:
3692 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003693 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003694 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003695 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003696 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003697 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003698 elif comment.autogenerated:
3699 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003700 else:
3701 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003702 print('\n%s%s %s%s\n%s' % (
3703 color,
3704 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3705 comment.sender,
3706 Fore.RESET,
3707 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3708
smut@google.comc85ac942015-09-15 16:34:43 +00003709 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003710 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003711 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003712 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3713 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003714 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003715 return 0
3716
3717
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003718@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003719@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003720def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003721 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003722 parser.add_option('-d', '--display', action='store_true',
3723 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003724 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003725 help='New description to set for this issue (- for stdin, '
3726 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003727 parser.add_option('-f', '--force', action='store_true',
3728 help='Delete any unpublished Gerrit edits for this issue '
3729 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003730
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003731 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003732
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003733 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003734 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003735 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003736 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003737 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003738
Edward Lemur934836a2019-09-09 20:16:54 +00003739 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003740 if target_issue_arg:
3741 kwargs['issue'] = target_issue_arg.issue
3742 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003743
3744 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003745 if not cl.GetIssue():
3746 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003747
Edward Lemur678a6842019-10-03 22:25:05 +00003748 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003749 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003750
Edward Lemur6c6827c2020-02-06 21:15:18 +00003751 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003752
smut@google.com34fb6b12015-07-13 20:03:26 +00003753 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003754 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003755 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003756
3757 if options.new_description:
3758 text = options.new_description
3759 if text == '-':
3760 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003761 elif text == '+':
3762 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003763 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003764
3765 description.set_description(text)
3766 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003767 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003768 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003769 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003770 return 0
3771
3772
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003773@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003774def CMDlint(parser, args):
3775 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003776 parser.add_option('--filter', action='append', metavar='-x,+y',
3777 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003778 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003779
3780 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003781 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003782 try:
3783 import cpplint
3784 import cpplint_chromium
3785 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003786 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003787 return 1
3788
3789 # Change the current working directory before calling lint so that it
3790 # shows the correct base.
3791 previous_cwd = os.getcwd()
3792 os.chdir(settings.GetRoot())
3793 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003794 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003795 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003796 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003797 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003798 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003799
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003800 # Process cpplint arguments, if any.
3801 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3802 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003803 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003804
Lei Zhang379d1ad2020-07-15 19:40:06 +00003805 include_regex = re.compile(settings.GetLintRegex())
3806 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003807 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3808 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003809 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003810 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003811 continue
3812
3813 if ignore_regex.match(filename):
3814 print('Ignoring file %s' % filename)
3815 continue
3816
3817 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3818 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003819 finally:
3820 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003822 if cpplint._cpplint_state.error_count != 0:
3823 return 1
3824 return 0
3825
3826
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003827@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003828def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003829 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003830 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003831 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003832 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003833 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003834 parser.add_option('--all', action='store_true',
3835 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003836 parser.add_option('--parallel', action='store_true',
3837 help='Run all tests specified by input_api.RunTests in all '
3838 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003839 parser.add_option('--resultdb', action='store_true',
3840 help='Run presubmit checks in the ResultSink environment '
3841 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003842 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003843 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844
sbc@chromium.org71437c02015-04-09 19:29:40 +00003845 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847 return 1
3848
Edward Lemur934836a2019-09-09 20:16:54 +00003849 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850 if args:
3851 base_branch = args[0]
3852 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003853 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003854 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003855
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003856 if cl.GetIssue():
3857 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003858 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003859 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003860
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003861 cl.RunHook(
3862 committing=not options.upload,
3863 may_prompt=False,
3864 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003865 parallel=options.parallel,
3866 upstream=base_branch,
3867 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003868 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003869 resultdb=options.resultdb,
3870 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003871 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003872
3873
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003874def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003875 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003876
3877 Works the same way as
3878 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3879 but can be called on demand on all platforms.
3880
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003881 The basic idea is to generate git hash of a state of the tree, original
3882 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003883 """
3884 lines = []
3885 tree_hash = RunGitSilent(['write-tree'])
3886 lines.append('tree %s' % tree_hash.strip())
3887 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3888 if code == 0:
3889 lines.append('parent %s' % parent.strip())
3890 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3891 lines.append('author %s' % author.strip())
3892 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3893 lines.append('committer %s' % committer.strip())
3894 lines.append('')
3895 # Note: Gerrit's commit-hook actually cleans message of some lines and
3896 # whitespace. This code is not doing this, but it clearly won't decrease
3897 # entropy.
3898 lines.append(message)
3899 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003900 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003901 return 'I%s' % change_hash.strip()
3902
3903
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003904def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003905 """Computes the remote branch ref to use for the CL.
3906
3907 Args:
3908 remote (str): The git remote for the CL.
3909 remote_branch (str): The git remote branch for the CL.
3910 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003911 """
3912 if not (remote and remote_branch):
3913 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003914
wittman@chromium.org455dc922015-01-26 20:15:50 +00003915 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003916 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003917 # refs, which are then translated into the remote full symbolic refs
3918 # below.
3919 if '/' not in target_branch:
3920 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3921 else:
3922 prefix_replacements = (
3923 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3924 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3925 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3926 )
3927 match = None
3928 for regex, replacement in prefix_replacements:
3929 match = re.search(regex, target_branch)
3930 if match:
3931 remote_branch = target_branch.replace(match.group(0), replacement)
3932 break
3933 if not match:
3934 # This is a branch path but not one we recognize; use as-is.
3935 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003936 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3937 # Handle the refs that need to land in different refs.
3938 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003939
wittman@chromium.org455dc922015-01-26 20:15:50 +00003940 # Create the true path to the remote branch.
3941 # Does the following translation:
3942 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3943 # * refs/remotes/origin/master -> refs/heads/master
3944 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3945 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3946 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3947 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3948 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3949 'refs/heads/')
3950 elif remote_branch.startswith('refs/remotes/branch-heads'):
3951 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003952
wittman@chromium.org455dc922015-01-26 20:15:50 +00003953 return remote_branch
3954
3955
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003956def cleanup_list(l):
3957 """Fixes a list so that comma separated items are put as individual items.
3958
3959 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3960 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3961 """
3962 items = sum((i.split(',') for i in l), [])
3963 stripped_items = (i.strip() for i in items)
3964 return sorted(filter(None, stripped_items))
3965
3966
Aaron Gable4db38df2017-11-03 14:59:07 -07003967@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003968@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003969def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003970 """Uploads the current changelist to codereview.
3971
3972 Can skip dependency patchset uploads for a branch by running:
3973 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003974 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003975 git config --unset branch.branch_name.skip-deps-uploads
3976 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003977
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003978 If the name of the checked out branch starts with "bug-" or "fix-" followed
3979 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003980 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003981
3982 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003983 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003984 [git-cl] add support for hashtags
3985 Foo bar: implement foo
3986 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00003987 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003988 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3989 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003990 parser.add_option('--bypass-watchlists', action='store_true',
3991 dest='bypass_watchlists',
3992 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07003993 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003994 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003995 parser.add_option('--message', '-m', dest='message',
3996 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003997 parser.add_option('-b', '--bug',
3998 help='pre-populate the bug number(s) for this issue. '
3999 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004000 parser.add_option('--message-file', dest='message_file',
4001 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004002 parser.add_option('--title', '-t', dest='title',
4003 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004004 parser.add_option('-T', '--skip-title', action='store_true',
4005 dest='skip_title',
4006 help='Use the most recent commit message as the title of '
4007 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004008 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004009 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004010 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004011 parser.add_option('--tbrs',
4012 action='append', default=[],
4013 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004014 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004015 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004016 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004017 parser.add_option('--hashtag', dest='hashtags',
4018 action='append', default=[],
4019 help=('Gerrit hashtag for new CL; '
4020 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004021 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004022 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004023 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004024 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004025 metavar='TARGET',
4026 help='Apply CL to remote ref TARGET. ' +
4027 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004028 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004029 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004030 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004031 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004032 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004033 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004034 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4035 const='TBR', help='add a set of OWNERS to TBR')
4036 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4037 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004038 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004039 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004040 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004041 'implies --send-mail')
4042 parser.add_option('-d', '--cq-dry-run',
4043 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004044 help='Send the patchset to do a CQ dry run right after '
4045 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004046 parser.add_option('--preserve-tryjobs', action='store_true',
4047 help='instruct the CQ to let tryjobs running even after '
4048 'new patchsets are uploaded instead of canceling '
4049 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004050 parser.add_option('--dependencies', action='store_true',
4051 help='Uploads CLs of all the local branches that depend on '
4052 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004053 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4054 help='Sends your change to the CQ after an approval. Only '
4055 'works on repos that have the Auto-Submit label '
4056 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004057 parser.add_option('--parallel', action='store_true',
4058 help='Run all tests specified by input_api.RunTests in all '
4059 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004060 parser.add_option('--no-autocc', action='store_true',
4061 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004062 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004063 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004064 parser.add_option('-R', '--retry-failed', action='store_true',
4065 help='Retry failed tryjobs from old patchset immediately '
4066 'after uploading new patchset. Cannot be used with '
4067 '--use-commit-queue or --cq-dry-run.')
4068 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4069 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004070 parser.add_option('--fixed', '-x',
4071 help='List of bugs that will be commented on and marked '
4072 'fixed (pre-populates "Fixed:" tag). Same format as '
4073 '-b option / "Bug:" tag. If fixing several issues, '
4074 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004075 parser.add_option('--edit-description', action='store_true', default=False,
4076 help='Modify description before upload. Cannot be used '
4077 'with --force. It is a noop when --no-squash is set '
4078 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004079 parser.add_option('--git-completion-helper', action="store_true",
4080 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004081 parser.add_option('--resultdb', action='store_true',
4082 help='Run presubmit checks in the ResultSink environment '
4083 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004084 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004085
rmistry@google.com2dd99862015-06-22 12:22:18 +00004086 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004087 (options, args) = parser.parse_args(args)
4088
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004089 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004090 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4091 if opt.help != optparse.SUPPRESS_HELP))
4092 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004093
sbc@chromium.org71437c02015-04-09 19:29:40 +00004094 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004095 return 1
4096
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004097 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004098 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004099 options.cc = cleanup_list(options.cc)
4100
Josipe827b0f2020-01-30 00:07:20 +00004101 if options.edit_description and options.force:
4102 parser.error('Only one of --force and --edit-description allowed')
4103
tandriib80458a2016-06-23 12:20:07 -07004104 if options.message_file:
4105 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004106 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004107 options.message = gclient_utils.FileRead(options.message_file)
4108 options.message_file = None
4109
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004110 if ([options.cq_dry_run,
4111 options.use_commit_queue,
4112 options.retry_failed].count(True) > 1):
4113 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4114 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004115
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004116 if options.skip_title and options.title:
4117 parser.error('Only one of --title and --skip-title allowed.')
4118
Aaron Gableedbc4132017-09-11 13:22:28 -07004119 if options.use_commit_queue:
4120 options.send_mail = True
4121
Edward Lesmes0dd54822020-03-26 18:24:25 +00004122 if options.squash is None:
4123 # Load default for user, repo, squash=true, in this order.
4124 options.squash = settings.GetSquashGerritUploads()
4125
Edward Lemur934836a2019-09-09 20:16:54 +00004126 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004127 # Warm change details cache now to avoid RPCs later, reducing latency for
4128 # developers.
4129 if cl.GetIssue():
4130 cl._GetChangeDetail(
4131 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4132
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004133 if options.retry_failed and not cl.GetIssue():
4134 print('No previous patchsets, so --retry-failed has no effect.')
4135 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004136
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004137 # cl.GetMostRecentPatchset uses cached information, and can return the last
4138 # patchset before upload. Calling it here makes it clear that it's the
4139 # last patchset before upload. Note that GetMostRecentPatchset will fail
4140 # if no CL has been uploaded yet.
4141 if options.retry_failed:
4142 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004143
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004144 ret = cl.CMDUpload(options, args, orig_args)
4145
4146 if options.retry_failed:
4147 if ret != 0:
4148 print('Upload failed, so --retry-failed has no effect.')
4149 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004150 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004151 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004152 jobs = _filter_failed_for_retry(builds)
4153 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004154 print('No failed tryjobs, so --retry-failed has no effect.')
4155 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004156 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004157
4158 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004159
4160
Francois Dorayd42c6812017-05-30 15:10:20 -04004161@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004162@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004163def CMDsplit(parser, args):
4164 """Splits a branch into smaller branches and uploads CLs.
4165
4166 Creates a branch and uploads a CL for each group of files modified in the
4167 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004168 comment, the string '$directory', is replaced with the directory containing
4169 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004170 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004171 parser.add_option('-d', '--description', dest='description_file',
4172 help='A text file containing a CL description in which '
4173 '$directory will be replaced by each CL\'s directory.')
4174 parser.add_option('-c', '--comment', dest='comment_file',
4175 help='A text file containing a CL comment.')
4176 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004177 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004178 help='List the files and reviewers for each CL that would '
4179 'be created, but don\'t create branches or CLs.')
4180 parser.add_option('--cq-dry-run', action='store_true',
4181 help='If set, will do a cq dry run for each uploaded CL. '
4182 'Please be careful when doing this; more than ~10 CLs '
4183 'has the potential to overload our build '
4184 'infrastructure. Try to upload these not during high '
4185 'load times (usually 11-3 Mountain View time). Email '
4186 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004187 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4188 default=True,
4189 help='Sends your change to the CQ after an approval. Only '
4190 'works on repos that have the Auto-Submit label '
4191 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004192 options, _ = parser.parse_args(args)
4193
4194 if not options.description_file:
4195 parser.error('No --description flag specified.')
4196
4197 def WrappedCMDupload(args):
4198 return CMDupload(OptionParser(), args)
4199
Edward Lemur2c62b332020-03-12 22:12:33 +00004200 return split_cl.SplitCl(
4201 options.description_file, options.comment_file, Changelist,
4202 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4203 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004204
4205
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004206@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004207@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004209 """DEPRECATED: Used to commit the current changelist via git-svn."""
4210 message = ('git-cl no longer supports committing to SVN repositories via '
4211 'git-svn. You probably want to use `git cl land` instead.')
4212 print(message)
4213 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214
4215
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004216@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004217@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004218def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004219 """Commits the current changelist via git.
4220
4221 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4222 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004223 """
4224 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4225 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004226 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004227 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004228 parser.add_option('--parallel', action='store_true',
4229 help='Run all tests specified by input_api.RunTests in all '
4230 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004231 parser.add_option('--resultdb', action='store_true',
4232 help='Run presubmit checks in the ResultSink environment '
4233 'and send results to the ResultDB database.')
4234 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004235 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004236
Edward Lemur934836a2019-09-09 20:16:54 +00004237 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004238
Robert Iannucci2e73d432018-03-14 01:10:47 -07004239 if not cl.GetIssue():
4240 DieWithError('You must upload the change first to Gerrit.\n'
4241 ' If you would rather have `git cl land` upload '
4242 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004243 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4244 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004245
4246
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004247@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004248@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004249def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004250 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004251 parser.add_option('-b', dest='newbranch',
4252 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004253 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004254 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004255 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004256 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004257
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004258 group = optparse.OptionGroup(
4259 parser,
4260 'Options for continuing work on the current issue uploaded from a '
4261 'different clone (e.g. different machine). Must be used independently '
4262 'from the other options. No issue number should be specified, and the '
4263 'branch must have an issue number associated with it')
4264 group.add_option('--reapply', action='store_true', dest='reapply',
4265 help='Reset the branch and reapply the issue.\n'
4266 'CAUTION: This will undo any local changes in this '
4267 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004268
4269 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004270 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004271 parser.add_option_group(group)
4272
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004273 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004274
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004275 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004276 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004277 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004278 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004279 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004280
Edward Lemur934836a2019-09-09 20:16:54 +00004281 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004282 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004283 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004284
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004285 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004286 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004287 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004288
4289 RunGit(['reset', '--hard', upstream])
4290 if options.pull:
4291 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004292
Edward Lemur678a6842019-10-03 22:25:05 +00004293 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4294 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004295
4296 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004297 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004298
Edward Lemurf38bc172019-09-03 21:02:13 +00004299 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004300 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004301 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004302
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004303 # We don't want uncommitted changes mixed up with the patch.
4304 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004305 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004306
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004307 if options.newbranch:
4308 if options.force:
4309 RunGit(['branch', '-D', options.newbranch],
4310 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004311 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004312
Edward Lemur678a6842019-10-03 22:25:05 +00004313 cl = Changelist(
4314 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004315
Edward Lemur678a6842019-10-03 22:25:05 +00004316 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004317 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004318
Edward Lemurf38bc172019-09-03 21:02:13 +00004319 return cl.CMDPatchWithParsedIssue(
4320 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004321
4322
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004323def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004324 """Fetches the tree status and returns either 'open', 'closed',
4325 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004326 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004327 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004328 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004329 if status.find('closed') != -1 or status == '0':
4330 return 'closed'
4331 elif status.find('open') != -1 or status == '1':
4332 return 'open'
4333 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004334 return 'unset'
4335
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004336
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004337def GetTreeStatusReason():
4338 """Fetches the tree status from a json url and returns the message
4339 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004340 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004341 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004342 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004343 status = json.loads(connection.read())
4344 connection.close()
4345 return status['message']
4346
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004347
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004348@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004349def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004350 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004351 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352 status = GetTreeStatus()
4353 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004354 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004355 return 2
4356
vapiera7fbd5a2016-06-16 09:17:49 -07004357 print('The tree is %s' % status)
4358 print()
4359 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004360 if status != 'open':
4361 return 1
4362 return 0
4363
4364
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004365@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004366def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004367 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4368 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004369 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004370 '-b', '--bot', action='append',
4371 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4372 'times to specify multiple builders. ex: '
4373 '"-b win_rel -b win_layout". See '
4374 'the try server waterfall for the builders name and the tests '
4375 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004376 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004377 '-B', '--bucket', default='',
4378 help=('Buildbucket bucket to send the try requests.'))
4379 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004380 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004381 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004382 'be determined by the try recipe that builder runs, which usually '
4383 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004384 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004385 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004386 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004387 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004388 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004389 '--category', default='git_cl_try', help='Specify custom build category.')
4390 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004391 '--project',
4392 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004393 'in recipe to determine to which repository or directory to '
4394 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004395 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004396 '-p', '--property', dest='properties', action='append', default=[],
4397 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004398 'key2=value2 etc. The value will be treated as '
4399 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004400 'NOTE: using this may make your tryjob not usable for CQ, '
4401 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004402 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004403 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4404 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004405 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004406 parser.add_option(
4407 '-R', '--retry-failed', action='store_true', default=False,
4408 help='Retry failed jobs from the latest set of tryjobs. '
4409 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004410 parser.add_option(
4411 '-i', '--issue', type=int,
4412 help='Operate on this issue instead of the current branch\'s implicit '
4413 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004414 options, args = parser.parse_args(args)
4415
machenbach@chromium.org45453142015-09-15 08:45:22 +00004416 # Make sure that all properties are prop=value pairs.
4417 bad_params = [x for x in options.properties if '=' not in x]
4418 if bad_params:
4419 parser.error('Got properties with missing "=": %s' % bad_params)
4420
maruel@chromium.org15192402012-09-06 12:38:29 +00004421 if args:
4422 parser.error('Unknown arguments: %s' % args)
4423
Edward Lemur934836a2019-09-09 20:16:54 +00004424 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004425 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004426 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004427
Edward Lemurf38bc172019-09-03 21:02:13 +00004428 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004429 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004430
tandriie113dfd2016-10-11 10:20:12 -07004431 error_message = cl.CannotTriggerTryJobReason()
4432 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004433 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004434
Edward Lemur45768512020-03-02 19:03:14 +00004435 if options.bot:
4436 if options.retry_failed:
4437 parser.error('--bot is not compatible with --retry-failed.')
4438 if not options.bucket:
4439 parser.error('A bucket (e.g. "chromium/try") is required.')
4440
4441 triggered = [b for b in options.bot if 'triggered' in b]
4442 if triggered:
4443 parser.error(
4444 'Cannot schedule builds on triggered bots: %s.\n'
4445 'This type of bot requires an initial job from a parent (usually a '
4446 'builder). Schedule a job on the parent instead.\n' % triggered)
4447
4448 if options.bucket.startswith('.master'):
4449 parser.error('Buildbot masters are not supported.')
4450
4451 project, bucket = _parse_bucket(options.bucket)
4452 if project is None or bucket is None:
4453 parser.error('Invalid bucket: %s.' % options.bucket)
4454 jobs = sorted((project, bucket, bot) for bot in options.bot)
4455 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004456 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004457 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004458 if options.verbose:
4459 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004460 jobs = _filter_failed_for_retry(builds)
4461 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004462 print('There are no failed jobs in the latest set of jobs '
4463 '(patchset #%d), doing nothing.' % patchset)
4464 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004465 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004466 if num_builders > 10:
4467 confirm_or_exit('There are %d builders with failed builds.'
4468 % num_builders, action='continue')
4469 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004470 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004471 print('git cl try with no bots now defaults to CQ dry run.')
4472 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4473 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004474
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004475 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004476 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004477 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004478 except BuildbucketResponseException as ex:
4479 print('ERROR: %s' % ex)
4480 return 1
4481 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004482
4483
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004484@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004485def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004486 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004487 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004488 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004489 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004490 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004491 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004492 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004493 '--color', action='store_true', default=setup_color.IS_TTY,
4494 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004495 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004496 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4497 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004498 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004499 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004500 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004501 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004502 parser.add_option(
4503 '-i', '--issue', type=int,
4504 help='Operate on this issue instead of the current branch\'s implicit '
4505 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004506 options, args = parser.parse_args(args)
4507 if args:
4508 parser.error('Unrecognized args: %s' % ' '.join(args))
4509
Edward Lemur934836a2019-09-09 20:16:54 +00004510 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004511 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004512 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004513
tandrii221ab252016-10-06 08:12:04 -07004514 patchset = options.patchset
4515 if not patchset:
4516 patchset = cl.GetMostRecentPatchset()
4517 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004518 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004519 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004520 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004521 cl.GetIssue())
4522
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004523 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004524 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004525 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004526 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004527 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004528 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004529 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004530 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004531 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004532 return 0
4533
4534
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004535@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004536@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004538 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004539 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004540 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004541 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004542
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004544 if args:
4545 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004546 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004547 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004548 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004549 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004550
4551 # Clear configured merge-base, if there is one.
4552 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004553 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004554 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555 return 0
4556
4557
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004558@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004559def CMDweb(parser, args):
4560 """Opens the current CL in the web browser."""
4561 _, args = parser.parse_args(args)
4562 if args:
4563 parser.error('Unrecognized args: %s' % ' '.join(args))
4564
4565 issue_url = Changelist().GetIssueURL()
4566 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004567 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004568 return 1
4569
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004570 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004571 # allows us to hide the "Created new window in existing browser session."
4572 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004573 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004574 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004575 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004576 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004577 os.open(os.devnull, os.O_RDWR)
4578 try:
4579 webbrowser.open(issue_url)
4580 finally:
4581 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004582 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004583 return 0
4584
4585
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004586@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004587def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004588 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004589 parser.add_option('-d', '--dry-run', action='store_true',
4590 help='trigger in dry run mode')
4591 parser.add_option('-c', '--clear', action='store_true',
4592 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004593 parser.add_option(
4594 '-i', '--issue', type=int,
4595 help='Operate on this issue instead of the current branch\'s implicit '
4596 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004597 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004598 if args:
4599 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004600 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004601 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004602
Edward Lemur934836a2019-09-09 20:16:54 +00004603 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004604 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004605 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004606 elif options.dry_run:
4607 state = _CQState.DRY_RUN
4608 else:
4609 state = _CQState.COMMIT
4610 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004611 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004612 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004613 return 0
4614
4615
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004616@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004617def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004618 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004619 parser.add_option(
4620 '-i', '--issue', type=int,
4621 help='Operate on this issue instead of the current branch\'s implicit '
4622 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004623 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004624 if args:
4625 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004626 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004627 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004628 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004629 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004630 cl.CloseIssue()
4631 return 0
4632
4633
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004634@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004635def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004636 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004637 parser.add_option(
4638 '--stat',
4639 action='store_true',
4640 dest='stat',
4641 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004642 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004643 if args:
4644 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004645
Edward Lemur934836a2019-09-09 20:16:54 +00004646 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004647 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004648 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004649 if not issue:
4650 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004651
Aaron Gablea718c3e2017-08-28 17:47:28 -07004652 base = cl._GitGetBranchConfigValue('last-upload-hash')
4653 if not base:
4654 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4655 if not base:
4656 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4657 revision_info = detail['revisions'][detail['current_revision']]
4658 fetch_info = revision_info['fetch']['http']
4659 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4660 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004661
Aaron Gablea718c3e2017-08-28 17:47:28 -07004662 cmd = ['git', 'diff']
4663 if options.stat:
4664 cmd.append('--stat')
4665 cmd.append(base)
4666 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004667
4668 return 0
4669
4670
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004671@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004672def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004673 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004674 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004675 '--ignore-current',
4676 action='store_true',
4677 help='Ignore the CL\'s current reviewers and start from scratch.')
4678 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004679 '--ignore-self',
4680 action='store_true',
4681 help='Do not consider CL\'s author as an owners.')
4682 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004683 '--no-color',
4684 action='store_true',
4685 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004686 parser.add_option(
4687 '--batch',
4688 action='store_true',
4689 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004690 # TODO: Consider moving this to another command, since other
4691 # git-cl owners commands deal with owners for a given CL.
4692 parser.add_option(
4693 '--show-all',
4694 action='store_true',
4695 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004696 options, args = parser.parse_args(args)
4697
Edward Lemur934836a2019-09-09 20:16:54 +00004698 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004699 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004700
Yang Guo6e269a02019-06-26 11:17:02 +00004701 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004702 if len(args) == 0:
4703 print('No files specified for --show-all. Nothing to do.')
4704 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004705 for arg in args:
4706 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004707 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004708 database.load_data_needed_for([arg])
4709 print('Owners for %s:' % arg)
4710 for owner in sorted(database.all_possible_owners([arg], None)):
4711 print(' - %s' % owner)
4712 return 0
4713
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004714 if args:
4715 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004716 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004717 base_branch = args[0]
4718 else:
4719 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004720 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004721
Edward Lemur2c62b332020-03-12 22:12:33 +00004722 root = settings.GetRoot()
4723 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004724
4725 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004726 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004727 print('\n'.join(db.reviewers_for(affected_files, author)))
4728 return 0
4729
Edward Lemur2c62b332020-03-12 22:12:33 +00004730 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4731 original_owner_files = {
4732 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4733 for f in owner_files}
4734
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004735 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004736 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004737 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004738 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004739 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004740 fopen=open,
4741 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004742 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004743 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004744 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004745
4746
Aiden Bennerc08566e2018-10-03 17:52:42 +00004747def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004748 """Generates a diff command."""
4749 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004750 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4751
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004752 if allow_prefix:
4753 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4754 # case that diff.noprefix is set in the user's git config.
4755 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4756 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004757 diff_cmd += ['--no-prefix']
4758
4759 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004760
4761 if args:
4762 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004763 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004764 diff_cmd.append(arg)
4765 else:
4766 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004767
4768 return diff_cmd
4769
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004770
Jamie Madill5e96ad12020-01-13 16:08:35 +00004771def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4772 """Runs clang-format-diff and sets a return value if necessary."""
4773
4774 if not clang_diff_files:
4775 return 0
4776
4777 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4778 # formatted. This is used to block during the presubmit.
4779 return_value = 0
4780
4781 # Locate the clang-format binary in the checkout
4782 try:
4783 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4784 except clang_format.NotFoundError as e:
4785 DieWithError(e)
4786
4787 if opts.full or settings.GetFormatFullByDefault():
4788 cmd = [clang_format_tool]
4789 if not opts.dry_run and not opts.diff:
4790 cmd.append('-i')
4791 if opts.dry_run:
4792 for diff_file in clang_diff_files:
4793 with open(diff_file, 'r') as myfile:
4794 code = myfile.read().replace('\r\n', '\n')
4795 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4796 stdout = stdout.replace('\r\n', '\n')
4797 if opts.diff:
4798 sys.stdout.write(stdout)
4799 if code != stdout:
4800 return_value = 2
4801 else:
4802 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4803 if opts.diff:
4804 sys.stdout.write(stdout)
4805 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004806 try:
4807 script = clang_format.FindClangFormatScriptInChromiumTree(
4808 'clang-format-diff.py')
4809 except clang_format.NotFoundError as e:
4810 DieWithError(e)
4811
Edward Lesmes89624cd2020-04-06 17:51:56 +00004812 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004813 if not opts.dry_run and not opts.diff:
4814 cmd.append('-i')
4815
4816 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004817 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004818
Edward Lesmes89624cd2020-04-06 17:51:56 +00004819 env = os.environ.copy()
4820 env['PATH'] = (
4821 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4822 stdout = RunCommand(
4823 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004824 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004825 if opts.diff:
4826 sys.stdout.write(stdout)
4827 if opts.dry_run and len(stdout) > 0:
4828 return_value = 2
4829
4830 return return_value
4831
4832
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004833def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004834 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004835 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004836
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004837
enne@chromium.org555cfe42014-01-29 18:21:39 +00004838@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004839@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004840def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004841 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004842 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004843 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004844 parser.add_option('--full', action='store_true',
4845 help='Reformat the full content of all touched files')
4846 parser.add_option('--dry-run', action='store_true',
4847 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004848 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004849 '--no-clang-format',
4850 dest='clang_format',
4851 action='store_false',
4852 default=True,
4853 help='Disables formatting of various file types using clang-format.')
4854 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004855 '--python',
4856 action='store_true',
4857 default=None,
4858 help='Enables python formatting on all python files.')
4859 parser.add_option(
4860 '--no-python',
4861 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004862 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004863 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004864 'If neither --python or --no-python are set, python files that have a '
4865 '.style.yapf file in an ancestor directory will be formatted. '
4866 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004867 parser.add_option(
4868 '--js',
4869 action='store_true',
4870 help='Format javascript code with clang-format. '
4871 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004872 parser.add_option('--diff', action='store_true',
4873 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004874 parser.add_option('--presubmit', action='store_true',
4875 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004876 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004877
Garrett Beaty91a6f332020-01-06 16:57:24 +00004878 if opts.python is not None and opts.no_python:
4879 raise parser.error('Cannot set both --python and --no-python')
4880 if opts.no_python:
4881 opts.python = False
4882
Daniel Chengc55eecf2016-12-30 03:11:02 -08004883 # Normalize any remaining args against the current path, so paths relative to
4884 # the current directory are still resolved as expected.
4885 args = [os.path.join(os.getcwd(), arg) for arg in args]
4886
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004887 # git diff generates paths against the root of the repository. Change
4888 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004889 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004890 if rel_base_path:
4891 os.chdir(rel_base_path)
4892
digit@chromium.org29e47272013-05-17 17:01:46 +00004893 # Grab the merge-base commit, i.e. the upstream commit of the current
4894 # branch when it was created or the last time it was rebased. This is
4895 # to cover the case where the user may have called "git fetch origin",
4896 # moving the origin branch to a newer commit, but hasn't rebased yet.
4897 upstream_commit = None
4898 cl = Changelist()
4899 upstream_branch = cl.GetUpstreamBranch()
4900 if upstream_branch:
4901 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4902 upstream_commit = upstream_commit.strip()
4903
4904 if not upstream_commit:
4905 DieWithError('Could not find base commit for this branch. '
4906 'Are you in detached state?')
4907
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004908 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4909 diff_output = RunGit(changed_files_cmd)
4910 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004911 # Filter out files deleted by this CL
4912 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004913
Andreas Haas417d89c2020-02-06 10:24:27 +00004914 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004915 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004916
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004917 clang_diff_files = []
4918 if opts.clang_format:
4919 clang_diff_files = [
4920 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4921 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004922 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004923 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004924
Edward Lesmes50da7702020-03-30 19:23:43 +00004925 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004926
Jamie Madill5e96ad12020-01-13 16:08:35 +00004927 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4928 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004929
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004930 # Similar code to above, but using yapf on .py files rather than clang-format
4931 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004932 py_explicitly_disabled = opts.python is not None and not opts.python
4933 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004934 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4935 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004936
Aiden Bennerc08566e2018-10-03 17:52:42 +00004937 # Used for caching.
4938 yapf_configs = {}
4939 for f in python_diff_files:
4940 # Find the yapf style config for the current file, defaults to depot
4941 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004942 _FindYapfConfigFile(f, yapf_configs, top_dir)
4943
4944 # Turn on python formatting by default if a yapf config is specified.
4945 # This breaks in the case of this repo though since the specified
4946 # style file is also the global default.
4947 if opts.python is None:
4948 filtered_py_files = []
4949 for f in python_diff_files:
4950 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4951 filtered_py_files.append(f)
4952 else:
4953 filtered_py_files = python_diff_files
4954
4955 # Note: yapf still seems to fix indentation of the entire file
4956 # even if line ranges are specified.
4957 # See https://github.com/google/yapf/issues/499
4958 if not opts.full and filtered_py_files:
4959 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4960
Brian Sheedyb4307d52019-12-02 19:18:17 +00004961 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4962 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4963 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004964
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004965 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004966 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4967 # Default to pep8 if not .style.yapf is found.
4968 if not yapf_style:
4969 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004970
Peter Wend9399922020-06-17 17:33:49 +00004971 with open(f, 'r') as py_f:
4972 if 'python3' in py_f.readline():
4973 vpython_script = 'vpython3'
4974 else:
4975 vpython_script = 'vpython'
4976
4977 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004978
4979 has_formattable_lines = False
4980 if not opts.full:
4981 # Only run yapf over changed line ranges.
4982 for diff_start, diff_len in py_line_diffs[f]:
4983 diff_end = diff_start + diff_len - 1
4984 # Yapf errors out if diff_end < diff_start but this
4985 # is a valid line range diff for a removal.
4986 if diff_end >= diff_start:
4987 has_formattable_lines = True
4988 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
4989 # If all line diffs were removals we have nothing to format.
4990 if not has_formattable_lines:
4991 continue
4992
4993 if opts.diff or opts.dry_run:
4994 cmd += ['--diff']
4995 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00004996 stdout = RunCommand(cmd,
4997 error_ok=True,
4998 cwd=top_dir,
4999 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005000 if opts.diff:
5001 sys.stdout.write(stdout)
5002 elif len(stdout) > 0:
5003 return_value = 2
5004 else:
5005 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005006 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005007
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005008 # Format GN build files. Always run on full build files for canonical form.
5009 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005010 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005011 if opts.dry_run or opts.diff:
5012 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005013 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005014 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005015 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005016 cwd=top_dir)
5017 if opts.dry_run and gn_ret == 2:
5018 return_value = 2 # Not formatted.
5019 elif opts.diff and gn_ret == 2:
5020 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005021 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005022 elif gn_ret != 0:
5023 # For non-dry run cases (and non-2 return values for dry-run), a
5024 # nonzero error code indicates a failure, probably because the file
5025 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005026 DieWithError('gn format failed on ' + gn_diff_file +
5027 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005028
Ilya Shermane081cbe2017-08-15 17:51:04 -07005029 # Skip the metrics formatting from the global presubmit hook. These files have
5030 # a separate presubmit hook that issues an error if the files need formatting,
5031 # whereas the top-level presubmit script merely issues a warning. Formatting
5032 # these files is somewhat slow, so it's important not to duplicate the work.
5033 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005034 for diff_xml in GetDiffXMLs(diff_files):
5035 xml_dir = GetMetricsDir(diff_xml)
5036 if not xml_dir:
5037 continue
5038
Ilya Shermane081cbe2017-08-15 17:51:04 -07005039 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005040 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5041 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005042
5043 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5044 # command as histograms/pretty_print.py now needs a relative path argument
5045 # after splitting the histograms into multiple directories.
5046 # For example, in tools/metrics/ukm, pretty-print could be run using:
5047 # $ python pretty_print.py
5048 # But in tools/metrics/histogrmas, pretty-print should be run with an
5049 # additional relative path argument, like:
5050 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5051 # $ python pretty_print.py enums.xml
5052
5053 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5054 # version of histograms/pretty_print.py is released.
5055 filepath_required = os.path.exists(
5056 os.path.join(tool_dir, 'validate_prefix.py'))
5057
Weilun Shib92c4b72020-08-27 17:45:11 +00005058 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5059 or diff_xml.endswith('histogram_suffixes_list.xml')
5060 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005061 cmd.append(diff_xml)
5062
Ilya Shermane081cbe2017-08-15 17:51:04 -07005063 if opts.dry_run or opts.diff:
5064 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005065
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005066 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5067 # `shell` param and instead replace `'vpython'` with
5068 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005069 stdout = RunCommand(cmd,
5070 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005071 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005072 if opts.diff:
5073 sys.stdout.write(stdout)
5074 if opts.dry_run and stdout:
5075 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005076
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005077 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005078
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005079
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005080def GetDiffXMLs(diff_files):
5081 return [
5082 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5083 ]
5084
5085
5086def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005087 metrics_xml_dirs = [
5088 os.path.join('tools', 'metrics', 'actions'),
5089 os.path.join('tools', 'metrics', 'histograms'),
5090 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005091 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005092 os.path.join('tools', 'metrics', 'ukm'),
5093 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005094 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005095 if diff_xml.startswith(xml_dir):
5096 return xml_dir
5097 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005098
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005099
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005100@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005101@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005102def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005103 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005104 _, args = parser.parse_args(args)
5105
5106 if len(args) != 1:
5107 parser.print_help()
5108 return 1
5109
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005110 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005111 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005112 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005113
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005114 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005115
Edward Lemur52969c92020-02-06 18:15:28 +00005116 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005117 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005118 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005119
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005120 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005121 for key, issue in [x.split() for x in output.splitlines()]:
5122 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005123 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005124
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005125 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005126 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005127 return 1
5128 if len(branches) == 1:
5129 RunGit(['checkout', branches[0]])
5130 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005131 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005132 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005133 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005134 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005135 try:
5136 RunGit(['checkout', branches[int(which)]])
5137 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005138 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005139 return 1
5140
5141 return 0
5142
5143
maruel@chromium.org29404b52014-09-08 22:58:00 +00005144def CMDlol(parser, args):
5145 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005146 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005147 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5148 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5149 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005150 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005151 return 0
5152
5153
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005154class OptionParser(optparse.OptionParser):
5155 """Creates the option parse and add --verbose support."""
5156 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005157 optparse.OptionParser.__init__(
5158 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005159 self.add_option(
5160 '-v', '--verbose', action='count', default=0,
5161 help='Use 2 times for more debugging info')
5162
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005163 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005164 try:
5165 return self._parse_args(args)
5166 finally:
5167 # Regardless of success or failure of args parsing, we want to report
5168 # metrics, but only after logging has been initialized (if parsing
5169 # succeeded).
5170 global settings
5171 settings = Settings()
5172
5173 if not metrics.DISABLE_METRICS_COLLECTION:
5174 # GetViewVCUrl ultimately calls logging method.
5175 project_url = settings.GetViewVCUrl().strip('/+')
5176 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5177 metrics.collector.add('project_urls', [project_url])
5178
5179 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005180 # Create an optparse.Values object that will store only the actual passed
5181 # options, without the defaults.
5182 actual_options = optparse.Values()
5183 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5184 # Create an optparse.Values object with the default options.
5185 options = optparse.Values(self.get_default_values().__dict__)
5186 # Update it with the options passed by the user.
5187 options._update_careful(actual_options.__dict__)
5188 # Store the options passed by the user in an _actual_options attribute.
5189 # We store only the keys, and not the values, since the values can contain
5190 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005191 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005192
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005193 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005194 logging.basicConfig(
5195 level=levels[min(options.verbose, len(levels) - 1)],
5196 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5197 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005198
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005199 return options, args
5200
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005202def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005203 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005204 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005205 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005206 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005207
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005208 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005209 dispatcher = subcommand.CommandDispatcher(__name__)
5210 try:
5211 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005212 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005213 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005214 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005215 if e.code != 500:
5216 raise
5217 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005218 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005219 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005220 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005221
5222
5223if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005224 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5225 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005226 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005227 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005228 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005229 sys.exit(main(sys.argv[1:]))