blob: 09496db9b981d6ae47e7868f6dc83021279f4ce2 [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 Sanghavidba1d652020-08-05 23:55:14 +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])
1293
1294 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001295 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavidba1d652020-08-05 23:55:14 +00001296 if resultdb and realm:
1297 cmd = ['rdb', 'stream', '-new', '-realm', realm] + cmd
1298 elif resultdb:
1299 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1300 # it is not required to pass the realm flag
1301 print('Note: ResultDB reporting will NOT be performed because --realm'
1302 ' was not specified. To enable ResultDB, please run the command'
1303 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001304
1305 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001306 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001307
Edward Lemur227d5102020-02-25 23:45:35 +00001308 metrics.collector.add_repeated('sub_commands', {
1309 'command': 'presubmit',
1310 'execution_time': time_time() - start,
1311 'exit_code': exit_code,
1312 })
1313
1314 if exit_code:
1315 sys.exit(exit_code)
1316
1317 json_results = gclient_utils.FileRead(json_output)
1318 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001319
Edward Lemur75526302020-02-27 22:31:05 +00001320 def RunPostUploadHook(self, verbose, upstream, description):
1321 args = self._GetCommonPresubmitArgs(verbose, upstream)
1322 args.append('--post_upload')
1323
1324 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001325 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001326 args.extend(['--description_file', description_file])
1327 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1328 p.wait()
1329
Edward Lemur5a644f82020-03-18 16:44:57 +00001330 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1331 # Get description message for upload.
1332 if self.GetIssue():
1333 description = self.FetchDescription()
1334 elif options.message:
1335 description = options.message
1336 else:
1337 description = _create_description_from_log(git_diff_args)
1338 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001339 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001340
1341 # Extract bug number from branch name.
1342 bug = options.bug
1343 fixed = options.fixed
1344 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1345 self.GetBranch())
1346 if not bug and not fixed and match:
1347 if match.group('type') == 'bug':
1348 bug = match.group('bugnum')
1349 else:
1350 fixed = match.group('bugnum')
1351
1352 change_description = ChangeDescription(description, bug, fixed)
1353
1354 # Set the reviewer list now so that presubmit checks can access it.
1355 if options.reviewers or options.tbrs or options.add_owners_to:
1356 change_description.update_reviewers(
1357 options.reviewers, options.tbrs, options.add_owners_to, files,
1358 self.GetAuthor())
1359
1360 return change_description
1361
1362 def _GetTitleForUpload(self, options):
1363 # When not squashing, just return options.title.
1364 if not options.squash:
1365 return options.title
1366
1367 # On first upload, patchset title is always this string, while options.title
1368 # gets converted to first line of message.
1369 if not self.GetIssue():
1370 return 'Initial upload'
1371
1372 # When uploading subsequent patchsets, options.message is taken as the title
1373 # if options.title is not provided.
1374 if options.title:
1375 return options.title
1376 if options.message:
1377 return options.message.strip()
1378
1379 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001380 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001381 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001382 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001383 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1384 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001385
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001386 def CMDUpload(self, options, git_diff_args, orig_args):
1387 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001389 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001390 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001391 else:
1392 if self.GetBranch() is None:
1393 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1394
1395 # Default to diffing against common ancestor of upstream branch
1396 base_branch = self.GetCommonAncestorWithUpstream()
1397 git_diff_args = [base_branch, 'HEAD']
1398
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001399 # Fast best-effort checks to abort before running potentially expensive
1400 # hooks if uploading is likely to fail anyway. Passing these checks does
1401 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001402 self.EnsureAuthenticated(force=options.force)
1403 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001404
1405 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001406 watchlist = watchlists.Watchlists(settings.GetRoot())
1407 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001408 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001409 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001410
Edward Lemur5a644f82020-03-18 16:44:57 +00001411 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001412 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001413 hook_results = self.RunHook(
1414 committing=False,
1415 may_prompt=not options.force,
1416 verbose=options.verbose,
1417 parallel=options.parallel,
1418 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001419 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001420 all_files=False,
Saagar Sanghavidba1d652020-08-05 23:55:14 +00001421 resultdb=options.resultdb,
1422 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001423 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001424
Aaron Gable13101a62018-02-09 13:20:41 -08001425 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001426 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001427 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001428 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001429 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001430 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001431 # Run post upload hooks, if specified.
1432 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001433 self.RunPostUploadHook(
1434 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001435
1436 # Upload all dependencies if specified.
1437 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001438 print()
1439 print('--dependencies has been specified.')
1440 print('All dependent local branches will be re-uploaded.')
1441 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001442 # Remove the dependencies flag from args so that we do not end up in a
1443 # loop.
1444 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001445 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001446 return ret
1447
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001448 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001449 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001450
1451 Issue must have been already uploaded and known.
1452 """
1453 assert new_state in _CQState.ALL_STATES
1454 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001455 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001456 vote_map = {
1457 _CQState.NONE: 0,
1458 _CQState.DRY_RUN: 1,
1459 _CQState.COMMIT: 2,
1460 }
1461 labels = {'Commit-Queue': vote_map[new_state]}
1462 notify = False if new_state == _CQState.DRY_RUN else None
1463 gerrit_util.SetReview(
1464 self._GetGerritHost(), self._GerritChangeIdentifier(),
1465 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001466 return 0
1467 except KeyboardInterrupt:
1468 raise
1469 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001470 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001471 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001472 ' * Your project has no CQ,\n'
1473 ' * You don\'t have permission to change the CQ state,\n'
1474 ' * There\'s a bug in this code (see stack trace below).\n'
1475 'Consider specifying which bots to trigger manually or asking your '
1476 'project owners for permissions or contacting Chrome Infra at:\n'
1477 'https://www.chromium.org/infra\n\n' %
1478 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001479 # Still raise exception so that stack trace is printed.
1480 raise
1481
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001482 def _GetGerritHost(self):
1483 # Lazy load of configs.
1484 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001485 if self._gerrit_host and '.' not in self._gerrit_host:
1486 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1487 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001488 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001489 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001490 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001491 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001492 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1493 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001494 return self._gerrit_host
1495
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001496 def _GetGitHost(self):
1497 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001498 remote_url = self.GetRemoteUrl()
1499 if not remote_url:
1500 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001501 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001502
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001503 def GetCodereviewServer(self):
1504 if not self._gerrit_server:
1505 # If we're on a branch then get the server potentially associated
1506 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001507 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001508 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001509 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001510 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001511 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001512 if not self._gerrit_server:
1513 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1514 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001515 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001516 parts[0] = parts[0] + '-review'
1517 self._gerrit_host = '.'.join(parts)
1518 self._gerrit_server = 'https://%s' % self._gerrit_host
1519 return self._gerrit_server
1520
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001521 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001522 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001523 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001524 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001525 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001526 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001527 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001528 if project.endswith('.git'):
1529 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001530 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1531 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1532 # gitiles/git-over-https protocol. E.g.,
1533 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1534 # as
1535 # https://chromium.googlesource.com/v8/v8
1536 if project.startswith('a/'):
1537 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001538 return project
1539
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001540 def _GerritChangeIdentifier(self):
1541 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1542
1543 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001544 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001545 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001546 project = self._GetGerritProject()
1547 if project:
1548 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1549 # Fall back on still unique, but less efficient change number.
1550 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001551
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001552 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001554 if settings.GetGerritSkipEnsureAuthenticated():
1555 # For projects with unusual authentication schemes.
1556 # See http://crbug.com/603378.
1557 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001558
1559 # Check presence of cookies only if using cookies-based auth method.
1560 cookie_auth = gerrit_util.Authenticator.get()
1561 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001562 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001563
Florian Mayerae510e82020-01-30 21:04:48 +00001564 remote_url = self.GetRemoteUrl()
1565 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001566 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001567 return
1568 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001569 logging.warning('Ignoring branch %(branch)s with non-https remote '
1570 '%(remote)s', {
1571 'branch': self.branch,
1572 'remote': self.GetRemoteUrl()
1573 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001574 return
1575
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001576 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001577 self.GetCodereviewServer()
1578 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001579 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001580
1581 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1582 git_auth = cookie_auth.get_auth_header(git_host)
1583 if gerrit_auth and git_auth:
1584 if gerrit_auth == git_auth:
1585 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001586 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001587 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001588 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001589 ' %s\n'
1590 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001591 ' Consider running the following command:\n'
1592 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001593 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001594 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001595 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001596 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001597 cookie_auth.get_new_password_message(git_host)))
1598 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001599 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 return
1601 else:
1602 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001603 ([] if gerrit_auth else [self._gerrit_host]) +
1604 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001605 DieWithError('Credentials for the following hosts are required:\n'
1606 ' %s\n'
1607 'These are read from %s (or legacy %s)\n'
1608 '%s' % (
1609 '\n '.join(missing),
1610 cookie_auth.get_gitcookies_path(),
1611 cookie_auth.get_netrc_path(),
1612 cookie_auth.get_new_password_message(git_host)))
1613
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001614 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001615 if not self.GetIssue():
1616 return
1617
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001618 status = self._GetChangeDetail()['status']
1619 if status in ('MERGED', 'ABANDONED'):
1620 DieWithError('Change %s has been %s, new uploads are not allowed' %
1621 (self.GetIssueURL(),
1622 'submitted' if status == 'MERGED' else 'abandoned'))
1623
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001624 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1625 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1626 # Apparently this check is not very important? Otherwise get_auth_email
1627 # could have been added to other implementations of Authenticator.
1628 cookies_auth = gerrit_util.Authenticator.get()
1629 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001630 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001631
1632 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001633 if self.GetIssueOwner() == cookies_user:
1634 return
1635 logging.debug('change %s owner is %s, cookies user is %s',
1636 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001637 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001638 # so ask what Gerrit thinks of this user.
1639 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1640 if details['email'] == self.GetIssueOwner():
1641 return
1642 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001643 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001644 'as %s.\n'
1645 'Uploading may fail due to lack of permissions.' %
1646 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1647 confirm_or_exit(action='upload')
1648
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001649 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001650 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001651 or CQ status, assuming adherence to a common workflow.
1652
1653 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001654 * 'error' - error from review tool (including deleted issues)
1655 * 'unsent' - no reviewers added
1656 * 'waiting' - waiting for review
1657 * 'reply' - waiting for uploader to reply to review
1658 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001659 * 'dry-run' - dry-running in the CQ
1660 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001661 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001662 """
1663 if not self.GetIssue():
1664 return None
1665
1666 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001667 data = self._GetChangeDetail([
1668 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001669 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001670 return 'error'
1671
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001672 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001673 return 'closed'
1674
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001675 cq_label = data['labels'].get('Commit-Queue', {})
1676 max_cq_vote = 0
1677 for vote in cq_label.get('all', []):
1678 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1679 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001680 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001681 if max_cq_vote == 1:
1682 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001683
Aaron Gable9ab38c62017-04-06 14:36:33 -07001684 if data['labels'].get('Code-Review', {}).get('approved'):
1685 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001686
1687 if not data.get('reviewers', {}).get('REVIEWER', []):
1688 return 'unsent'
1689
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001690 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001691 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001692 while messages:
1693 m = messages.pop()
1694 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001695 # Ignore replies from CQ.
1696 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001697 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001698 # Most recent message was by owner.
1699 return 'waiting'
1700 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001701 # Some reply from non-owner.
1702 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001703
1704 # Somehow there are no messages even though there are reviewers.
1705 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001706
1707 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001708 if not self.GetIssue():
1709 return None
1710
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001711 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001712 patchset = data['revisions'][data['current_revision']]['_number']
1713 self.SetPatchset(patchset)
1714 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001715
Aaron Gable636b13f2017-07-14 10:42:48 -07001716 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001717 gerrit_util.SetReview(
1718 self._GetGerritHost(), self._GerritChangeIdentifier(),
1719 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001720
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001721 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001722 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001723 # CURRENT_REVISION is included to get the latest patchset so that
1724 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001726 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1727 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001729 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001730 robot_file_comments = gerrit_util.GetChangeRobotComments(
1731 self._GetGerritHost(), self._GerritChangeIdentifier())
1732
1733 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001734 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001735 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001736 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001737 line_comments = file_comments.setdefault(path, [])
1738 line_comments.extend(
1739 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001740
1741 # Build dictionary of file comments for easy access and sorting later.
1742 # {author+date: {path: {patchset: {line: url+message}}}}
1743 comments = collections.defaultdict(
1744 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001745 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001746 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001747 tag = comment.get('tag', '')
1748 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001749 continue
1750 key = (comment['author']['email'], comment['updated'])
1751 if comment.get('side', 'REVISION') == 'PARENT':
1752 patchset = 'Base'
1753 else:
1754 patchset = 'PS%d' % comment['patch_set']
1755 line = comment.get('line', 0)
1756 url = ('https://%s/c/%s/%s/%s#%s%s' %
1757 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1758 'b' if comment.get('side') == 'PARENT' else '',
1759 str(line) if line else ''))
1760 comments[key][path][patchset][line] = (url, comment['message'])
1761
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001762 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001763 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001764 summary = self._BuildCommentSummary(msg, comments, readable)
1765 if summary:
1766 summaries.append(summary)
1767 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001768
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001769 @staticmethod
1770 def _BuildCommentSummary(msg, comments, readable):
1771 key = (msg['author']['email'], msg['date'])
1772 # Don't bother showing autogenerated messages that don't have associated
1773 # file or line comments. this will filter out most autogenerated
1774 # messages, but will keep robot comments like those from Tricium.
1775 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1776 if is_autogenerated and not comments.get(key):
1777 return None
1778 message = msg['message']
1779 # Gerrit spits out nanoseconds.
1780 assert len(msg['date'].split('.')[-1]) == 9
1781 date = datetime.datetime.strptime(msg['date'][:-3],
1782 '%Y-%m-%d %H:%M:%S.%f')
1783 if key in comments:
1784 message += '\n'
1785 for path, patchsets in sorted(comments.get(key, {}).items()):
1786 if readable:
1787 message += '\n%s' % path
1788 for patchset, lines in sorted(patchsets.items()):
1789 for line, (url, content) in sorted(lines.items()):
1790 if line:
1791 line_str = 'Line %d' % line
1792 path_str = '%s:%d:' % (path, line)
1793 else:
1794 line_str = 'File comment'
1795 path_str = '%s:0:' % path
1796 if readable:
1797 message += '\n %s, %s: %s' % (patchset, line_str, url)
1798 message += '\n %s\n' % content
1799 else:
1800 message += '\n%s ' % path_str
1801 message += '\n%s\n' % content
1802
1803 return _CommentSummary(
1804 date=date,
1805 message=message,
1806 sender=msg['author']['email'],
1807 autogenerated=is_autogenerated,
1808 # These could be inferred from the text messages and correlated with
1809 # Code-Review label maximum, however this is not reliable.
1810 # Leaving as is until the need arises.
1811 approval=False,
1812 disapproval=False,
1813 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001814
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001815 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001816 gerrit_util.AbandonChange(
1817 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001818
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001819 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001820 gerrit_util.SubmitChange(
1821 self._GetGerritHost(), self._GerritChangeIdentifier(),
1822 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001823
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001824 def _GetChangeDetail(self, options=None):
1825 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001826 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001827 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001828
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001829 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001830 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001831 options.append('CURRENT_COMMIT')
1832
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001833 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001834 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001835 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001836
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001837 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1838 # Assumption: data fetched before with extra options is suitable
1839 # for return for a smaller set of options.
1840 # For example, if we cached data for
1841 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1842 # and request is for options=[CURRENT_REVISION],
1843 # THEN we can return prior cached data.
1844 if options_set.issubset(cached_options_set):
1845 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001846
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001847 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001848 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001849 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001850 except gerrit_util.GerritError as e:
1851 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001852 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001853 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001854
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001855 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001856 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001857
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001858 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001859 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001860 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001861 data = gerrit_util.GetChangeCommit(
1862 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001863 except gerrit_util.GerritError as e:
1864 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001865 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001866 raise
agable32978d92016-11-01 12:55:02 -07001867 return data
1868
Karen Qian40c19422019-03-13 21:28:29 +00001869 def _IsCqConfigured(self):
1870 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001871 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001872
Saagar Sanghavidba1d652020-08-05 23:55:14 +00001873 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001874 if git_common.is_dirty_git_tree('land'):
1875 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001876
tandriid60367b2016-06-22 05:25:12 -07001877 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001878 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001879 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001880 'which can test and land changes for you. '
1881 'Are you sure you wish to bypass it?\n',
1882 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001883 differs = True
tandriic4344b52016-08-29 06:04:54 -07001884 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001885 # Note: git diff outputs nothing if there is no diff.
1886 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001887 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001888 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001889 if detail['current_revision'] == last_upload:
1890 differs = False
1891 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001892 print('WARNING: Local branch contents differ from latest uploaded '
1893 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001894 if differs:
1895 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001896 confirm_or_exit(
1897 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1898 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001899 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001900 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001901 upstream = self.GetCommonAncestorWithUpstream()
1902 if self.GetIssue():
1903 description = self.FetchDescription()
1904 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001905 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001906 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001907 committing=True,
1908 may_prompt=not force,
1909 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001910 parallel=parallel,
1911 upstream=upstream,
1912 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001913 all_files=False,
Saagar Sanghavidba1d652020-08-05 23:55:14 +00001914 resultdb=resultdb,
1915 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001916
1917 self.SubmitIssue(wait_for_merge=True)
1918 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001919 links = self._GetChangeCommit().get('web_links', [])
1920 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001921 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001922 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001923 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001924 return 0
1925
Edward Lemurf38bc172019-09-03 21:02:13 +00001926 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001927 assert parsed_issue_arg.valid
1928
Edward Lemur125d60a2019-09-13 18:25:41 +00001929 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001930
1931 if parsed_issue_arg.hostname:
1932 self._gerrit_host = parsed_issue_arg.hostname
1933 self._gerrit_server = 'https://%s' % self._gerrit_host
1934
tandriic2405f52016-10-10 08:13:15 -07001935 try:
1936 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001937 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001938 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001939
1940 if not parsed_issue_arg.patchset:
1941 # Use current revision by default.
1942 revision_info = detail['revisions'][detail['current_revision']]
1943 patchset = int(revision_info['_number'])
1944 else:
1945 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001946 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001947 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1948 break
1949 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001950 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 (parsed_issue_arg.patchset, self.GetIssue()))
1952
Edward Lemur125d60a2019-09-13 18:25:41 +00001953 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001954 if remote_url.endswith('.git'):
1955 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001956 remote_url = remote_url.rstrip('/')
1957
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001958 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001959 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001960
1961 if remote_url != fetch_info['url']:
1962 DieWithError('Trying to patch a change from %s but this repo appears '
1963 'to be %s.' % (fetch_info['url'], remote_url))
1964
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001966
Aaron Gable62619a32017-06-16 08:22:09 -07001967 if force:
1968 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1969 print('Checked out commit for change %i patchset %i locally' %
1970 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001971 elif nocommit:
1972 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1973 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001974 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001975 RunGit(['cherry-pick', 'FETCH_HEAD'])
1976 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001977 (parsed_issue_arg.issue, patchset))
1978 print('Note: this created a local commit which does not have '
1979 'the same hash as the one uploaded for review. This will make '
1980 'uploading changes based on top of this branch difficult.\n'
1981 'If you want to do that, use "git cl patch --force" instead.')
1982
Stefan Zagerd08043c2017-10-12 12:07:02 -07001983 if self.GetBranch():
1984 self.SetIssue(parsed_issue_arg.issue)
1985 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001986 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001987 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1988 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1989 else:
1990 print('WARNING: You are in detached HEAD state.\n'
1991 'The patch has been applied to your checkout, but you will not be '
1992 'able to upload a new patch set to the gerrit issue.\n'
1993 'Try using the \'-b\' option if you would like to work on a '
1994 'branch and/or upload a new patch set.')
1995
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001996 return 0
1997
tandrii16e0b4e2016-06-07 10:34:28 -07001998 def _GerritCommitMsgHookCheck(self, offer_removal):
1999 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2000 if not os.path.exists(hook):
2001 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002002 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2003 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002004 data = gclient_utils.FileRead(hook)
2005 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2006 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002007 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002008 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002009 'and may interfere with it in subtle ways.\n'
2010 'We recommend you remove the commit-msg hook.')
2011 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002012 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002013 gclient_utils.rm_file_or_tree(hook)
2014 print('Gerrit commit-msg hook removed.')
2015 else:
2016 print('OK, will keep Gerrit commit-msg hook in place.')
2017
Edward Lemur1b52d872019-05-09 21:12:12 +00002018 def _CleanUpOldTraces(self):
2019 """Keep only the last |MAX_TRACES| traces."""
2020 try:
2021 traces = sorted([
2022 os.path.join(TRACES_DIR, f)
2023 for f in os.listdir(TRACES_DIR)
2024 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2025 and not f.startswith('tmp'))
2026 ])
2027 traces_to_delete = traces[:-MAX_TRACES]
2028 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002029 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002030 except OSError:
2031 print('WARNING: Failed to remove old git traces from\n'
2032 ' %s'
2033 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002034
Edward Lemur5737f022019-05-17 01:24:00 +00002035 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002036 """Zip and write the git push traces stored in traces_dir."""
2037 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002038 traces_zip = trace_name + '-traces'
2039 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002040 # Create a temporary dir to store git config and gitcookies in. It will be
2041 # compressed and stored next to the traces.
2042 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002043 git_info_zip = trace_name + '-git-info'
2044
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002045 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002046
Edward Lemur1b52d872019-05-09 21:12:12 +00002047 git_push_metadata['trace_name'] = trace_name
2048 gclient_utils.FileWrite(
2049 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2050
2051 # Keep only the first 6 characters of the git hashes on the packet
2052 # trace. This greatly decreases size after compression.
2053 packet_traces = os.path.join(traces_dir, 'trace-packet')
2054 if os.path.isfile(packet_traces):
2055 contents = gclient_utils.FileRead(packet_traces)
2056 gclient_utils.FileWrite(
2057 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2058 shutil.make_archive(traces_zip, 'zip', traces_dir)
2059
2060 # Collect and compress the git config and gitcookies.
2061 git_config = RunGit(['config', '-l'])
2062 gclient_utils.FileWrite(
2063 os.path.join(git_info_dir, 'git-config'),
2064 git_config)
2065
2066 cookie_auth = gerrit_util.Authenticator.get()
2067 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2068 gitcookies_path = cookie_auth.get_gitcookies_path()
2069 if os.path.isfile(gitcookies_path):
2070 gitcookies = gclient_utils.FileRead(gitcookies_path)
2071 gclient_utils.FileWrite(
2072 os.path.join(git_info_dir, 'gitcookies'),
2073 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2074 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2075
Edward Lemur1b52d872019-05-09 21:12:12 +00002076 gclient_utils.rmtree(git_info_dir)
2077
2078 def _RunGitPushWithTraces(
2079 self, change_desc, refspec, refspec_opts, git_push_metadata):
2080 """Run git push and collect the traces resulting from the execution."""
2081 # Create a temporary directory to store traces in. Traces will be compressed
2082 # and stored in a 'traces' dir inside depot_tools.
2083 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002084 trace_name = os.path.join(
2085 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002086
2087 env = os.environ.copy()
2088 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2089 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002090 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002091 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2092 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2093 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2094
2095 try:
2096 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002097 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002098 before_push = time_time()
2099 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002100 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002101 env=env,
2102 print_stdout=True,
2103 # Flush after every line: useful for seeing progress when running as
2104 # recipe.
2105 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002106 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002107 except subprocess2.CalledProcessError as e:
2108 push_returncode = e.returncode
2109 DieWithError('Failed to create a change. Please examine output above '
2110 'for the reason of the failure.\n'
2111 'Hint: run command below to diagnose common Git/Gerrit '
2112 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002113 ' git cl creds-check\n'
2114 '\n'
2115 'If git-cl is not working correctly, file a bug under the '
2116 'Infra>SDK component including the files below.\n'
2117 'Review the files before upload, since they might contain '
2118 'sensitive information.\n'
2119 'Set the Restrict-View-Google label so that they are not '
2120 'publicly accessible.\n'
2121 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002122 change_desc)
2123 finally:
2124 execution_time = time_time() - before_push
2125 metrics.collector.add_repeated('sub_commands', {
2126 'command': 'git push',
2127 'execution_time': execution_time,
2128 'exit_code': push_returncode,
2129 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2130 })
2131
Edward Lemur1b52d872019-05-09 21:12:12 +00002132 git_push_metadata['execution_time'] = execution_time
2133 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002134 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002135
Edward Lemur1b52d872019-05-09 21:12:12 +00002136 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002137 gclient_utils.rmtree(traces_dir)
2138
2139 return push_stdout
2140
Edward Lemura12175c2020-03-09 16:58:26 +00002141 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002142 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002143 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002144 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002145 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002146
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002147 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002148 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002149 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002150 # User requested to change description
2151 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002152 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002153 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002154 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002155 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002156 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002157 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002158 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002159 if len(change_ids) == 1:
2160 change_id = change_ids[0]
2161 else:
2162 change_id = GenerateGerritChangeId(change_desc.description)
2163 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002164
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002165 if options.preserve_tryjobs:
2166 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002167
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002168 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002169 parent = self._ComputeParent(
2170 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002171 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002172 with gclient_utils.temporary_file() as desc_tempfile:
2173 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2174 ref_to_push = RunGit(
2175 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002176 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002177 if not git_footers.get_footer_change_id(change_desc.description):
2178 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002179 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002180 self._AddChangeIdToCommitMessage(
2181 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002182 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002183 # For no-squash mode, we assume the remote called "origin" is the one we
2184 # want. It is not worthwhile to support different workflows for
2185 # no-squash mode.
2186 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002187 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2188
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002189 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002190 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2191 ref_to_push)]).splitlines()
2192 if len(commits) > 1:
2193 print('WARNING: This will upload %d commits. Run the following command '
2194 'to see which commits will be uploaded: ' % len(commits))
2195 print('git log %s..%s' % (parent, ref_to_push))
2196 print('You can also use `git squash-branch` to squash these into a '
2197 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002198 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002199
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002200 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002201 cc = []
2202 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2203 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2204 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002205 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002206 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002207 if options.cc:
2208 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002209 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002210 if change_desc.get_cced():
2211 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002212 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2213 valid_accounts = set(reviewers + cc)
2214 # TODO(crbug/877717): relax this for all hosts.
2215 else:
2216 valid_accounts = gerrit_util.ValidAccounts(
2217 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002218 logging.info('accounts %s are recognized, %s invalid',
2219 sorted(valid_accounts),
2220 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002221
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002222 # Extra options that can be specified at push time. Doc:
2223 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002224 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002225
Aaron Gable844cf292017-06-28 11:32:59 -07002226 # By default, new changes are started in WIP mode, and subsequent patchsets
2227 # don't send email. At any time, passing --send-mail will mark the change
2228 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002229 if options.send_mail:
2230 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002231 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002232 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002233 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002234 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002235 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002236
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002237 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002238 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002239
Edward Lemur5a644f82020-03-18 16:44:57 +00002240 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002241 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002242 # Punctuation and whitespace in |title| must be percent-encoded.
2243 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002244
agablec6787972016-09-09 16:13:34 -07002245 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002246 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002247
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002248 for r in sorted(reviewers):
2249 if r in valid_accounts:
2250 refspec_opts.append('r=%s' % r)
2251 reviewers.remove(r)
2252 else:
2253 # TODO(tandrii): this should probably be a hard failure.
2254 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2255 % r)
2256 for c in sorted(cc):
2257 # refspec option will be rejected if cc doesn't correspond to an
2258 # account, even though REST call to add such arbitrary cc may succeed.
2259 if c in valid_accounts:
2260 refspec_opts.append('cc=%s' % c)
2261 cc.remove(c)
2262
rmistry9eadede2016-09-19 11:22:43 -07002263 if options.topic:
2264 # Documentation on Gerrit topics is here:
2265 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002266 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002267
Edward Lemur687ca902018-12-05 02:30:30 +00002268 if options.enable_auto_submit:
2269 refspec_opts.append('l=Auto-Submit+1')
2270 if options.use_commit_queue:
2271 refspec_opts.append('l=Commit-Queue+2')
2272 elif options.cq_dry_run:
2273 refspec_opts.append('l=Commit-Queue+1')
2274
2275 if change_desc.get_reviewers(tbr_only=True):
2276 score = gerrit_util.GetCodeReviewTbrScore(
2277 self._GetGerritHost(),
2278 self._GetGerritProject())
2279 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002280
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002281 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002282 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002283 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002284 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002285 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2286
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002287 refspec_suffix = ''
2288 if refspec_opts:
2289 refspec_suffix = '%' + ','.join(refspec_opts)
2290 assert ' ' not in refspec_suffix, (
2291 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2292 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2293
Edward Lemur1b52d872019-05-09 21:12:12 +00002294 git_push_metadata = {
2295 'gerrit_host': self._GetGerritHost(),
2296 'title': title or '<untitled>',
2297 'change_id': change_id,
2298 'description': change_desc.description,
2299 }
2300 push_stdout = self._RunGitPushWithTraces(
2301 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302
2303 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002304 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002305 change_numbers = [m.group(1)
2306 for m in map(regex.match, push_stdout.splitlines())
2307 if m]
2308 if len(change_numbers) != 1:
2309 DieWithError(
2310 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002311 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002313 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002314
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002315 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002316 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002317 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002318 gerrit_util.AddReviewers(
2319 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002320 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002321 reviewers, cc,
2322 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002323
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002324 return 0
2325
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002326 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2327 change_desc):
2328 """Computes parent of the generated commit to be uploaded to Gerrit.
2329
2330 Returns revision or a ref name.
2331 """
2332 if custom_cl_base:
2333 # Try to avoid creating additional unintended CLs when uploading, unless
2334 # user wants to take this risk.
2335 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2336 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2337 local_ref_of_target_remote])
2338 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002339 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002340 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2341 'If you proceed with upload, more than 1 CL may be created by '
2342 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2343 'If you are certain that specified base `%s` has already been '
2344 'uploaded to Gerrit as another CL, you may proceed.\n' %
2345 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2346 if not force:
2347 confirm_or_exit(
2348 'Do you take responsibility for cleaning up potential mess '
2349 'resulting from proceeding with upload?',
2350 action='upload')
2351 return custom_cl_base
2352
Aaron Gablef97e33d2017-03-30 15:44:27 -07002353 if remote != '.':
2354 return self.GetCommonAncestorWithUpstream()
2355
2356 # If our upstream branch is local, we base our squashed commit on its
2357 # squashed version.
2358 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2359
Aaron Gablef97e33d2017-03-30 15:44:27 -07002360 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002361 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002362
2363 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002364 # TODO(tandrii): consider checking parent change in Gerrit and using its
2365 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2366 # the tree hash of the parent branch. The upside is less likely bogus
2367 # requests to reupload parent change just because it's uploadhash is
2368 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002369 parent = scm.GIT.GetBranchConfig(
2370 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002371 # Verify that the upstream branch has been uploaded too, otherwise
2372 # Gerrit will create additional CLs when uploading.
2373 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2374 RunGitSilent(['rev-parse', parent + ':'])):
2375 DieWithError(
2376 '\nUpload upstream branch %s first.\n'
2377 'It is likely that this branch has been rebased since its last '
2378 'upload, so you just need to upload it again.\n'
2379 '(If you uploaded it with --no-squash, then branch dependencies '
2380 'are not supported, and you should reupload with --squash.)'
2381 % upstream_branch_name,
2382 change_desc)
2383 return parent
2384
Edward Lemura12175c2020-03-09 16:58:26 +00002385 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002386 """Re-commits using the current message, assumes the commit hook is in
2387 place.
2388 """
Edward Lemura12175c2020-03-09 16:58:26 +00002389 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002390 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002391 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002392 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002393 return new_log_desc
2394 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002395 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396
tandriie113dfd2016-10-11 10:20:12 -07002397 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002398 try:
2399 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002400 except GerritChangeNotExists:
2401 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002402
2403 if data['status'] in ('ABANDONED', 'MERGED'):
2404 return 'CL %s is closed' % self.GetIssue()
2405
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002406 def GetGerritChange(self, patchset=None):
2407 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002408 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002409 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002410 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002411 data = self._GetChangeDetail(['ALL_REVISIONS'])
2412
2413 assert host and issue and patchset, 'CL must be uploaded first'
2414
2415 has_patchset = any(
2416 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002417 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002418 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002419 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002420 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002421
tandrii8c5a3532016-11-04 07:52:02 -07002422 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002423 'host': host,
2424 'change': issue,
2425 'project': data['project'],
2426 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002427 }
tandriie113dfd2016-10-11 10:20:12 -07002428
tandriide281ae2016-10-12 06:02:30 -07002429 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002430 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002431
Edward Lemur707d70b2018-02-07 00:50:14 +01002432 def GetReviewers(self):
2433 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002434 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002435
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002436
Lei Zhang8a0efc12020-08-05 19:58:45 +00002437def _get_bug_line_values(default_project_prefix, bugs):
2438 """Given default_project_prefix and comma separated list of bugs, yields bug
2439 line values.
tandriif9aefb72016-07-01 09:06:51 -07002440
2441 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002442 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002443 * string, which is left as is.
2444
2445 This function may produce more than one line, because bugdroid expects one
2446 project per line.
2447
Lei Zhang8a0efc12020-08-05 19:58:45 +00002448 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002449 ['v8:123', 'chromium:789']
2450 """
2451 default_bugs = []
2452 others = []
2453 for bug in bugs.split(','):
2454 bug = bug.strip()
2455 if bug:
2456 try:
2457 default_bugs.append(int(bug))
2458 except ValueError:
2459 others.append(bug)
2460
2461 if default_bugs:
2462 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002463 if default_project_prefix:
2464 if not default_project_prefix.endswith(':'):
2465 default_project_prefix += ':'
2466 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002467 else:
2468 yield default_bugs
2469 for other in sorted(others):
2470 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2471 yield other
2472
2473
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002474class ChangeDescription(object):
2475 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002476 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002477 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002478 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002479 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002480 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002481 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2482 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002483 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002484 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002485
Dan Beamd8b04ca2019-10-10 21:23:26 +00002486 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002487 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002488 if bug:
2489 regexp = re.compile(self.BUG_LINE)
2490 prefix = settings.GetBugPrefix()
2491 if not any((regexp.match(line) for line in self._description_lines)):
2492 values = list(_get_bug_line_values(prefix, bug))
2493 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002494 if fixed:
2495 regexp = re.compile(self.FIXED_LINE)
2496 prefix = settings.GetBugPrefix()
2497 if not any((regexp.match(line) for line in self._description_lines)):
2498 values = list(_get_bug_line_values(prefix, fixed))
2499 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002500
agable@chromium.org42c20792013-09-12 17:34:49 +00002501 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002502 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002503 return '\n'.join(self._description_lines)
2504
2505 def set_description(self, desc):
2506 if isinstance(desc, basestring):
2507 lines = desc.splitlines()
2508 else:
2509 lines = [line.rstrip() for line in desc]
2510 while lines and not lines[0]:
2511 lines.pop(0)
2512 while lines and not lines[-1]:
2513 lines.pop(-1)
2514 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002515
Edward Lemur5a644f82020-03-18 16:44:57 +00002516 def ensure_change_id(self, change_id):
2517 description = self.description
2518 footer_change_ids = git_footers.get_footer_change_id(description)
2519 # Make sure that the Change-Id in the description matches the given one.
2520 if footer_change_ids != [change_id]:
2521 if footer_change_ids:
2522 # Remove any existing Change-Id footers since they don't match the
2523 # expected change_id footer.
2524 description = git_footers.remove_footer(description, 'Change-Id')
2525 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2526 'if you want to set a new one.')
2527 # Add the expected Change-Id footer.
2528 description = git_footers.add_footer_change_id(description, change_id)
2529 self.set_description(description)
2530
Edward Lemur2c62b332020-03-12 22:12:33 +00002531 def update_reviewers(
2532 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002533 """Rewrites the R=/TBR= line(s) as a single line each.
2534
2535 Args:
2536 reviewers (list(str)) - list of additional emails to use for reviewers.
2537 tbrs (list(str)) - list of additional emails to use for TBRs.
2538 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2539 the change that are missing OWNER coverage. If this is not None, you
2540 must also pass a value for `change`.
2541 change (Change) - The Change that should be used for OWNERS lookups.
2542 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002543 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002544 assert isinstance(tbrs, list), tbrs
2545
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002546 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002547 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002548
2549 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002550 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002551
2552 reviewers = set(reviewers)
2553 tbrs = set(tbrs)
2554 LOOKUP = {
2555 'TBR': tbrs,
2556 'R': reviewers,
2557 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002558
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002559 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002560 regexp = re.compile(self.R_LINE)
2561 matches = [regexp.match(line) for line in self._description_lines]
2562 new_desc = [l for i, l in enumerate(self._description_lines)
2563 if not matches[i]]
2564 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002565
agable@chromium.org42c20792013-09-12 17:34:49 +00002566 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002567
2568 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002569 for match in matches:
2570 if not match:
2571 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002572 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2573
2574 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002575 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002576 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002577 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002578 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002579 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002580 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002581 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002582
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002583 # If any folks ended up in both groups, remove them from tbrs.
2584 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002585
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002586 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2587 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002588
2589 # Put the new lines in the description where the old first R= line was.
2590 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2591 if 0 <= line_loc < len(self._description_lines):
2592 if new_tbr_line:
2593 self._description_lines.insert(line_loc, new_tbr_line)
2594 if new_r_line:
2595 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002596 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002597 if new_r_line:
2598 self.append_footer(new_r_line)
2599 if new_tbr_line:
2600 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002601
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002602 def set_preserve_tryjobs(self):
2603 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2604 footers = git_footers.parse_footers(self.description)
2605 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2606 if v.lower() == 'true':
2607 return
2608 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2609
Anthony Polito8b955342019-09-24 19:01:36 +00002610 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002611 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002612 self.set_description([
2613 '# Enter a description of the change.',
2614 '# This will be displayed on the codereview site.',
2615 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002616 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002617 '--------------------',
2618 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002619 bug_regexp = re.compile(self.BUG_LINE)
2620 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002621 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002622 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2623 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002624 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002625
agable@chromium.org42c20792013-09-12 17:34:49 +00002626 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002627 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002628 if not content:
2629 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002630 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002631
Bruce Dawson2377b012018-01-11 16:46:49 -08002632 # Strip off comments and default inserted "Bug:" line.
2633 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002634 (line.startswith('#') or
2635 line.rstrip() == "Bug:" or
2636 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002637 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002638 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002639 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002640
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002641 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002642 """Adds a footer line to the description.
2643
2644 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2645 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2646 that Gerrit footers are always at the end.
2647 """
2648 parsed_footer_line = git_footers.parse_footer(line)
2649 if parsed_footer_line:
2650 # Line is a gerrit footer in the form: Footer-Key: any value.
2651 # Thus, must be appended observing Gerrit footer rules.
2652 self.set_description(
2653 git_footers.add_footer(self.description,
2654 key=parsed_footer_line[0],
2655 value=parsed_footer_line[1]))
2656 return
2657
2658 if not self._description_lines:
2659 self._description_lines.append(line)
2660 return
2661
2662 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2663 if gerrit_footers:
2664 # git_footers.split_footers ensures that there is an empty line before
2665 # actual (gerrit) footers, if any. We have to keep it that way.
2666 assert top_lines and top_lines[-1] == ''
2667 top_lines, separator = top_lines[:-1], top_lines[-1:]
2668 else:
2669 separator = [] # No need for separator if there are no gerrit_footers.
2670
2671 prev_line = top_lines[-1] if top_lines else ''
2672 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2673 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2674 top_lines.append('')
2675 top_lines.append(line)
2676 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002677
tandrii99a72f22016-08-17 14:33:24 -07002678 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002679 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002680 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002681 reviewers = [match.group(2).strip()
2682 for match in matches
2683 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002684 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002685
bradnelsond975b302016-10-23 12:20:23 -07002686 def get_cced(self):
2687 """Retrieves the list of reviewers."""
2688 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2689 cced = [match.group(2).strip() for match in matches if match]
2690 return cleanup_list(cced)
2691
Nodir Turakulov23b82142017-11-16 11:04:25 -08002692 def get_hash_tags(self):
2693 """Extracts and sanitizes a list of Gerrit hashtags."""
2694 subject = (self._description_lines or ('',))[0]
2695 subject = re.sub(
2696 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2697
2698 tags = []
2699 start = 0
2700 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2701 while True:
2702 m = bracket_exp.match(subject, start)
2703 if not m:
2704 break
2705 tags.append(self.sanitize_hash_tag(m.group(1)))
2706 start = m.end()
2707
2708 if not tags:
2709 # Try "Tag: " prefix.
2710 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2711 if m:
2712 tags.append(self.sanitize_hash_tag(m.group(1)))
2713 return tags
2714
2715 @classmethod
2716 def sanitize_hash_tag(cls, tag):
2717 """Returns a sanitized Gerrit hash tag.
2718
2719 A sanitized hashtag can be used as a git push refspec parameter value.
2720 """
2721 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2722
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002723
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002724def FindCodereviewSettingsFile(filename='codereview.settings'):
2725 """Finds the given file starting in the cwd and going up.
2726
2727 Only looks up to the top of the repository unless an
2728 'inherit-review-settings-ok' file exists in the root of the repository.
2729 """
2730 inherit_ok_file = 'inherit-review-settings-ok'
2731 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002732 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002733 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2734 root = '/'
2735 while True:
2736 if filename in os.listdir(cwd):
2737 if os.path.isfile(os.path.join(cwd, filename)):
2738 return open(os.path.join(cwd, filename))
2739 if cwd == root:
2740 break
2741 cwd = os.path.dirname(cwd)
2742
2743
2744def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002745 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002746 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002747
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002748 def SetProperty(name, setting, unset_error_ok=False):
2749 fullname = 'rietveld.' + name
2750 if setting in keyvals:
2751 RunGit(['config', fullname, keyvals[setting]])
2752 else:
2753 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2754
tandrii48df5812016-10-17 03:55:37 -07002755 if not keyvals.get('GERRIT_HOST', False):
2756 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002757 # Only server setting is required. Other settings can be absent.
2758 # In that case, we ignore errors raised during option deletion attempt.
2759 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2760 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2761 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002762 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002763 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2764 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002765 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2766 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002767 SetProperty(
2768 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002769
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002770 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002771 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002772
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002773 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002774 RunGit(['config', 'gerrit.squash-uploads',
2775 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002776
tandrii@chromium.org28253532016-04-14 13:46:56 +00002777 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002778 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002779 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2780
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002781 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002782 # should be of the form
2783 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2784 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002785 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2786 keyvals['ORIGIN_URL_CONFIG']])
2787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002788
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002789def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002790 """Downloads a network object to a local file, like urllib.urlretrieve.
2791
2792 This is necessary because urllib is broken for SSL connections via a proxy.
2793 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002794 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002795 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002796
2797
ukai@chromium.org712d6102013-11-27 00:52:58 +00002798def hasSheBang(fname):
2799 """Checks fname is a #! script."""
2800 with open(fname) as f:
2801 return f.read(2).startswith('#!')
2802
2803
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002804def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002805 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002806
2807 Args:
2808 force: True to update hooks. False to install hooks if not present.
2809 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002810 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002811 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2812 if not os.access(dst, os.X_OK):
2813 if os.path.exists(dst):
2814 if not force:
2815 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002816 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002817 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002818 if not hasSheBang(dst):
2819 DieWithError('Not a script: %s\n'
2820 'You need to download from\n%s\n'
2821 'into .git/hooks/commit-msg and '
2822 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002823 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2824 except Exception:
2825 if os.path.exists(dst):
2826 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002827 DieWithError('\nFailed to download hooks.\n'
2828 'You need to download from\n%s\n'
2829 'into .git/hooks/commit-msg and '
2830 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002831
2832
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002833class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002834 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002835
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002836 _GOOGLESOURCE = 'googlesource.com'
2837
2838 def __init__(self):
2839 # Cached list of [host, identity, source], where source is either
2840 # .gitcookies or .netrc.
2841 self._all_hosts = None
2842
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002843 def ensure_configured_gitcookies(self):
2844 """Runs checks and suggests fixes to make git use .gitcookies from default
2845 path."""
2846 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2847 configured_path = RunGitSilent(
2848 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002849 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002850 if configured_path:
2851 self._ensure_default_gitcookies_path(configured_path, default)
2852 else:
2853 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002854
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002855 @staticmethod
2856 def _ensure_default_gitcookies_path(configured_path, default_path):
2857 assert configured_path
2858 if configured_path == default_path:
2859 print('git is already configured to use your .gitcookies from %s' %
2860 configured_path)
2861 return
2862
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002863 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002864 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2865 (configured_path, default_path))
2866
2867 if not os.path.exists(configured_path):
2868 print('However, your configured .gitcookies file is missing.')
2869 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2870 action='reconfigure')
2871 RunGit(['config', '--global', 'http.cookiefile', default_path])
2872 return
2873
2874 if os.path.exists(default_path):
2875 print('WARNING: default .gitcookies file already exists %s' %
2876 default_path)
2877 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2878 default_path)
2879
2880 confirm_or_exit('Move existing .gitcookies to default location?',
2881 action='move')
2882 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002883 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002884 print('Moved and reconfigured git to use .gitcookies from %s' %
2885 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002886
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002887 @staticmethod
2888 def _configure_gitcookies_path(default_path):
2889 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2890 if os.path.exists(netrc_path):
2891 print('You seem to be using outdated .netrc for git credentials: %s' %
2892 netrc_path)
2893 print('This tool will guide you through setting up recommended '
2894 '.gitcookies store for git credentials.\n'
2895 '\n'
2896 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2897 ' git config --global --unset http.cookiefile\n'
2898 ' mv %s %s.backup\n\n' % (default_path, default_path))
2899 confirm_or_exit(action='setup .gitcookies')
2900 RunGit(['config', '--global', 'http.cookiefile', default_path])
2901 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002902
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002903 def get_hosts_with_creds(self, include_netrc=False):
2904 if self._all_hosts is None:
2905 a = gerrit_util.CookiesAuthenticator()
2906 self._all_hosts = [
2907 (h, u, s)
2908 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002909 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2910 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002911 )
2912 if h.endswith(self._GOOGLESOURCE)
2913 ]
2914
2915 if include_netrc:
2916 return self._all_hosts
2917 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2918
2919 def print_current_creds(self, include_netrc=False):
2920 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2921 if not hosts:
2922 print('No Git/Gerrit credentials found')
2923 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002924 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002925 header = [('Host', 'User', 'Which file'),
2926 ['=' * l for l in lengths]]
2927 for row in (header + hosts):
2928 print('\t'.join((('%%+%ds' % l) % s)
2929 for l, s in zip(lengths, row)))
2930
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002931 @staticmethod
2932 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002933 """Parses identity "git-<username>.domain" into <username> and domain."""
2934 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002935 # distinguishable from sub-domains. But we do know typical domains:
2936 if identity.endswith('.chromium.org'):
2937 domain = 'chromium.org'
2938 username = identity[:-len('.chromium.org')]
2939 else:
2940 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002941 if username.startswith('git-'):
2942 username = username[len('git-'):]
2943 return username, domain
2944
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002945 def _canonical_git_googlesource_host(self, host):
2946 """Normalizes Gerrit hosts (with '-review') to Git host."""
2947 assert host.endswith(self._GOOGLESOURCE)
2948 # Prefix doesn't include '.' at the end.
2949 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2950 if prefix.endswith('-review'):
2951 prefix = prefix[:-len('-review')]
2952 return prefix + '.' + self._GOOGLESOURCE
2953
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002954 def _canonical_gerrit_googlesource_host(self, host):
2955 git_host = self._canonical_git_googlesource_host(host)
2956 prefix = git_host.split('.', 1)[0]
2957 return prefix + '-review.' + self._GOOGLESOURCE
2958
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002959 def _get_counterpart_host(self, host):
2960 assert host.endswith(self._GOOGLESOURCE)
2961 git = self._canonical_git_googlesource_host(host)
2962 gerrit = self._canonical_gerrit_googlesource_host(git)
2963 return git if gerrit == host else gerrit
2964
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002965 def has_generic_host(self):
2966 """Returns whether generic .googlesource.com has been configured.
2967
2968 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2969 """
2970 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2971 if host == '.' + self._GOOGLESOURCE:
2972 return True
2973 return False
2974
2975 def _get_git_gerrit_identity_pairs(self):
2976 """Returns map from canonic host to pair of identities (Git, Gerrit).
2977
2978 One of identities might be None, meaning not configured.
2979 """
2980 host_to_identity_pairs = {}
2981 for host, identity, _ in self.get_hosts_with_creds():
2982 canonical = self._canonical_git_googlesource_host(host)
2983 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2984 idx = 0 if canonical == host else 1
2985 pair[idx] = identity
2986 return host_to_identity_pairs
2987
2988 def get_partially_configured_hosts(self):
2989 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002990 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002991 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002992 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002993
2994 def get_conflicting_hosts(self):
2995 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002996 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002997 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002998 if None not in (i1, i2) and i1 != i2)
2999
3000 def get_duplicated_hosts(self):
3001 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003002 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003003
3004 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3005 'chromium.googlesource.com': 'chromium.org',
3006 'chrome-internal.googlesource.com': 'google.com',
3007 }
3008
3009 def get_hosts_with_wrong_identities(self):
3010 """Finds hosts which **likely** reference wrong identities.
3011
3012 Note: skips hosts which have conflicting identities for Git and Gerrit.
3013 """
3014 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003015 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003016 pair = self._get_git_gerrit_identity_pairs().get(host)
3017 if pair and pair[0] == pair[1]:
3018 _, domain = self._parse_identity(pair[0])
3019 if domain != expected:
3020 hosts.add(host)
3021 return hosts
3022
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003023 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003024 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003025 hosts = sorted(hosts)
3026 assert hosts
3027 if extra_column_func is None:
3028 extras = [''] * len(hosts)
3029 else:
3030 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003031 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3032 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003033 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003034 lines.append(tmpl % he)
3035 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003036
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003037 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003038 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003039 yield ('.googlesource.com wildcard record detected',
3040 ['Chrome Infrastructure team recommends to list full host names '
3041 'explicitly.'],
3042 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003043
3044 dups = self.get_duplicated_hosts()
3045 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003046 yield ('The following hosts were defined twice',
3047 self._format_hosts(dups),
3048 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003049
3050 partial = self.get_partially_configured_hosts()
3051 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003052 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3053 'These hosts are missing',
3054 self._format_hosts(partial, lambda host: 'but %s defined' %
3055 self._get_counterpart_host(host)),
3056 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003057
3058 conflicting = self.get_conflicting_hosts()
3059 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003060 yield ('The following Git hosts have differing credentials from their '
3061 'Gerrit counterparts',
3062 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3063 tuple(self._get_git_gerrit_identity_pairs()[host])),
3064 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003065
3066 wrong = self.get_hosts_with_wrong_identities()
3067 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003068 yield ('These hosts likely use wrong identity',
3069 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3070 (self._get_git_gerrit_identity_pairs()[host][0],
3071 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3072 wrong)
3073
3074 def find_and_report_problems(self):
3075 """Returns True if there was at least one problem, else False."""
3076 found = False
3077 bad_hosts = set()
3078 for title, sublines, hosts in self._find_problems():
3079 if not found:
3080 found = True
3081 print('\n\n.gitcookies problem report:\n')
3082 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003083 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003084 if sublines:
3085 print()
3086 print(' %s' % '\n '.join(sublines))
3087 print()
3088
3089 if bad_hosts:
3090 assert found
3091 print(' You can manually remove corresponding lines in your %s file and '
3092 'visit the following URLs with correct account to generate '
3093 'correct credential lines:\n' %
3094 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3095 print(' %s' % '\n '.join(sorted(set(
3096 gerrit_util.CookiesAuthenticator().get_new_password_url(
3097 self._canonical_git_googlesource_host(host))
3098 for host in bad_hosts
3099 ))))
3100 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003101
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003102
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003103@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003104def CMDcreds_check(parser, args):
3105 """Checks credentials and suggests changes."""
3106 _, _ = parser.parse_args(args)
3107
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003108 # Code below checks .gitcookies. Abort if using something else.
3109 authn = gerrit_util.Authenticator.get()
3110 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003111 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003112 'This command is not designed for bot environment. It checks '
3113 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003114 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3115 if isinstance(authn, gerrit_util.GceAuthenticator):
3116 message += (
3117 '\n'
3118 'If you need to run this on GCE or a cloudtop instance, '
3119 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3120 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003121
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003122 checker = _GitCookiesChecker()
3123 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003124
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003125 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003126 checker.print_current_creds(include_netrc=True)
3127
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003128 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003129 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003130 return 0
3131 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003132
3133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003134@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003135def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003136 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003137 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003138 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003139 _, args = parser.parse_args(args)
3140 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003141 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003142 return RunGit(['config', 'branch.%s.base-url' % branch],
3143 error_ok=False).strip()
3144 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003145 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003146 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3147 error_ok=False).strip()
3148
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003149
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003150def color_for_status(status):
3151 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003152 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003153 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003154 'unsent': BOLD + Fore.YELLOW,
3155 'waiting': BOLD + Fore.RED,
3156 'reply': BOLD + Fore.YELLOW,
3157 'not lgtm': BOLD + Fore.RED,
3158 'lgtm': BOLD + Fore.GREEN,
3159 'commit': BOLD + Fore.MAGENTA,
3160 'closed': BOLD + Fore.CYAN,
3161 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003162 }.get(status, Fore.WHITE)
3163
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003164
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003165def get_cl_statuses(changes, fine_grained, max_processes=None):
3166 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003167
3168 If fine_grained is true, this will fetch CL statuses from the server.
3169 Otherwise, simply indicate if there's a matching url for the given branches.
3170
3171 If max_processes is specified, it is used as the maximum number of processes
3172 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3173 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003174
3175 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003176 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003177 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003178 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003179
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003180 if not fine_grained:
3181 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003182 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003183 for cl in changes:
3184 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003185 return
3186
3187 # First, sort out authentication issues.
3188 logging.debug('ensuring credentials exist')
3189 for cl in changes:
3190 cl.EnsureAuthenticated(force=False, refresh=True)
3191
3192 def fetch(cl):
3193 try:
3194 return (cl, cl.GetStatus())
3195 except:
3196 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003197 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003198 raise
3199
3200 threads_count = len(changes)
3201 if max_processes:
3202 threads_count = max(1, min(threads_count, max_processes))
3203 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3204
Edward Lemur61bf4172020-02-24 23:22:37 +00003205 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003206 fetched_cls = set()
3207 try:
3208 it = pool.imap_unordered(fetch, changes).__iter__()
3209 while True:
3210 try:
3211 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003212 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003213 break
3214 fetched_cls.add(cl)
3215 yield cl, status
3216 finally:
3217 pool.close()
3218
3219 # Add any branches that failed to fetch.
3220 for cl in set(changes) - fetched_cls:
3221 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003222
rmistry@google.com2dd99862015-06-22 12:22:18 +00003223
Jose Lopes3863fc52020-04-07 17:00:25 +00003224def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003225 """Uploads CLs of local branches that are dependents of the current branch.
3226
3227 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003228
3229 test1 -> test2.1 -> test3.1
3230 -> test3.2
3231 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003232
3233 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3234 run on the dependent branches in this order:
3235 test2.1, test3.1, test3.2, test2.2, test3.3
3236
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003237 Note: This function does not rebase your local dependent branches. Use it
3238 when you make a change to the parent branch that will not conflict
3239 with its dependent branches, and you would like their dependencies
3240 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003241 """
3242 if git_common.is_dirty_git_tree('upload-branch-deps'):
3243 return 1
3244
3245 root_branch = cl.GetBranch()
3246 if root_branch is None:
3247 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3248 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003249 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003250 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3251 'patchset dependencies without an uploaded CL.')
3252
3253 branches = RunGit(['for-each-ref',
3254 '--format=%(refname:short) %(upstream:short)',
3255 'refs/heads'])
3256 if not branches:
3257 print('No local branches found.')
3258 return 0
3259
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003260 # Create a dictionary of all local branches to the branches that are
3261 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003262 tracked_to_dependents = collections.defaultdict(list)
3263 for b in branches.splitlines():
3264 tokens = b.split()
3265 if len(tokens) == 2:
3266 branch_name, tracked = tokens
3267 tracked_to_dependents[tracked].append(branch_name)
3268
vapiera7fbd5a2016-06-16 09:17:49 -07003269 print()
3270 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003271 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003272
rmistry@google.com2dd99862015-06-22 12:22:18 +00003273 def traverse_dependents_preorder(branch, padding=''):
3274 dependents_to_process = tracked_to_dependents.get(branch, [])
3275 padding += ' '
3276 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003277 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003278 dependents.append(dependent)
3279 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003280
rmistry@google.com2dd99862015-06-22 12:22:18 +00003281 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003282 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003283
3284 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003285 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003286 return 0
3287
Jose Lopes3863fc52020-04-07 17:00:25 +00003288 if not force:
3289 confirm_or_exit('This command will checkout all dependent branches and run '
3290 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003291
rmistry@google.com2dd99862015-06-22 12:22:18 +00003292 # Record all dependents that failed to upload.
3293 failures = {}
3294 # Go through all dependents, checkout the branch and upload.
3295 try:
3296 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003297 print()
3298 print('--------------------------------------')
3299 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003300 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003301 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003302 try:
3303 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003304 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003305 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003306 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003307 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003308 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003309 finally:
3310 # Swap back to the original root branch.
3311 RunGit(['checkout', '-q', root_branch])
3312
vapiera7fbd5a2016-06-16 09:17:49 -07003313 print()
3314 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003315 for dependent_branch in dependents:
3316 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003317 print(' %s : %s' % (dependent_branch, upload_status))
3318 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003319
3320 return 0
3321
3322
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003323def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003324 """Given a proposed tag name, returns a tag name that is guaranteed to be
3325 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3326 or 'foo-3', and so on."""
3327
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003328 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003329 for suffix_num in itertools.count(1):
3330 if suffix_num == 1:
3331 to_check = proposed_tag
3332 else:
3333 to_check = '%s-%d' % (proposed_tag, suffix_num)
3334
3335 if to_check not in existing_tags:
3336 return to_check
3337
3338
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003339@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003340def CMDarchive(parser, args):
3341 """Archives and deletes branches associated with closed changelists."""
3342 parser.add_option(
3343 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003344 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003345 parser.add_option(
3346 '-f', '--force', action='store_true',
3347 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003348 parser.add_option(
3349 '-d', '--dry-run', action='store_true',
3350 help='Skip the branch tagging and removal steps.')
3351 parser.add_option(
3352 '-t', '--notags', action='store_true',
3353 help='Do not tag archived branches. '
3354 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003355 parser.add_option(
3356 '-p',
3357 '--pattern',
3358 default='git-cl-archived-{issue}-{branch}',
3359 help='Format string for archive tags. '
3360 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003361
kmarshall3bff56b2016-06-06 18:31:47 -07003362 options, args = parser.parse_args(args)
3363 if args:
3364 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003365
3366 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3367 if not branches:
3368 return 0
3369
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003370 tags = RunGit(['for-each-ref', '--format=%(refname)',
3371 'refs/tags']).splitlines() or []
3372 tags = [t.split('/')[-1] for t in tags]
3373
vapiera7fbd5a2016-06-16 09:17:49 -07003374 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003375 changes = [Changelist(branchref=b)
3376 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003377 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3378 statuses = get_cl_statuses(changes,
3379 fine_grained=True,
3380 max_processes=options.maxjobs)
3381 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003382 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3383 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003384 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003385 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003386 proposal.sort()
3387
3388 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003389 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003390 return 0
3391
Edward Lemur85153282020-02-14 22:06:29 +00003392 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003393
vapiera7fbd5a2016-06-16 09:17:49 -07003394 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003395 if options.notags:
3396 for next_item in proposal:
3397 print(' ' + next_item[0])
3398 else:
3399 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3400 for next_item in proposal:
3401 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003402
kmarshall9249e012016-08-23 12:02:16 -07003403 # Quit now on precondition failure or if instructed by the user, either
3404 # via an interactive prompt or by command line flags.
3405 if options.dry_run:
3406 print('\nNo changes were made (dry run).\n')
3407 return 0
3408 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003409 print('You are currently on a branch \'%s\' which is associated with a '
3410 'closed codereview issue, so archive cannot proceed. Please '
3411 'checkout another branch and run this command again.' %
3412 current_branch)
3413 return 1
kmarshall9249e012016-08-23 12:02:16 -07003414 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003415 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003416 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003417 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003418 return 1
3419
3420 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003421 if not options.notags:
3422 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003423
3424 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3425 # Clean up the tag if we failed to delete the branch.
3426 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003427
vapiera7fbd5a2016-06-16 09:17:49 -07003428 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003429
3430 return 0
3431
3432
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003433@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003434def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003435 """Show status of changelists.
3436
3437 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003438 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003439 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003440 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003441 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003442 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003443 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003444 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003445
3446 Also see 'git cl comments'.
3447 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003448 parser.add_option(
3449 '--no-branch-color',
3450 action='store_true',
3451 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003453 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003454 parser.add_option('-f', '--fast', action='store_true',
3455 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003456 parser.add_option(
3457 '-j', '--maxjobs', action='store', type=int,
3458 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003459 parser.add_option(
3460 '-i', '--issue', type=int,
3461 help='Operate on this issue instead of the current branch\'s implicit '
3462 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003463 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003464 if args:
3465 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003466
iannuccie53c9352016-08-17 14:40:40 -07003467 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003468 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003469
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003470 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003471 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003472 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003473 if cl.GetIssue():
3474 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003475 elif options.field == 'id':
3476 issueid = cl.GetIssue()
3477 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003478 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003479 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003480 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003481 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003482 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003483 elif options.field == 'status':
3484 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003485 elif options.field == 'url':
3486 url = cl.GetIssueURL()
3487 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003489 return 0
3490
3491 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3492 if not branches:
3493 print('No local branch found.')
3494 return 0
3495
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003496 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003497 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003498 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003499 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003500 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003501 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003502 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003503
Edward Lemur85153282020-02-14 22:06:29 +00003504 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003505
3506 def FormatBranchName(branch, colorize=False):
3507 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3508 an asterisk when it is the current branch."""
3509
3510 asterisk = ""
3511 color = Fore.RESET
3512 if branch == current_branch:
3513 asterisk = "* "
3514 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003515 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003516
3517 if colorize:
3518 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003519 return asterisk + branch_name
3520
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003521 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003522
3523 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003524 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3525 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003526 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003527 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003528 branch_statuses[c.GetBranch()] = status
3529 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003530 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003531 if url and (not status or status == 'error'):
3532 # The issue probably doesn't exist anymore.
3533 url += ' (broken)'
3534
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003535 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003536 # Turn off bold as well as colors.
3537 END = '\033[0m'
3538 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003539 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003540 color = ''
3541 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003542 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003543
Alan Cuttera3be9a52019-03-04 18:50:33 +00003544 branch_display = FormatBranchName(branch)
3545 padding = ' ' * (alignment - len(branch_display))
3546 if not options.no_branch_color:
3547 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003548
Alan Cuttera3be9a52019-03-04 18:50:33 +00003549 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3550 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003551
vapiera7fbd5a2016-06-16 09:17:49 -07003552 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003553 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003554 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003555 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003556 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003557 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003559 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003560 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003561 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003563 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003564 return 0
3565
3566
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003567def colorize_CMDstatus_doc():
3568 """To be called once in main() to add colors to git cl status help."""
3569 colors = [i for i in dir(Fore) if i[0].isupper()]
3570
3571 def colorize_line(line):
3572 for color in colors:
3573 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003574 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003575 indent = len(line) - len(line.lstrip(' ')) + 1
3576 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3577 return line
3578
3579 lines = CMDstatus.__doc__.splitlines()
3580 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3581
3582
phajdan.jre328cf92016-08-22 04:12:17 -07003583def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003584 if path == '-':
3585 json.dump(contents, sys.stdout)
3586 else:
3587 with open(path, 'w') as f:
3588 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003589
3590
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003591@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003592@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003593def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003594 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003595
3596 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003597 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003598 parser.add_option('-r', '--reverse', action='store_true',
3599 help='Lookup the branch(es) for the specified issues. If '
3600 'no issues are specified, all branches with mapped '
3601 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003602 parser.add_option('--json',
3603 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003604 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003605
dnj@chromium.org406c4402015-03-03 17:22:28 +00003606 if options.reverse:
3607 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003608 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003609 # Reverse issue lookup.
3610 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003611
3612 git_config = {}
3613 for config in RunGit(['config', '--get-regexp',
3614 r'branch\..*issue']).splitlines():
3615 name, _space, val = config.partition(' ')
3616 git_config[name] = val
3617
dnj@chromium.org406c4402015-03-03 17:22:28 +00003618 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003619 issue = git_config.get(
3620 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003621 if issue:
3622 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003623 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003624 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003625 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003626 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003627 try:
3628 issue_num = int(issue)
3629 except ValueError:
3630 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003631 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003632 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003633 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003634 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003635 if options.json:
3636 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003637 return 0
3638
3639 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003640 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003641 if not issue.valid:
3642 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3643 'or no argument to list it.\n'
3644 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003645 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003646 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003647 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003648 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003649 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3650 if options.json:
3651 write_json(options.json, {
3652 'issue': cl.GetIssue(),
3653 'issue_url': cl.GetIssueURL(),
3654 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003655 return 0
3656
3657
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003658@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003659def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003660 """Shows or posts review comments for any changelist."""
3661 parser.add_option('-a', '--add-comment', dest='comment',
3662 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003663 parser.add_option('-p', '--publish', action='store_true',
3664 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003665 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003666 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003667 parser.add_option('-m', '--machine-readable', dest='readable',
3668 action='store_false', default=True,
3669 help='output comments in a format compatible with '
3670 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003671 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003672 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003673 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003674
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003675 issue = None
3676 if options.issue:
3677 try:
3678 issue = int(options.issue)
3679 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003680 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003681
Edward Lemur934836a2019-09-09 20:16:54 +00003682 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003683
3684 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003685 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003686 return 0
3687
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003688 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3689 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003690 for comment in summary:
3691 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003692 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003693 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003694 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003695 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003696 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003697 elif comment.autogenerated:
3698 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003699 else:
3700 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003701 print('\n%s%s %s%s\n%s' % (
3702 color,
3703 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3704 comment.sender,
3705 Fore.RESET,
3706 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3707
smut@google.comc85ac942015-09-15 16:34:43 +00003708 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003709 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003710 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003711 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3712 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003713 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003714 return 0
3715
3716
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003717@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003718@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003719def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003720 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003721 parser.add_option('-d', '--display', action='store_true',
3722 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003723 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003724 help='New description to set for this issue (- for stdin, '
3725 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003726 parser.add_option('-f', '--force', action='store_true',
3727 help='Delete any unpublished Gerrit edits for this issue '
3728 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003729
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003730 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003731
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003732 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003733 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003734 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003735 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003736 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003737
Edward Lemur934836a2019-09-09 20:16:54 +00003738 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003739 if target_issue_arg:
3740 kwargs['issue'] = target_issue_arg.issue
3741 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003742
3743 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003744 if not cl.GetIssue():
3745 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003746
Edward Lemur678a6842019-10-03 22:25:05 +00003747 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003748 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003749
Edward Lemur6c6827c2020-02-06 21:15:18 +00003750 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003751
smut@google.com34fb6b12015-07-13 20:03:26 +00003752 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003754 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003755
3756 if options.new_description:
3757 text = options.new_description
3758 if text == '-':
3759 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003760 elif text == '+':
3761 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003762 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003763
3764 description.set_description(text)
3765 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003766 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003767 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003768 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003769 return 0
3770
3771
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003772@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003773def CMDlint(parser, args):
3774 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003775 parser.add_option('--filter', action='append', metavar='-x,+y',
3776 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003777 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003778
3779 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003780 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003781 try:
3782 import cpplint
3783 import cpplint_chromium
3784 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003785 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003786 return 1
3787
3788 # Change the current working directory before calling lint so that it
3789 # shows the correct base.
3790 previous_cwd = os.getcwd()
3791 os.chdir(settings.GetRoot())
3792 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003793 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003794 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003795 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003796 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003797 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003798
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003799 # Process cpplint arguments, if any.
3800 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3801 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003802 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003803
Lei Zhang379d1ad2020-07-15 19:40:06 +00003804 include_regex = re.compile(settings.GetLintRegex())
3805 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003806 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3807 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003808 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003810 continue
3811
3812 if ignore_regex.match(filename):
3813 print('Ignoring file %s' % filename)
3814 continue
3815
3816 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3817 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003818 finally:
3819 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003820 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003821 if cpplint._cpplint_state.error_count != 0:
3822 return 1
3823 return 0
3824
3825
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003826@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003828 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003829 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003830 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003831 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003832 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003833 parser.add_option('--all', action='store_true',
3834 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003835 parser.add_option('--parallel', action='store_true',
3836 help='Run all tests specified by input_api.RunTests in all '
3837 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003838 parser.add_option('--resultdb', action='store_true',
3839 help='Run presubmit checks in the ResultSink environment '
3840 'and send results to the ResultDB database.')
Saagar Sanghavidba1d652020-08-05 23:55:14 +00003841 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003842 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003843
sbc@chromium.org71437c02015-04-09 19:29:40 +00003844 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003845 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003846 return 1
3847
Edward Lemur934836a2019-09-09 20:16:54 +00003848 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849 if args:
3850 base_branch = args[0]
3851 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003852 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003853 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003854
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003855 if cl.GetIssue():
3856 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003857 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003858 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003859
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003860 cl.RunHook(
3861 committing=not options.upload,
3862 may_prompt=False,
3863 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003864 parallel=options.parallel,
3865 upstream=base_branch,
3866 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003867 all_files=options.all,
Saagar Sanghavidba1d652020-08-05 23:55:14 +00003868 resultdb=options.resultdb,
3869 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003870 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871
3872
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003873def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003874 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003875
3876 Works the same way as
3877 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3878 but can be called on demand on all platforms.
3879
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003880 The basic idea is to generate git hash of a state of the tree, original
3881 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003882 """
3883 lines = []
3884 tree_hash = RunGitSilent(['write-tree'])
3885 lines.append('tree %s' % tree_hash.strip())
3886 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3887 if code == 0:
3888 lines.append('parent %s' % parent.strip())
3889 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3890 lines.append('author %s' % author.strip())
3891 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3892 lines.append('committer %s' % committer.strip())
3893 lines.append('')
3894 # Note: Gerrit's commit-hook actually cleans message of some lines and
3895 # whitespace. This code is not doing this, but it clearly won't decrease
3896 # entropy.
3897 lines.append(message)
3898 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003899 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003900 return 'I%s' % change_hash.strip()
3901
3902
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003903def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003904 """Computes the remote branch ref to use for the CL.
3905
3906 Args:
3907 remote (str): The git remote for the CL.
3908 remote_branch (str): The git remote branch for the CL.
3909 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003910 """
3911 if not (remote and remote_branch):
3912 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003913
wittman@chromium.org455dc922015-01-26 20:15:50 +00003914 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003915 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003916 # refs, which are then translated into the remote full symbolic refs
3917 # below.
3918 if '/' not in target_branch:
3919 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3920 else:
3921 prefix_replacements = (
3922 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3923 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3924 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3925 )
3926 match = None
3927 for regex, replacement in prefix_replacements:
3928 match = re.search(regex, target_branch)
3929 if match:
3930 remote_branch = target_branch.replace(match.group(0), replacement)
3931 break
3932 if not match:
3933 # This is a branch path but not one we recognize; use as-is.
3934 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003935 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3936 # Handle the refs that need to land in different refs.
3937 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003938
wittman@chromium.org455dc922015-01-26 20:15:50 +00003939 # Create the true path to the remote branch.
3940 # Does the following translation:
3941 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3942 # * refs/remotes/origin/master -> refs/heads/master
3943 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3944 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3945 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3946 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3947 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3948 'refs/heads/')
3949 elif remote_branch.startswith('refs/remotes/branch-heads'):
3950 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003951
wittman@chromium.org455dc922015-01-26 20:15:50 +00003952 return remote_branch
3953
3954
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003955def cleanup_list(l):
3956 """Fixes a list so that comma separated items are put as individual items.
3957
3958 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3959 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3960 """
3961 items = sum((i.split(',') for i in l), [])
3962 stripped_items = (i.strip() for i in items)
3963 return sorted(filter(None, stripped_items))
3964
3965
Aaron Gable4db38df2017-11-03 14:59:07 -07003966@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003967@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003968def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003969 """Uploads the current changelist to codereview.
3970
3971 Can skip dependency patchset uploads for a branch by running:
3972 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003973 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003974 git config --unset branch.branch_name.skip-deps-uploads
3975 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003976
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003977 If the name of the checked out branch starts with "bug-" or "fix-" followed
3978 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003979 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003980
3981 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003982 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003983 [git-cl] add support for hashtags
3984 Foo bar: implement foo
3985 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00003986 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003987 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3988 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003989 parser.add_option('--bypass-watchlists', action='store_true',
3990 dest='bypass_watchlists',
3991 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07003992 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003993 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003994 parser.add_option('--message', '-m', dest='message',
3995 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003996 parser.add_option('-b', '--bug',
3997 help='pre-populate the bug number(s) for this issue. '
3998 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003999 parser.add_option('--message-file', dest='message_file',
4000 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004001 parser.add_option('--title', '-t', dest='title',
4002 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004003 parser.add_option('-T', '--skip-title', action='store_true',
4004 dest='skip_title',
4005 help='Use the most recent commit message as the title of '
4006 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004007 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004008 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004009 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004010 parser.add_option('--tbrs',
4011 action='append', default=[],
4012 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004013 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004014 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004015 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004016 parser.add_option('--hashtag', dest='hashtags',
4017 action='append', default=[],
4018 help=('Gerrit hashtag for new CL; '
4019 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004020 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004021 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004022 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004023 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004024 metavar='TARGET',
4025 help='Apply CL to remote ref TARGET. ' +
4026 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004027 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004028 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004029 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004030 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004031 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004032 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004033 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4034 const='TBR', help='add a set of OWNERS to TBR')
4035 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4036 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004037 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004038 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004039 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004040 'implies --send-mail')
4041 parser.add_option('-d', '--cq-dry-run',
4042 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004043 help='Send the patchset to do a CQ dry run right after '
4044 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004045 parser.add_option('--preserve-tryjobs', action='store_true',
4046 help='instruct the CQ to let tryjobs running even after '
4047 'new patchsets are uploaded instead of canceling '
4048 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004049 parser.add_option('--dependencies', action='store_true',
4050 help='Uploads CLs of all the local branches that depend on '
4051 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004052 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4053 help='Sends your change to the CQ after an approval. Only '
4054 'works on repos that have the Auto-Submit label '
4055 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004056 parser.add_option('--parallel', action='store_true',
4057 help='Run all tests specified by input_api.RunTests in all '
4058 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004059 parser.add_option('--no-autocc', action='store_true',
4060 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004061 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004062 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004063 parser.add_option('-R', '--retry-failed', action='store_true',
4064 help='Retry failed tryjobs from old patchset immediately '
4065 'after uploading new patchset. Cannot be used with '
4066 '--use-commit-queue or --cq-dry-run.')
4067 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4068 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004069 parser.add_option('--fixed', '-x',
4070 help='List of bugs that will be commented on and marked '
4071 'fixed (pre-populates "Fixed:" tag). Same format as '
4072 '-b option / "Bug:" tag. If fixing several issues, '
4073 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004074 parser.add_option('--edit-description', action='store_true', default=False,
4075 help='Modify description before upload. Cannot be used '
4076 'with --force. It is a noop when --no-squash is set '
4077 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004078 parser.add_option('--git-completion-helper', action="store_true",
4079 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004080 parser.add_option('--resultdb', action='store_true',
4081 help='Run presubmit checks in the ResultSink environment '
4082 'and send results to the ResultDB database.')
Saagar Sanghavidba1d652020-08-05 23:55:14 +00004083 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004084
rmistry@google.com2dd99862015-06-22 12:22:18 +00004085 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004086 (options, args) = parser.parse_args(args)
4087
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004088 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004089 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4090 if opt.help != optparse.SUPPRESS_HELP))
4091 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004092
sbc@chromium.org71437c02015-04-09 19:29:40 +00004093 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004094 return 1
4095
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004096 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004097 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004098 options.cc = cleanup_list(options.cc)
4099
Josipe827b0f2020-01-30 00:07:20 +00004100 if options.edit_description and options.force:
4101 parser.error('Only one of --force and --edit-description allowed')
4102
tandriib80458a2016-06-23 12:20:07 -07004103 if options.message_file:
4104 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004105 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004106 options.message = gclient_utils.FileRead(options.message_file)
4107 options.message_file = None
4108
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004109 if ([options.cq_dry_run,
4110 options.use_commit_queue,
4111 options.retry_failed].count(True) > 1):
4112 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4113 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004114
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004115 if options.skip_title and options.title:
4116 parser.error('Only one of --title and --skip-title allowed.')
4117
Aaron Gableedbc4132017-09-11 13:22:28 -07004118 if options.use_commit_queue:
4119 options.send_mail = True
4120
Edward Lesmes0dd54822020-03-26 18:24:25 +00004121 if options.squash is None:
4122 # Load default for user, repo, squash=true, in this order.
4123 options.squash = settings.GetSquashGerritUploads()
4124
Edward Lemur934836a2019-09-09 20:16:54 +00004125 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004126 # Warm change details cache now to avoid RPCs later, reducing latency for
4127 # developers.
4128 if cl.GetIssue():
4129 cl._GetChangeDetail(
4130 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4131
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004132 if options.retry_failed and not cl.GetIssue():
4133 print('No previous patchsets, so --retry-failed has no effect.')
4134 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004135
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004136 # cl.GetMostRecentPatchset uses cached information, and can return the last
4137 # patchset before upload. Calling it here makes it clear that it's the
4138 # last patchset before upload. Note that GetMostRecentPatchset will fail
4139 # if no CL has been uploaded yet.
4140 if options.retry_failed:
4141 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004142
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004143 ret = cl.CMDUpload(options, args, orig_args)
4144
4145 if options.retry_failed:
4146 if ret != 0:
4147 print('Upload failed, so --retry-failed has no effect.')
4148 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004149 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004150 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004151 jobs = _filter_failed_for_retry(builds)
4152 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004153 print('No failed tryjobs, so --retry-failed has no effect.')
4154 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004155 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004156
4157 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004158
4159
Francois Dorayd42c6812017-05-30 15:10:20 -04004160@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004161@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004162def CMDsplit(parser, args):
4163 """Splits a branch into smaller branches and uploads CLs.
4164
4165 Creates a branch and uploads a CL for each group of files modified in the
4166 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004167 comment, the string '$directory', is replaced with the directory containing
4168 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004169 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004170 parser.add_option('-d', '--description', dest='description_file',
4171 help='A text file containing a CL description in which '
4172 '$directory will be replaced by each CL\'s directory.')
4173 parser.add_option('-c', '--comment', dest='comment_file',
4174 help='A text file containing a CL comment.')
4175 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004176 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004177 help='List the files and reviewers for each CL that would '
4178 'be created, but don\'t create branches or CLs.')
4179 parser.add_option('--cq-dry-run', action='store_true',
4180 help='If set, will do a cq dry run for each uploaded CL. '
4181 'Please be careful when doing this; more than ~10 CLs '
4182 'has the potential to overload our build '
4183 'infrastructure. Try to upload these not during high '
4184 'load times (usually 11-3 Mountain View time). Email '
4185 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004186 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4187 default=True,
4188 help='Sends your change to the CQ after an approval. Only '
4189 'works on repos that have the Auto-Submit label '
4190 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004191 options, _ = parser.parse_args(args)
4192
4193 if not options.description_file:
4194 parser.error('No --description flag specified.')
4195
4196 def WrappedCMDupload(args):
4197 return CMDupload(OptionParser(), args)
4198
Edward Lemur2c62b332020-03-12 22:12:33 +00004199 return split_cl.SplitCl(
4200 options.description_file, options.comment_file, Changelist,
4201 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4202 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004203
4204
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004205@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004206@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004208 """DEPRECATED: Used to commit the current changelist via git-svn."""
4209 message = ('git-cl no longer supports committing to SVN repositories via '
4210 'git-svn. You probably want to use `git cl land` instead.')
4211 print(message)
4212 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004213
4214
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004215@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004216@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004217def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004218 """Commits the current changelist via git.
4219
4220 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4221 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004222 """
4223 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4224 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004225 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004226 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004227 parser.add_option('--parallel', action='store_true',
4228 help='Run all tests specified by input_api.RunTests in all '
4229 'PRESUBMIT files in parallel.')
Saagar Sanghavidba1d652020-08-05 23:55:14 +00004230 parser.add_option('--resultdb', action='store_true',
4231 help='Run presubmit checks in the ResultSink environment '
4232 'and send results to the ResultDB database.')
4233 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004234 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004235
Edward Lemur934836a2019-09-09 20:16:54 +00004236 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004237
Robert Iannucci2e73d432018-03-14 01:10:47 -07004238 if not cl.GetIssue():
4239 DieWithError('You must upload the change first to Gerrit.\n'
4240 ' If you would rather have `git cl land` upload '
4241 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavidba1d652020-08-05 23:55:14 +00004242 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4243 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004244
4245
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004246@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004247@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004248def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004249 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004250 parser.add_option('-b', dest='newbranch',
4251 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004252 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004253 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004255 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004256
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004257 group = optparse.OptionGroup(
4258 parser,
4259 'Options for continuing work on the current issue uploaded from a '
4260 'different clone (e.g. different machine). Must be used independently '
4261 'from the other options. No issue number should be specified, and the '
4262 'branch must have an issue number associated with it')
4263 group.add_option('--reapply', action='store_true', dest='reapply',
4264 help='Reset the branch and reapply the issue.\n'
4265 'CAUTION: This will undo any local changes in this '
4266 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004267
4268 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004269 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004270 parser.add_option_group(group)
4271
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004272 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004273
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004274 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004275 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004276 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004277 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004278 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004279
Edward Lemur934836a2019-09-09 20:16:54 +00004280 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004281 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004282 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004283
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004284 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004285 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004286 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004287
4288 RunGit(['reset', '--hard', upstream])
4289 if options.pull:
4290 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004291
Edward Lemur678a6842019-10-03 22:25:05 +00004292 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4293 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004294
4295 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004296 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004297
Edward Lemurf38bc172019-09-03 21:02:13 +00004298 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004299 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004300 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004301
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004302 # We don't want uncommitted changes mixed up with the patch.
4303 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004304 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004305
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004306 if options.newbranch:
4307 if options.force:
4308 RunGit(['branch', '-D', options.newbranch],
4309 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004310 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004311
Edward Lemur678a6842019-10-03 22:25:05 +00004312 cl = Changelist(
4313 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004314
Edward Lemur678a6842019-10-03 22:25:05 +00004315 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004316 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004317
Edward Lemurf38bc172019-09-03 21:02:13 +00004318 return cl.CMDPatchWithParsedIssue(
4319 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004320
4321
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004322def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323 """Fetches the tree status and returns either 'open', 'closed',
4324 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004325 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004326 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004327 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004328 if status.find('closed') != -1 or status == '0':
4329 return 'closed'
4330 elif status.find('open') != -1 or status == '1':
4331 return 'open'
4332 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004333 return 'unset'
4334
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004335
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004336def GetTreeStatusReason():
4337 """Fetches the tree status from a json url and returns the message
4338 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004339 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004340 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004341 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004342 status = json.loads(connection.read())
4343 connection.close()
4344 return status['message']
4345
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004346
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004347@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004348def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004349 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004350 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004351 status = GetTreeStatus()
4352 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004353 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004354 return 2
4355
vapiera7fbd5a2016-06-16 09:17:49 -07004356 print('The tree is %s' % status)
4357 print()
4358 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004359 if status != 'open':
4360 return 1
4361 return 0
4362
4363
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004364@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004365def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004366 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4367 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004368 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004369 '-b', '--bot', action='append',
4370 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4371 'times to specify multiple builders. ex: '
4372 '"-b win_rel -b win_layout". See '
4373 'the try server waterfall for the builders name and the tests '
4374 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004375 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004376 '-B', '--bucket', default='',
4377 help=('Buildbucket bucket to send the try requests.'))
4378 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004379 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004380 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004381 'be determined by the try recipe that builder runs, which usually '
4382 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004383 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004384 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004385 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004386 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004387 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004388 '--category', default='git_cl_try', help='Specify custom build category.')
4389 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004390 '--project',
4391 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004392 'in recipe to determine to which repository or directory to '
4393 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004394 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004395 '-p', '--property', dest='properties', action='append', default=[],
4396 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004397 'key2=value2 etc. The value will be treated as '
4398 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004399 'NOTE: using this may make your tryjob not usable for CQ, '
4400 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004401 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004402 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4403 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004404 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004405 parser.add_option(
4406 '-R', '--retry-failed', action='store_true', default=False,
4407 help='Retry failed jobs from the latest set of tryjobs. '
4408 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004409 parser.add_option(
4410 '-i', '--issue', type=int,
4411 help='Operate on this issue instead of the current branch\'s implicit '
4412 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004413 options, args = parser.parse_args(args)
4414
machenbach@chromium.org45453142015-09-15 08:45:22 +00004415 # Make sure that all properties are prop=value pairs.
4416 bad_params = [x for x in options.properties if '=' not in x]
4417 if bad_params:
4418 parser.error('Got properties with missing "=": %s' % bad_params)
4419
maruel@chromium.org15192402012-09-06 12:38:29 +00004420 if args:
4421 parser.error('Unknown arguments: %s' % args)
4422
Edward Lemur934836a2019-09-09 20:16:54 +00004423 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004424 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004425 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004426
Edward Lemurf38bc172019-09-03 21:02:13 +00004427 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004428 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004429
tandriie113dfd2016-10-11 10:20:12 -07004430 error_message = cl.CannotTriggerTryJobReason()
4431 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004432 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004433
Edward Lemur45768512020-03-02 19:03:14 +00004434 if options.bot:
4435 if options.retry_failed:
4436 parser.error('--bot is not compatible with --retry-failed.')
4437 if not options.bucket:
4438 parser.error('A bucket (e.g. "chromium/try") is required.')
4439
4440 triggered = [b for b in options.bot if 'triggered' in b]
4441 if triggered:
4442 parser.error(
4443 'Cannot schedule builds on triggered bots: %s.\n'
4444 'This type of bot requires an initial job from a parent (usually a '
4445 'builder). Schedule a job on the parent instead.\n' % triggered)
4446
4447 if options.bucket.startswith('.master'):
4448 parser.error('Buildbot masters are not supported.')
4449
4450 project, bucket = _parse_bucket(options.bucket)
4451 if project is None or bucket is None:
4452 parser.error('Invalid bucket: %s.' % options.bucket)
4453 jobs = sorted((project, bucket, bot) for bot in options.bot)
4454 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004455 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004456 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004457 if options.verbose:
4458 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004459 jobs = _filter_failed_for_retry(builds)
4460 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004461 print('There are no failed jobs in the latest set of jobs '
4462 '(patchset #%d), doing nothing.' % patchset)
4463 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004464 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004465 if num_builders > 10:
4466 confirm_or_exit('There are %d builders with failed builds.'
4467 % num_builders, action='continue')
4468 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004469 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004470 print('git cl try with no bots now defaults to CQ dry run.')
4471 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4472 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004473
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004474 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004475 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004476 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004477 except BuildbucketResponseException as ex:
4478 print('ERROR: %s' % ex)
4479 return 1
4480 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004481
4482
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004483@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004484def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004485 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004486 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004487 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004488 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004489 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004490 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004491 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004492 '--color', action='store_true', default=setup_color.IS_TTY,
4493 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004494 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004495 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4496 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004497 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004498 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004499 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004500 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004501 parser.add_option(
4502 '-i', '--issue', type=int,
4503 help='Operate on this issue instead of the current branch\'s implicit '
4504 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004505 options, args = parser.parse_args(args)
4506 if args:
4507 parser.error('Unrecognized args: %s' % ' '.join(args))
4508
Edward Lemur934836a2019-09-09 20:16:54 +00004509 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004510 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004511 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004512
tandrii221ab252016-10-06 08:12:04 -07004513 patchset = options.patchset
4514 if not patchset:
4515 patchset = cl.GetMostRecentPatchset()
4516 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004517 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004518 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004519 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004520 cl.GetIssue())
4521
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004522 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004523 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004524 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004525 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004526 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004527 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004528 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004529 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004530 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004531 return 0
4532
4533
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004534@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004535@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004537 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004538 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004539 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004540 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004541
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004543 if args:
4544 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004545 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004546 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004547 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004548 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004549
4550 # Clear configured merge-base, if there is one.
4551 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004552 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004553 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554 return 0
4555
4556
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004557@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004558def CMDweb(parser, args):
4559 """Opens the current CL in the web browser."""
4560 _, args = parser.parse_args(args)
4561 if args:
4562 parser.error('Unrecognized args: %s' % ' '.join(args))
4563
4564 issue_url = Changelist().GetIssueURL()
4565 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004566 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004567 return 1
4568
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004569 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004570 # allows us to hide the "Created new window in existing browser session."
4571 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004572 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004573 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004574 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004575 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004576 os.open(os.devnull, os.O_RDWR)
4577 try:
4578 webbrowser.open(issue_url)
4579 finally:
4580 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004581 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004582 return 0
4583
4584
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004585@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004586def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004587 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004588 parser.add_option('-d', '--dry-run', action='store_true',
4589 help='trigger in dry run mode')
4590 parser.add_option('-c', '--clear', action='store_true',
4591 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004592 parser.add_option(
4593 '-i', '--issue', type=int,
4594 help='Operate on this issue instead of the current branch\'s implicit '
4595 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004596 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004597 if args:
4598 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004599 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004600 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004601
Edward Lemur934836a2019-09-09 20:16:54 +00004602 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004603 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004604 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004605 elif options.dry_run:
4606 state = _CQState.DRY_RUN
4607 else:
4608 state = _CQState.COMMIT
4609 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004610 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004611 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004612 return 0
4613
4614
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004615@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004616def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004617 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004618 parser.add_option(
4619 '-i', '--issue', type=int,
4620 help='Operate on this issue instead of the current branch\'s implicit '
4621 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004622 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004623 if args:
4624 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004625 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004626 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004627 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004628 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004629 cl.CloseIssue()
4630 return 0
4631
4632
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004633@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004634def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004635 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004636 parser.add_option(
4637 '--stat',
4638 action='store_true',
4639 dest='stat',
4640 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004641 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004642 if args:
4643 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004644
Edward Lemur934836a2019-09-09 20:16:54 +00004645 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004646 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004647 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004648 if not issue:
4649 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004650
Aaron Gablea718c3e2017-08-28 17:47:28 -07004651 base = cl._GitGetBranchConfigValue('last-upload-hash')
4652 if not base:
4653 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4654 if not base:
4655 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4656 revision_info = detail['revisions'][detail['current_revision']]
4657 fetch_info = revision_info['fetch']['http']
4658 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4659 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004660
Aaron Gablea718c3e2017-08-28 17:47:28 -07004661 cmd = ['git', 'diff']
4662 if options.stat:
4663 cmd.append('--stat')
4664 cmd.append(base)
4665 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004666
4667 return 0
4668
4669
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004670@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004671def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004672 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004673 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004674 '--ignore-current',
4675 action='store_true',
4676 help='Ignore the CL\'s current reviewers and start from scratch.')
4677 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004678 '--ignore-self',
4679 action='store_true',
4680 help='Do not consider CL\'s author as an owners.')
4681 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004682 '--no-color',
4683 action='store_true',
4684 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004685 parser.add_option(
4686 '--batch',
4687 action='store_true',
4688 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004689 # TODO: Consider moving this to another command, since other
4690 # git-cl owners commands deal with owners for a given CL.
4691 parser.add_option(
4692 '--show-all',
4693 action='store_true',
4694 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004695 options, args = parser.parse_args(args)
4696
Edward Lemur934836a2019-09-09 20:16:54 +00004697 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004698 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004699
Yang Guo6e269a02019-06-26 11:17:02 +00004700 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004701 if len(args) == 0:
4702 print('No files specified for --show-all. Nothing to do.')
4703 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004704 for arg in args:
4705 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004706 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004707 database.load_data_needed_for([arg])
4708 print('Owners for %s:' % arg)
4709 for owner in sorted(database.all_possible_owners([arg], None)):
4710 print(' - %s' % owner)
4711 return 0
4712
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004713 if args:
4714 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004715 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004716 base_branch = args[0]
4717 else:
4718 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004719 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004720
Edward Lemur2c62b332020-03-12 22:12:33 +00004721 root = settings.GetRoot()
4722 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004723
4724 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004725 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004726 print('\n'.join(db.reviewers_for(affected_files, author)))
4727 return 0
4728
Edward Lemur2c62b332020-03-12 22:12:33 +00004729 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4730 original_owner_files = {
4731 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4732 for f in owner_files}
4733
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004734 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004735 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004736 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004737 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004738 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004739 fopen=open,
4740 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004741 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004742 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004743 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004744
4745
Aiden Bennerc08566e2018-10-03 17:52:42 +00004746def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004747 """Generates a diff command."""
4748 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004749 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4750
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004751 if allow_prefix:
4752 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4753 # case that diff.noprefix is set in the user's git config.
4754 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4755 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004756 diff_cmd += ['--no-prefix']
4757
4758 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004759
4760 if args:
4761 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004762 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004763 diff_cmd.append(arg)
4764 else:
4765 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004766
4767 return diff_cmd
4768
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004769
Jamie Madill5e96ad12020-01-13 16:08:35 +00004770def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4771 """Runs clang-format-diff and sets a return value if necessary."""
4772
4773 if not clang_diff_files:
4774 return 0
4775
4776 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4777 # formatted. This is used to block during the presubmit.
4778 return_value = 0
4779
4780 # Locate the clang-format binary in the checkout
4781 try:
4782 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4783 except clang_format.NotFoundError as e:
4784 DieWithError(e)
4785
4786 if opts.full or settings.GetFormatFullByDefault():
4787 cmd = [clang_format_tool]
4788 if not opts.dry_run and not opts.diff:
4789 cmd.append('-i')
4790 if opts.dry_run:
4791 for diff_file in clang_diff_files:
4792 with open(diff_file, 'r') as myfile:
4793 code = myfile.read().replace('\r\n', '\n')
4794 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4795 stdout = stdout.replace('\r\n', '\n')
4796 if opts.diff:
4797 sys.stdout.write(stdout)
4798 if code != stdout:
4799 return_value = 2
4800 else:
4801 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4802 if opts.diff:
4803 sys.stdout.write(stdout)
4804 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004805 try:
4806 script = clang_format.FindClangFormatScriptInChromiumTree(
4807 'clang-format-diff.py')
4808 except clang_format.NotFoundError as e:
4809 DieWithError(e)
4810
Edward Lesmes89624cd2020-04-06 17:51:56 +00004811 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004812 if not opts.dry_run and not opts.diff:
4813 cmd.append('-i')
4814
4815 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004816 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004817
Edward Lesmes89624cd2020-04-06 17:51:56 +00004818 env = os.environ.copy()
4819 env['PATH'] = (
4820 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4821 stdout = RunCommand(
4822 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004823 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004824 if opts.diff:
4825 sys.stdout.write(stdout)
4826 if opts.dry_run and len(stdout) > 0:
4827 return_value = 2
4828
4829 return return_value
4830
4831
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004832def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004833 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004834 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004835
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004836
enne@chromium.org555cfe42014-01-29 18:21:39 +00004837@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004838@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004839def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004840 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004841 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004842 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004843 parser.add_option('--full', action='store_true',
4844 help='Reformat the full content of all touched files')
4845 parser.add_option('--dry-run', action='store_true',
4846 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004847 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004848 '--no-clang-format',
4849 dest='clang_format',
4850 action='store_false',
4851 default=True,
4852 help='Disables formatting of various file types using clang-format.')
4853 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004854 '--python',
4855 action='store_true',
4856 default=None,
4857 help='Enables python formatting on all python files.')
4858 parser.add_option(
4859 '--no-python',
4860 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004861 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004862 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004863 'If neither --python or --no-python are set, python files that have a '
4864 '.style.yapf file in an ancestor directory will be formatted. '
4865 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004866 parser.add_option(
4867 '--js',
4868 action='store_true',
4869 help='Format javascript code with clang-format. '
4870 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004871 parser.add_option('--diff', action='store_true',
4872 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004873 parser.add_option('--presubmit', action='store_true',
4874 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004875 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004876
Garrett Beaty91a6f332020-01-06 16:57:24 +00004877 if opts.python is not None and opts.no_python:
4878 raise parser.error('Cannot set both --python and --no-python')
4879 if opts.no_python:
4880 opts.python = False
4881
Daniel Chengc55eecf2016-12-30 03:11:02 -08004882 # Normalize any remaining args against the current path, so paths relative to
4883 # the current directory are still resolved as expected.
4884 args = [os.path.join(os.getcwd(), arg) for arg in args]
4885
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004886 # git diff generates paths against the root of the repository. Change
4887 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004888 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004889 if rel_base_path:
4890 os.chdir(rel_base_path)
4891
digit@chromium.org29e47272013-05-17 17:01:46 +00004892 # Grab the merge-base commit, i.e. the upstream commit of the current
4893 # branch when it was created or the last time it was rebased. This is
4894 # to cover the case where the user may have called "git fetch origin",
4895 # moving the origin branch to a newer commit, but hasn't rebased yet.
4896 upstream_commit = None
4897 cl = Changelist()
4898 upstream_branch = cl.GetUpstreamBranch()
4899 if upstream_branch:
4900 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4901 upstream_commit = upstream_commit.strip()
4902
4903 if not upstream_commit:
4904 DieWithError('Could not find base commit for this branch. '
4905 'Are you in detached state?')
4906
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004907 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4908 diff_output = RunGit(changed_files_cmd)
4909 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004910 # Filter out files deleted by this CL
4911 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004912
Andreas Haas417d89c2020-02-06 10:24:27 +00004913 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004914 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004915
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004916 clang_diff_files = []
4917 if opts.clang_format:
4918 clang_diff_files = [
4919 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4920 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004921 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004922 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004923
Edward Lesmes50da7702020-03-30 19:23:43 +00004924 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004925
Jamie Madill5e96ad12020-01-13 16:08:35 +00004926 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4927 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004928
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004929 # Similar code to above, but using yapf on .py files rather than clang-format
4930 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004931 py_explicitly_disabled = opts.python is not None and not opts.python
4932 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004933 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4934 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004935
Aiden Bennerc08566e2018-10-03 17:52:42 +00004936 # Used for caching.
4937 yapf_configs = {}
4938 for f in python_diff_files:
4939 # Find the yapf style config for the current file, defaults to depot
4940 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004941 _FindYapfConfigFile(f, yapf_configs, top_dir)
4942
4943 # Turn on python formatting by default if a yapf config is specified.
4944 # This breaks in the case of this repo though since the specified
4945 # style file is also the global default.
4946 if opts.python is None:
4947 filtered_py_files = []
4948 for f in python_diff_files:
4949 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4950 filtered_py_files.append(f)
4951 else:
4952 filtered_py_files = python_diff_files
4953
4954 # Note: yapf still seems to fix indentation of the entire file
4955 # even if line ranges are specified.
4956 # See https://github.com/google/yapf/issues/499
4957 if not opts.full and filtered_py_files:
4958 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4959
Brian Sheedyb4307d52019-12-02 19:18:17 +00004960 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4961 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4962 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004963
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004964 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004965 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4966 # Default to pep8 if not .style.yapf is found.
4967 if not yapf_style:
4968 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004969
Peter Wend9399922020-06-17 17:33:49 +00004970 with open(f, 'r') as py_f:
4971 if 'python3' in py_f.readline():
4972 vpython_script = 'vpython3'
4973 else:
4974 vpython_script = 'vpython'
4975
4976 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004977
4978 has_formattable_lines = False
4979 if not opts.full:
4980 # Only run yapf over changed line ranges.
4981 for diff_start, diff_len in py_line_diffs[f]:
4982 diff_end = diff_start + diff_len - 1
4983 # Yapf errors out if diff_end < diff_start but this
4984 # is a valid line range diff for a removal.
4985 if diff_end >= diff_start:
4986 has_formattable_lines = True
4987 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
4988 # If all line diffs were removals we have nothing to format.
4989 if not has_formattable_lines:
4990 continue
4991
4992 if opts.diff or opts.dry_run:
4993 cmd += ['--diff']
4994 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00004995 stdout = RunCommand(cmd,
4996 error_ok=True,
4997 cwd=top_dir,
4998 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00004999 if opts.diff:
5000 sys.stdout.write(stdout)
5001 elif len(stdout) > 0:
5002 return_value = 2
5003 else:
5004 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005005 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005006
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005007 # Format GN build files. Always run on full build files for canonical form.
5008 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005009 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005010 if opts.dry_run or opts.diff:
5011 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005012 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005013 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005014 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005015 cwd=top_dir)
5016 if opts.dry_run and gn_ret == 2:
5017 return_value = 2 # Not formatted.
5018 elif opts.diff and gn_ret == 2:
5019 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005020 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005021 elif gn_ret != 0:
5022 # For non-dry run cases (and non-2 return values for dry-run), a
5023 # nonzero error code indicates a failure, probably because the file
5024 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005025 DieWithError('gn format failed on ' + gn_diff_file +
5026 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005027
Ilya Shermane081cbe2017-08-15 17:51:04 -07005028 # Skip the metrics formatting from the global presubmit hook. These files have
5029 # a separate presubmit hook that issues an error if the files need formatting,
5030 # whereas the top-level presubmit script merely issues a warning. Formatting
5031 # these files is somewhat slow, so it's important not to duplicate the work.
5032 if not opts.presubmit:
5033 for xml_dir in GetDirtyMetricsDirs(diff_files):
5034 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005035 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5036 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Ilya Shermane081cbe2017-08-15 17:51:04 -07005037 if opts.dry_run or opts.diff:
5038 cmd.append('--diff')
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005039 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5040 # `shell` param and instead replace `'vpython'` with
5041 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
5042 stdout = RunCommand(cmd, cwd=top_dir,
5043 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005044 if opts.diff:
5045 sys.stdout.write(stdout)
5046 if opts.dry_run and stdout:
5047 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005048
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005049 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005050
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005051
Steven Holte2e664bf2017-04-21 13:10:47 -07005052def GetDirtyMetricsDirs(diff_files):
5053 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5054 metrics_xml_dirs = [
5055 os.path.join('tools', 'metrics', 'actions'),
5056 os.path.join('tools', 'metrics', 'histograms'),
5057 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005058 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005059 os.path.join('tools', 'metrics', 'ukm'),
5060 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005061 for xml_dir in metrics_xml_dirs:
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005062 if any(
5063 os.path.normpath(file).startswith(xml_dir) for file in xml_diff_files):
Steven Holte2e664bf2017-04-21 13:10:47 -07005064 yield xml_dir
5065
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005066
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005067@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005068@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005069def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005070 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005071 _, args = parser.parse_args(args)
5072
5073 if len(args) != 1:
5074 parser.print_help()
5075 return 1
5076
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005077 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005078 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005079 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005080
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005081 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005082
Edward Lemur52969c92020-02-06 18:15:28 +00005083 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005084 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005085 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005086
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005087 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005088 for key, issue in [x.split() for x in output.splitlines()]:
5089 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005090 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005091
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005092 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005093 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005094 return 1
5095 if len(branches) == 1:
5096 RunGit(['checkout', branches[0]])
5097 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005098 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005099 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005100 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005101 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005102 try:
5103 RunGit(['checkout', branches[int(which)]])
5104 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005105 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005106 return 1
5107
5108 return 0
5109
5110
maruel@chromium.org29404b52014-09-08 22:58:00 +00005111def CMDlol(parser, args):
5112 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005113 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005114 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5115 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5116 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005117 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005118 return 0
5119
5120
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005121class OptionParser(optparse.OptionParser):
5122 """Creates the option parse and add --verbose support."""
5123 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005124 optparse.OptionParser.__init__(
5125 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005126 self.add_option(
5127 '-v', '--verbose', action='count', default=0,
5128 help='Use 2 times for more debugging info')
5129
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005130 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005131 try:
5132 return self._parse_args(args)
5133 finally:
5134 # Regardless of success or failure of args parsing, we want to report
5135 # metrics, but only after logging has been initialized (if parsing
5136 # succeeded).
5137 global settings
5138 settings = Settings()
5139
5140 if not metrics.DISABLE_METRICS_COLLECTION:
5141 # GetViewVCUrl ultimately calls logging method.
5142 project_url = settings.GetViewVCUrl().strip('/+')
5143 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5144 metrics.collector.add('project_urls', [project_url])
5145
5146 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005147 # Create an optparse.Values object that will store only the actual passed
5148 # options, without the defaults.
5149 actual_options = optparse.Values()
5150 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5151 # Create an optparse.Values object with the default options.
5152 options = optparse.Values(self.get_default_values().__dict__)
5153 # Update it with the options passed by the user.
5154 options._update_careful(actual_options.__dict__)
5155 # Store the options passed by the user in an _actual_options attribute.
5156 # We store only the keys, and not the values, since the values can contain
5157 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005158 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005159
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005160 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005161 logging.basicConfig(
5162 level=levels[min(options.verbose, len(levels) - 1)],
5163 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5164 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005165
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005166 return options, args
5167
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005168
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005169def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005170 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005171 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005172 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005173 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005174
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005175 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005176 dispatcher = subcommand.CommandDispatcher(__name__)
5177 try:
5178 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005179 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005180 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005181 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005182 if e.code != 500:
5183 raise
5184 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005185 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005186 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005187 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005188
5189
5190if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005191 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5192 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005193 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005194 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005195 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005196 sys.exit(main(sys.argv[1:]))