blob: 91be1474fceb2446230e0a93c3523a402551dafc [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000045import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000111DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
112DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
Edward Lesmes50da7702020-03-30 19:23:43 +0000121# The issue, patchset and codereview server are stored on git config for each
122# branch under branch.<branch-name>.<config-key>.
123ISSUE_CONFIG_KEY = 'gerritissue'
124PATCHSET_CONFIG_KEY = 'gerritpatchset'
125CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
126
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000127# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000128Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000129
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000130# Initialized in main()
131settings = None
132
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100133# Used by tests/git_cl_test.py to add extra logging.
134# Inside the weirdly failing test, add this:
135# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700136# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100137_IS_BEING_TESTED = False
138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000140_KNOWN_GERRIT_TO_SHORT_URLS = {
141 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
142 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
143}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000144assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
145 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000146
147
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000148class GitPushError(Exception):
149 pass
150
151
Christopher Lamf732cd52017-01-24 12:40:11 +1100152def DieWithError(message, change_desc=None):
153 if change_desc:
154 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000155 print('\n ** Content of CL description **\n' +
156 '='*72 + '\n' +
157 change_desc.description + '\n' +
158 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100159
vapiera7fbd5a2016-06-16 09:17:49 -0700160 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 sys.exit(1)
162
163
Christopher Lamf732cd52017-01-24 12:40:11 +1100164def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000165 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000166 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000167 with open(backup_path, 'w') as backup_file:
168 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100169
170
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000171def GetNoGitPagerEnv():
172 env = os.environ.copy()
173 # 'cat' is a magical git string that disables pagers on all platforms.
174 env['GIT_PAGER'] = 'cat'
175 return env
176
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000177
bsep@chromium.org627d9002016-04-29 00:00:52 +0000178def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000180 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
181 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000182 except subprocess2.CalledProcessError as e:
183 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000185 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
186 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
190def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000191 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000195def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700197 if suppress_stderr:
198 stderr = subprocess2.VOID
199 else:
200 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000201 try:
tandrii5d48c322016-08-18 16:19:37 -0700202 (out, _), code = subprocess2.communicate(['git'] + args,
203 env=GetNoGitPagerEnv(),
204 stdout=subprocess2.PIPE,
205 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000206 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700207 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900208 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000210
211
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000212def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000213 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000214 return RunGitWithCode(args, suppress_stderr=True)[1]
215
216
tandrii2a16b952016-10-19 07:09:44 -0700217def time_sleep(seconds):
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700220 return time.sleep(seconds)
221
222
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000223def time_time():
224 # Use this so that it can be mocked in tests without interfering with python
225 # system machinery.
226 return time.time()
227
228
Edward Lemur1b52d872019-05-09 21:12:12 +0000229def datetime_now():
230 # Use this so that it can be mocked in tests without interfering with python
231 # system machinery.
232 return datetime.datetime.now()
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000245 gclient_utils.AskForData(
246 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100247
248
249def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000250 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000251 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252 while True:
253 if 'yes'.startswith(result):
254 return True
255 if 'no'.startswith(result):
256 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000257 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100258
259
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000261 prop_list = getattr(options, 'properties', [])
262 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000263 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264 try:
265 properties[key] = json.loads(val)
266 except ValueError:
267 pass # If a value couldn't be evaluated, treat it as a string.
268 return properties
269
270
Edward Lemur4c707a22019-09-24 21:13:43 +0000271def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000272 """Calls a buildbucket v2 method and returns the parsed json response."""
273 headers = {
274 'Accept': 'application/json',
275 'Content-Type': 'application/json',
276 }
277 request = json.dumps(request)
278 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
279
280 logging.info('POST %s with %s' % (url, request))
281
282 attempts = 1
283 time_to_sleep = 1
284 while True:
285 response, content = http.request(url, 'POST', body=request, headers=headers)
286 if response.status == 200:
287 return json.loads(content[4:])
288 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
289 msg = '%s error when calling POST %s with %s: %s' % (
290 response.status, url, request, content)
291 raise BuildbucketResponseException(msg)
292 logging.debug(
293 '%s error when calling POST %s with %s. '
294 'Sleeping for %d seconds and retrying...' % (
295 response.status, url, request, time_to_sleep))
296 time.sleep(time_to_sleep)
297 time_to_sleep *= 2
298 attempts += 1
299
300 assert False, 'unreachable'
301
302
Edward Lemur6215c792019-10-03 21:59:05 +0000303def _parse_bucket(raw_bucket):
304 legacy = True
305 project = bucket = None
306 if '/' in raw_bucket:
307 legacy = False
308 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000309 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000310 elif raw_bucket.startswith('luci.'):
311 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000312 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000313 elif '.' in raw_bucket:
314 project = raw_bucket.split('.')[0]
315 bucket = raw_bucket
316 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000317 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000318 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
319 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000320
321
Quinten Yearsley777660f2020-03-04 23:37:06 +0000322def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000323 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700324
325 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000326 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000327 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700328 options: Command-line options.
329 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000331 for project, bucket, builder in jobs:
332 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 print('To see results here, run: git cl try-results')
334 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700335
Quinten Yearsley777660f2020-03-04 23:37:06 +0000336 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 if not requests:
338 return
339
Edward Lemur5b929a42019-10-21 17:57:39 +0000340 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 http.force_exception_to_status_code = True
342
343 batch_request = {'requests': requests}
344 batch_response = _call_buildbucket(
345 http, options.buildbucket_host, 'Batch', batch_request)
346
347 errors = [
348 ' ' + response['error']['message']
349 for response in batch_response.get('responses', [])
350 if 'error' in response
351 ]
352 if errors:
353 raise BuildbucketResponseException(
354 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
355
356
Quinten Yearsley777660f2020-03-04 23:37:06 +0000357def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000358 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000359 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000360 shared_properties = {
361 'category': options.ensure_value('category', 'git_cl_try')
362 }
363 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 shared_properties['clobber'] = True
365 shared_properties.update(_get_properties_from_options(options) or {})
366
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000367 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000368 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000369 shared_tags.append({'key': 'retry_failed',
370 'value': '1'})
371
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000372 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000373 for (project, bucket, builder) in jobs:
374 properties = shared_properties.copy()
375 if 'presubmit' in builder.lower():
376 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377
Edward Lemur45768512020-03-02 19:03:14 +0000378 requests.append({
379 'scheduleBuild': {
380 'requestId': str(uuid.uuid4()),
381 'builder': {
382 'project': getattr(options, 'project', None) or project,
383 'bucket': bucket,
384 'builder': builder,
385 },
386 'gerritChanges': gerrit_changes,
387 'properties': properties,
388 'tags': [
389 {'key': 'builder', 'value': builder},
390 ] + shared_tags,
391 }
392 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000393
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000394 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000395 requests[-1]['scheduleBuild']['gitilesCommit'] = {
396 'host': gerrit_changes[0]['host'],
397 'project': gerrit_changes[0]['project'],
398 'id': options.revision
399 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000400
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000401 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000402
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000403
Quinten Yearsley777660f2020-03-04 23:37:06 +0000404def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000405 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000406
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000407 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000408 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000409 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000410 request = {
411 'predicate': {
412 'gerritChanges': [changelist.GetGerritChange(patchset)],
413 },
414 'fields': ','.join('builds.*.' + field for field in fields),
415 }
tandrii221ab252016-10-06 08:12:04 -0700416
Edward Lemur5b929a42019-10-21 17:57:39 +0000417 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000418 if authenticator.has_cached_credentials():
419 http = authenticator.authorize(httplib2.Http())
420 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700421 print('Warning: Some results might be missing because %s' %
422 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000423 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000424 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 http.force_exception_to_status_code = True
426
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000427 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
428 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000429
Edward Lemur45768512020-03-02 19:03:14 +0000430
Edward Lemur5b929a42019-10-21 17:57:39 +0000431def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 """Fetches builds from the latest patchset that has builds (within
433 the last few patchsets).
434
435 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 changelist (Changelist): The CL to fetch builds for
437 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000438 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
439 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000440 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000441 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
442 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000443 """
444 assert buildbucket_host
445 assert changelist.GetIssue(), 'CL must be uploaded first'
446 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000447 if latest_patchset is None:
448 assert changelist.GetMostRecentPatchset()
449 ps = changelist.GetMostRecentPatchset()
450 else:
451 assert latest_patchset > 0, latest_patchset
452 ps = latest_patchset
453
Quinten Yearsley983111f2019-09-26 17:18:48 +0000454 min_ps = max(1, ps - 5)
455 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000456 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000457 if len(builds):
458 return builds, ps
459 ps -= 1
460 return [], 0
461
462
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000463def _filter_failed_for_retry(all_builds):
464 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000465
466 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000467 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 i.e. a list of buildbucket.v2.Builds which includes status and builder
469 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470
471 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000472 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000473 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000474 """
Edward Lemur45768512020-03-02 19:03:14 +0000475 grouped = {}
476 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000477 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000478 key = (builder['project'], builder['bucket'], builder['builder'])
479 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000480
Edward Lemur45768512020-03-02 19:03:14 +0000481 jobs = []
482 for (project, bucket, builder), builds in grouped.items():
483 if 'triggered' in builder:
484 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
485 'from a parent. Please schedule a manual job for the parent '
486 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000487 continue
488 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
489 # Don't retry if any are running.
490 continue
Edward Lemur45768512020-03-02 19:03:14 +0000491 # If builder had several builds, retry only if the last one failed.
492 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
493 # build, but in case of retrying failed jobs retrying a flaky one makes
494 # sense.
495 builds = sorted(builds, key=lambda b: b['createTime'])
496 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
497 continue
498 # Don't retry experimental build previously triggered by CQ.
499 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
500 for t in builds[-1]['tags']):
501 continue
502 jobs.append((project, bucket, builder))
503
504 # Sort the jobs to make testing easier.
505 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000506
507
Quinten Yearsley777660f2020-03-04 23:37:06 +0000508def _print_tryjobs(options, builds):
509 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000511 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 return
513
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000514 longest_builder = max(len(b['builder']['builder']) for b in builds)
515 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000517 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
518 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 builds_by_status = {}
521 for b in builds:
522 builds_by_status.setdefault(b['status'], []).append({
523 'id': b['id'],
524 'name': name_fmt.format(
525 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
526 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 sort_key = lambda b: (b['name'], b['id'])
529
530 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000532 if not builds:
533 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000536 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 else:
539 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
540
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000541 print(colorize(title))
542 for b in sorted(builds, key=sort_key):
543 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544
545 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000546 print_builds(
547 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
548 print_builds(
549 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
550 color=Fore.MAGENTA)
551 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
552 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
553 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000554 print_builds('Started:', builds_by_status.pop('STARTED', []),
555 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000556 print_builds(
557 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000559 print_builds(
560 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562
563
Aiden Bennerc08566e2018-10-03 17:52:42 +0000564def _ComputeDiffLineRanges(files, upstream_commit):
565 """Gets the changed line ranges for each file since upstream_commit.
566
567 Parses a git diff on provided files and returns a dict that maps a file name
568 to an ordered list of range tuples in the form (start_line, count).
569 Ranges are in the same format as a git diff.
570 """
571 # If files is empty then diff_output will be a full diff.
572 if len(files) == 0:
573 return {}
574
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000575 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000576 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000577 diff_output = RunGit(diff_cmd)
578
579 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
580 # 2 capture groups
581 # 0 == fname of diff file
582 # 1 == 'diff_start,diff_count' or 'diff_start'
583 # will match each of
584 # diff --git a/foo.foo b/foo.py
585 # @@ -12,2 +14,3 @@
586 # @@ -12,2 +17 @@
587 # running re.findall on the above string with pattern will give
588 # [('foo.py', ''), ('', '14,3'), ('', '17')]
589
590 curr_file = None
591 line_diffs = {}
592 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
593 if match[0] != '':
594 # Will match the second filename in diff --git a/a.py b/b.py.
595 curr_file = match[0]
596 line_diffs[curr_file] = []
597 else:
598 # Matches +14,3
599 if ',' in match[1]:
600 diff_start, diff_count = match[1].split(',')
601 else:
602 # Single line changes are of the form +12 instead of +12,1.
603 diff_start = match[1]
604 diff_count = 1
605
606 diff_start = int(diff_start)
607 diff_count = int(diff_count)
608
609 # If diff_count == 0 this is a removal we can ignore.
610 line_diffs[curr_file].append((diff_start, diff_count))
611
612 return line_diffs
613
614
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000615def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616 """Checks if a yapf file is in any parent directory of fpath until top_dir.
617
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000618 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000619 is found returns None. Uses yapf_config_cache as a cache for previously found
620 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 # Return result if we've already computed it.
624 if fpath in yapf_config_cache:
625 return yapf_config_cache[fpath]
626
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000627 parent_dir = os.path.dirname(fpath)
628 if os.path.isfile(fpath):
629 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000631 # Otherwise fpath is a directory
632 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
633 if os.path.isfile(yapf_file):
634 ret = yapf_file
635 elif fpath == top_dir or parent_dir == fpath:
636 # If we're at the top level directory, or if we're at root
637 # there is no provided style.
638 ret = None
639 else:
640 # Otherwise recurse on the current directory.
641 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000642 yapf_config_cache[fpath] = ret
643 return ret
644
645
Brian Sheedyb4307d52019-12-02 19:18:17 +0000646def _GetYapfIgnorePatterns(top_dir):
647 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000648
649 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
650 but this functionality appears to break when explicitly passing files to
651 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000652 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000653 the .yapfignore file should be in the directory that yapf is invoked from,
654 which we assume to be the top level directory in this case.
655
656 Args:
657 top_dir: The top level directory for the repository being formatted.
658
659 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000660 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000661 """
662 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000663 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000664 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000665 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000666
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 with open(yapfignore_file) as f:
668 for line in f.readlines():
669 stripped_line = line.strip()
670 # Comments and blank lines should be ignored.
671 if stripped_line.startswith('#') or stripped_line == '':
672 continue
673 ignore_patterns.add(stripped_line)
674 return ignore_patterns
675
676
677def _FilterYapfIgnoredFiles(filepaths, patterns):
678 """Filters out any filepaths that match any of the given patterns.
679
680 Args:
681 filepaths: An iterable of strings containing filepaths to filter.
682 patterns: An iterable of strings containing fnmatch patterns to filter on.
683
684 Returns:
685 A list of strings containing all the elements of |filepaths| that did not
686 match any of the patterns in |patterns|.
687 """
688 # Not inlined so that tests can use the same implementation.
689 return [f for f in filepaths
690 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000691
692
Aaron Gable13101a62018-02-09 13:20:41 -0800693def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000694 """Prints statistics about the change to the user."""
695 # --no-ext-diff is broken in some versions of Git, so try to work around
696 # this by overriding the environment (but there is still a problem if the
697 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000698 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000699 if 'GIT_EXTERNAL_DIFF' in env:
700 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000701
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000702 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800703 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000704 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705
706
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000707class BuildbucketResponseException(Exception):
708 pass
709
710
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711class Settings(object):
712 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000713 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000714 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000715 self.tree_status_url = None
716 self.viewvc_url = None
717 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000718 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000719 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000720 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000721 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000722 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000723
Edward Lemur26964072020-02-19 19:18:51 +0000724 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000725 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000726 if self.updated:
727 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000728
Edward Lemur26964072020-02-19 19:18:51 +0000729 # The only value that actually changes the behavior is
730 # autoupdate = "false". Everything else means "true".
731 autoupdate = (
732 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
733
734 cr_settings_file = FindCodereviewSettingsFile()
735 if autoupdate != 'false' and cr_settings_file:
736 LoadCodereviewSettingsFromFile(cr_settings_file)
737 cr_settings_file.close()
738
739 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000740
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000741 @staticmethod
742 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000743 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000746 if self.root is None:
747 self.root = os.path.abspath(self.GetRelativeRoot())
748 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750 def GetTreeStatusUrl(self, error_ok=False):
751 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000752 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
753 if self.tree_status_url is None and not error_ok:
754 DieWithError(
755 'You must configure your tree status URL by running '
756 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 return self.tree_status_url
758
759 def GetViewVCUrl(self):
760 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000761 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 return self.viewvc_url
763
rmistry@google.com90752582014-01-14 21:04:50 +0000764 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000765 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000766
rmistry@google.com5626a922015-02-26 14:03:30 +0000767 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000768 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000769 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000770 return run_post_upload_hook == "True"
771
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000772 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000773 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000774
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000776 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000777 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000778 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
779 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000780 # Default is squash now (http://crbug.com/611892#c23).
781 self.squash_gerrit_uploads = self._GetConfig(
782 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000783 return self.squash_gerrit_uploads
784
Edward Lesmes4de54132020-05-05 19:41:33 +0000785 def GetSquashGerritUploadsOverride(self):
786 """Return True or False if codereview.settings should be overridden.
787
788 Returns None if no override has been defined.
789 """
790 # See also http://crbug.com/611892#c23
791 result = self._GetConfig('gerrit.override-squash-uploads').lower()
792 if result == 'true':
793 return True
794 if result == 'false':
795 return False
796 return None
797
tandrii@chromium.org28253532016-04-14 13:46:56 +0000798 def GetGerritSkipEnsureAuthenticated(self):
799 """Return True if EnsureAuthenticated should not be done for Gerrit
800 uploads."""
801 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.gerrit_skip_ensure_authenticated = self._GetConfig(
803 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000804 return self.gerrit_skip_ensure_authenticated
805
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000806 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000807 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000808 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000809 # Git requires single quotes for paths with spaces. We need to replace
810 # them with double quotes for Windows to treat such paths as a single
811 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000813 return self.git_editor or None
814
thestig@chromium.org44202a22014-03-11 19:22:18 +0000815 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000816 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000817
818 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000819 return self._GetConfig(
820 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000821
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000822 def GetFormatFullByDefault(self):
823 if self.format_full_by_default is None:
824 result = (
825 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
826 error_ok=True).strip())
827 self.format_full_by_default = (result == 'true')
828 return self.format_full_by_default
829
Edward Lemur26964072020-02-19 19:18:51 +0000830 def _GetConfig(self, key, default=''):
831 self._LazyUpdateIfNeeded()
832 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833
834
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000835class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000836 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000837 NONE = 'none'
838 DRY_RUN = 'dry_run'
839 COMMIT = 'commit'
840
841 ALL_STATES = [NONE, DRY_RUN, COMMIT]
842
843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000844class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000845 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846 self.issue = issue
847 self.patchset = patchset
848 self.hostname = hostname
849
850 @property
851 def valid(self):
852 return self.issue is not None
853
854
Edward Lemurf38bc172019-09-03 21:02:13 +0000855def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000856 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
857 fail_result = _ParsedIssueNumberArgument()
858
Edward Lemur678a6842019-10-03 22:25:05 +0000859 if isinstance(arg, int):
860 return _ParsedIssueNumberArgument(issue=arg)
861 if not isinstance(arg, basestring):
862 return fail_result
863
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000865 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000866 if not arg.startswith('http'):
867 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700868
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000869 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000870 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
871 if url.startswith(short_url):
872 url = gerrit_url + url[len(short_url):]
873 break
874
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000875 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000876 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877 except ValueError:
878 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200879
Edward Lemur678a6842019-10-03 22:25:05 +0000880 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
881 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
882 # Short urls like https://domain/<issue_number> can be used, but don't allow
883 # specifying the patchset (you'd 404), but we allow that here.
884 if parsed_url.path == '/':
885 part = parsed_url.fragment
886 else:
887 part = parsed_url.path
888
889 match = re.match(
890 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
891 if not match:
892 return fail_result
893
894 issue = int(match.group('issue'))
895 patchset = match.group('patchset')
896 return _ParsedIssueNumberArgument(
897 issue=issue,
898 patchset=int(patchset) if patchset else None,
899 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000900
901
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000902def _create_description_from_log(args):
903 """Pulls out the commit log to use as a base for the CL description."""
904 log_args = []
905 if len(args) == 1 and not args[0].endswith('.'):
906 log_args = [args[0] + '..']
907 elif len(args) == 1 and args[0].endswith('...'):
908 log_args = [args[0][:-1]]
909 elif len(args) == 2:
910 log_args = [args[0] + '..' + args[1]]
911 else:
912 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000913 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000914
915
Aaron Gablea45ee112016-11-22 15:14:38 -0800916class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700917 def __init__(self, issue, url):
918 self.issue = issue
919 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800920 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700921
922 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800923 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700924 self.issue, self.url)
925
926
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100927_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000928 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100929 # TODO(tandrii): these two aren't known in Gerrit.
930 'approval', 'disapproval'])
931
932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000934 """Changelist works with one changelist in local branch.
935
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000936 Notes:
937 * Not safe for concurrent multi-{thread,process} use.
938 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700939 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000940 """
941
Edward Lemur125d60a2019-09-13 18:25:41 +0000942 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000943 """Create a new ChangeList instance.
944
Edward Lemurf38bc172019-09-03 21:02:13 +0000945 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000946 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000947 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000948 global settings
949 if not settings:
950 # Happens when git_cl.py is used as a utility library.
951 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000952
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000953 self.branchref = branchref
954 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000955 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000956 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000957 else:
958 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000959 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000960 self.lookedup_issue = False
961 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000962 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000963 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000964 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000965 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800966 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000967 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000968 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000969
Edward Lemur125d60a2019-09-13 18:25:41 +0000970 # Lazily cached values.
971 self._gerrit_host = None # e.g. chromium-review.googlesource.com
972 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
973 # Map from change number (issue) to its detail cache.
974 self._detail_cache = {}
975
976 if codereview_host is not None:
977 assert not codereview_host.startswith('https://'), codereview_host
978 self._gerrit_host = codereview_host
979 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000980
981 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700982 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000983
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700984 The return value is a string suitable for passing to git cl with the --cc
985 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000986 """
987 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000988 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800989 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000990 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
991 return self.cc
992
Daniel Cheng7227d212017-11-17 08:12:37 -0800993 def ExtendCC(self, more_cc):
994 """Extends the list of users to cc on this CL based on the changed files."""
995 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000996
997 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000998 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000999 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001000 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001001 if not branchref:
1002 return None
1003 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001004 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005 return self.branch
1006
1007 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001008 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009 self.GetBranch() # Poke the lazy loader.
1010 return self.branchref
1011
Edward Lemur85153282020-02-14 22:06:29 +00001012 def _GitGetBranchConfigValue(self, key, default=None):
1013 return scm.GIT.GetBranchConfig(
1014 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001015
Edward Lemur85153282020-02-14 22:06:29 +00001016 def _GitSetBranchConfigValue(self, key, value):
1017 action = 'set %s to %r' % (key, value)
1018 if not value:
1019 action = 'unset %s' % key
1020 assert self.GetBranch(), 'a branch is needed to ' + action
1021 return scm.GIT.SetBranchConfig(
1022 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001023
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001024 @staticmethod
1025 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001026 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001027 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001029 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1030 settings.GetRoot(), branch)
1031 if not remote or not upstream_branch:
1032 DieWithError(
1033 'Unable to determine default branch to diff against.\n'
1034 'Either pass complete "git diff"-style arguments, like\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001035 ' git cl upload origin/main\n'
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001036 'or verify this branch is set up to track another \n'
1037 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038
1039 return remote, upstream_branch
1040
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001041 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001042 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001043 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001044 DieWithError('The upstream for the current branch (%s) does not exist '
1045 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001046 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001047 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001048
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 def GetUpstreamBranch(self):
1050 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001051 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001052 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001053 upstream_branch = upstream_branch.replace('refs/heads/',
1054 'refs/remotes/%s/' % remote)
1055 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1056 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001057 self.upstream_branch = upstream_branch
1058 return self.upstream_branch
1059
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001060 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001061 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001062 remote, branch = None, self.GetBranch()
1063 seen_branches = set()
1064 while branch not in seen_branches:
1065 seen_branches.add(branch)
1066 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001067 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001068 if remote != '.' or branch.startswith('refs/remotes'):
1069 break
1070 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001071 remotes = RunGit(['remote'], error_ok=True).split()
1072 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001073 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001074 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001075 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001076 logging.warn('Could not determine which remote this change is '
1077 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001078 else:
1079 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001080 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001081 branch = 'HEAD'
1082 if branch.startswith('refs/remotes'):
1083 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001084 elif branch.startswith('refs/branch-heads/'):
1085 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001086 else:
1087 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001088 return self._remote
1089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 def GetRemoteUrl(self):
1091 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1092
1093 Returns None if there is no remote.
1094 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001095 is_cached, value = self._cached_remote_url
1096 if is_cached:
1097 return value
1098
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001099 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001100 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001101
Edward Lemur298f2cf2019-02-22 21:40:39 +00001102 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001103 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001104 if host:
1105 self._cached_remote_url = (True, url)
1106 return url
1107
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001108 # If it cannot be parsed as an url, assume it is a local directory,
1109 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001110 logging.warning('"%s" doesn\'t appear to point to a git host. '
1111 'Interpreting it as a local directory.', url)
1112 if not os.path.isdir(url):
1113 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001114 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1115 'but it doesn\'t exist.',
1116 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001117 return None
1118
1119 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001120 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001121
Edward Lemur79d4f992019-11-11 23:49:02 +00001122 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001123 if not host:
1124 logging.error(
1125 'Remote "%(remote)s" for branch "%(branch)s" points to '
1126 '"%(cache_path)s", but it is misconfigured.\n'
1127 '"%(cache_path)s" must be a git repo and must have a remote named '
1128 '"%(remote)s" pointing to the git host.', {
1129 'remote': remote,
1130 'cache_path': cache_path,
1131 'branch': self.GetBranch()})
1132 return None
1133
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001134 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001135 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001137 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001138 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001139 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001140 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001141 if self.issue is not None:
1142 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001143 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 return self.issue
1145
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001146 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001148 issue = self.GetIssue()
1149 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001150 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001151 server = self.GetCodereviewServer()
1152 if short:
1153 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1154 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155
Edward Lemur6c6827c2020-02-06 21:15:18 +00001156 def FetchDescription(self, pretty=False):
1157 assert self.GetIssue(), 'issue is required to query Gerrit'
1158
Edward Lemur9aa1a962020-02-25 00:58:38 +00001159 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001160 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1161 current_rev = data['current_revision']
1162 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001163
1164 if not pretty:
1165 return self.description
1166
1167 # Set width to 72 columns + 2 space indent.
1168 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1169 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1170 lines = self.description.splitlines()
1171 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172
1173 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001174 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001175 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001176 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001177 if self.patchset is not None:
1178 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001179 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 return self.patchset
1181
Edward Lemur9aa1a962020-02-25 00:58:38 +00001182 def GetAuthor(self):
1183 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1184
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001186 """Set this branch's patchset. If patchset=0, clears the patchset."""
1187 assert self.GetBranch()
1188 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001189 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001190 else:
1191 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001192 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001194 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001195 """Set this branch's issue. If issue isn't given, clears the issue."""
1196 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001198 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001199 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001200 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001201 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001202 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001203 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001204 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 else:
tandrii5d48c322016-08-18 16:19:37 -07001206 # Reset all of these just to be clean.
1207 reset_suffixes = [
1208 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001209 ISSUE_CONFIG_KEY,
1210 PATCHSET_CONFIG_KEY,
1211 CODEREVIEW_SERVER_CONFIG_KEY,
1212 'gerritsquashhash',
1213 ]
tandrii5d48c322016-08-18 16:19:37 -07001214 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001215 try:
1216 self._GitSetBranchConfigValue(prop, None)
1217 except subprocess2.CalledProcessError:
1218 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001219 msg = RunGit(['log', '-1', '--format=%B']).strip()
1220 if msg and git_footers.get_footer_change_id(msg):
1221 print('WARNING: The change patched into this branch has a Change-Id. '
1222 'Removing it.')
1223 RunGit(['commit', '--amend', '-m',
1224 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001225 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001226 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001227 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001228
Edward Lemur2c62b332020-03-12 22:12:33 +00001229 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001230 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001231 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001232 except subprocess2.CalledProcessError:
1233 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001234 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001235 'This branch probably doesn\'t exist anymore. To reset the\n'
1236 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001237 ' git branch --set-upstream-to origin/main %s\n'
1238 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001239 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001240
dsansomee2d6fd92016-09-08 00:10:47 -07001241 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001242 assert self.GetIssue(), 'issue is required to update description'
1243
1244 if gerrit_util.HasPendingChangeEdit(
1245 self._GetGerritHost(), self._GerritChangeIdentifier()):
1246 if not force:
1247 confirm_or_exit(
1248 'The description cannot be modified while the issue has a pending '
1249 'unpublished edit. Either publish the edit in the Gerrit web UI '
1250 'or delete it.\n\n', action='delete the unpublished edit')
1251
1252 gerrit_util.DeletePendingChangeEdit(
1253 self._GetGerritHost(), self._GerritChangeIdentifier())
1254 gerrit_util.SetCommitMessage(
1255 self._GetGerritHost(), self._GerritChangeIdentifier(),
1256 description, notify='NONE')
1257
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001258 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001259
Edward Lemur75526302020-02-27 22:31:05 +00001260 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001261 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001262 '--root', settings.GetRoot(),
1263 '--upstream', upstream,
1264 ]
1265
1266 args.extend(['--verbose'] * verbose)
1267
Edward Lemur99df04e2020-03-05 19:39:43 +00001268 author = self.GetAuthor()
1269 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001270 issue = self.GetIssue()
1271 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001272 if author:
1273 args.extend(['--author', author])
1274 if gerrit_url:
1275 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001276 if issue:
1277 args.extend(['--issue', str(issue)])
1278 if patchset:
1279 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001280
Edward Lemur75526302020-02-27 22:31:05 +00001281 return args
1282
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001283 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001284 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001285 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1286 args = self._GetCommonPresubmitArgs(verbose, upstream)
1287 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001288 if may_prompt:
1289 args.append('--may_prompt')
1290 if parallel:
1291 args.append('--parallel')
1292 if all_files:
1293 args.append('--all_files')
1294
1295 with gclient_utils.temporary_file() as description_file:
1296 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001297
1298 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001299 args.extend(['--json_output', json_output])
1300 args.extend(['--description_file', description_file])
Saagar Sanghavi531d9922020-08-10 20:14:01 +00001301 args.extend(['--gerrit_project', self._GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001302
1303 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001304 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001305 if resultdb and realm:
1306 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1307 elif resultdb:
1308 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1309 # it is not required to pass the realm flag
1310 print('Note: ResultDB reporting will NOT be performed because --realm'
1311 ' was not specified. To enable ResultDB, please run the command'
1312 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001313
1314 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001315 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001316
Edward Lemur227d5102020-02-25 23:45:35 +00001317 metrics.collector.add_repeated('sub_commands', {
1318 'command': 'presubmit',
1319 'execution_time': time_time() - start,
1320 'exit_code': exit_code,
1321 })
1322
1323 if exit_code:
1324 sys.exit(exit_code)
1325
1326 json_results = gclient_utils.FileRead(json_output)
1327 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001328
Edward Lemur75526302020-02-27 22:31:05 +00001329 def RunPostUploadHook(self, verbose, upstream, description):
1330 args = self._GetCommonPresubmitArgs(verbose, upstream)
1331 args.append('--post_upload')
1332
1333 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001334 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001335 args.extend(['--description_file', description_file])
1336 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1337 p.wait()
1338
Edward Lemur5a644f82020-03-18 16:44:57 +00001339 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1340 # Get description message for upload.
1341 if self.GetIssue():
1342 description = self.FetchDescription()
1343 elif options.message:
1344 description = options.message
1345 else:
1346 description = _create_description_from_log(git_diff_args)
1347 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001348 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001349
1350 # Extract bug number from branch name.
1351 bug = options.bug
1352 fixed = options.fixed
1353 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1354 self.GetBranch())
1355 if not bug and not fixed and match:
1356 if match.group('type') == 'bug':
1357 bug = match.group('bugnum')
1358 else:
1359 fixed = match.group('bugnum')
1360
1361 change_description = ChangeDescription(description, bug, fixed)
1362
1363 # Set the reviewer list now so that presubmit checks can access it.
1364 if options.reviewers or options.tbrs or options.add_owners_to:
1365 change_description.update_reviewers(
1366 options.reviewers, options.tbrs, options.add_owners_to, files,
1367 self.GetAuthor())
1368
1369 return change_description
1370
1371 def _GetTitleForUpload(self, options):
1372 # When not squashing, just return options.title.
1373 if not options.squash:
1374 return options.title
1375
1376 # On first upload, patchset title is always this string, while options.title
1377 # gets converted to first line of message.
1378 if not self.GetIssue():
1379 return 'Initial upload'
1380
1381 # When uploading subsequent patchsets, options.message is taken as the title
1382 # if options.title is not provided.
1383 if options.title:
1384 return options.title
1385 if options.message:
1386 return options.message.strip()
1387
1388 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001389 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001390 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001391 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001392 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1393 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001394
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001395 def CMDUpload(self, options, git_diff_args, orig_args):
1396 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001397 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001398 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001399 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001400 else:
1401 if self.GetBranch() is None:
1402 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1403
1404 # Default to diffing against common ancestor of upstream branch
1405 base_branch = self.GetCommonAncestorWithUpstream()
1406 git_diff_args = [base_branch, 'HEAD']
1407
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001408 # Fast best-effort checks to abort before running potentially expensive
1409 # hooks if uploading is likely to fail anyway. Passing these checks does
1410 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001411 self.EnsureAuthenticated(force=options.force)
1412 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001413
1414 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001415 watchlist = watchlists.Watchlists(settings.GetRoot())
1416 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001417 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001418 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001419
Edward Lemur5a644f82020-03-18 16:44:57 +00001420 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001421 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001422 hook_results = self.RunHook(
1423 committing=False,
1424 may_prompt=not options.force,
1425 verbose=options.verbose,
1426 parallel=options.parallel,
1427 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001428 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001429 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001430 resultdb=options.resultdb,
1431 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001432 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001433
Aaron Gable13101a62018-02-09 13:20:41 -08001434 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001435 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001436 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001437 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001438 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001439 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001440 # Run post upload hooks, if specified.
1441 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001442 self.RunPostUploadHook(
1443 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001444
1445 # Upload all dependencies if specified.
1446 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001447 print()
1448 print('--dependencies has been specified.')
1449 print('All dependent local branches will be re-uploaded.')
1450 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001451 # Remove the dependencies flag from args so that we do not end up in a
1452 # loop.
1453 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001454 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001455 return ret
1456
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001457 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001458 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001459
1460 Issue must have been already uploaded and known.
1461 """
1462 assert new_state in _CQState.ALL_STATES
1463 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001464 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001465 vote_map = {
1466 _CQState.NONE: 0,
1467 _CQState.DRY_RUN: 1,
1468 _CQState.COMMIT: 2,
1469 }
1470 labels = {'Commit-Queue': vote_map[new_state]}
1471 notify = False if new_state == _CQState.DRY_RUN else None
1472 gerrit_util.SetReview(
1473 self._GetGerritHost(), self._GerritChangeIdentifier(),
1474 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001475 return 0
1476 except KeyboardInterrupt:
1477 raise
1478 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001479 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001480 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001481 ' * Your project has no CQ,\n'
1482 ' * You don\'t have permission to change the CQ state,\n'
1483 ' * There\'s a bug in this code (see stack trace below).\n'
1484 'Consider specifying which bots to trigger manually or asking your '
1485 'project owners for permissions or contacting Chrome Infra at:\n'
1486 'https://www.chromium.org/infra\n\n' %
1487 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001488 # Still raise exception so that stack trace is printed.
1489 raise
1490
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001491 def _GetGerritHost(self):
1492 # Lazy load of configs.
1493 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001494 if self._gerrit_host and '.' not in self._gerrit_host:
1495 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1496 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001497 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001498 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001499 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001500 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001501 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1502 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001503 return self._gerrit_host
1504
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001505 def _GetGitHost(self):
1506 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001507 remote_url = self.GetRemoteUrl()
1508 if not remote_url:
1509 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001510 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001511
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001512 def GetCodereviewServer(self):
1513 if not self._gerrit_server:
1514 # If we're on a branch then get the server potentially associated
1515 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001516 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001517 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001518 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001519 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001520 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001521 if not self._gerrit_server:
1522 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1523 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001524 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001525 parts[0] = parts[0] + '-review'
1526 self._gerrit_host = '.'.join(parts)
1527 self._gerrit_server = 'https://%s' % self._gerrit_host
1528 return self._gerrit_server
1529
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001530 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001531 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001532 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001533 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001534 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001535 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001536 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001537 if project.endswith('.git'):
1538 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001539 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1540 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1541 # gitiles/git-over-https protocol. E.g.,
1542 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1543 # as
1544 # https://chromium.googlesource.com/v8/v8
1545 if project.startswith('a/'):
1546 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001547 return project
1548
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001549 def _GerritChangeIdentifier(self):
1550 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1551
1552 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001553 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001554 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001555 project = self._GetGerritProject()
1556 if project:
1557 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1558 # Fall back on still unique, but less efficient change number.
1559 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001560
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001561 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001563 if settings.GetGerritSkipEnsureAuthenticated():
1564 # For projects with unusual authentication schemes.
1565 # See http://crbug.com/603378.
1566 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001567
1568 # Check presence of cookies only if using cookies-based auth method.
1569 cookie_auth = gerrit_util.Authenticator.get()
1570 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001571 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001572
Florian Mayerae510e82020-01-30 21:04:48 +00001573 remote_url = self.GetRemoteUrl()
1574 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001575 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001576 return
1577 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001578 logging.warning('Ignoring branch %(branch)s with non-https remote '
1579 '%(remote)s', {
1580 'branch': self.branch,
1581 'remote': self.GetRemoteUrl()
1582 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001583 return
1584
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001585 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001586 self.GetCodereviewServer()
1587 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001588 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001589
1590 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1591 git_auth = cookie_auth.get_auth_header(git_host)
1592 if gerrit_auth and git_auth:
1593 if gerrit_auth == git_auth:
1594 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001595 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001596 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001597 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598 ' %s\n'
1599 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001600 ' Consider running the following command:\n'
1601 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001602 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001603 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001604 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001605 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001606 cookie_auth.get_new_password_message(git_host)))
1607 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001608 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001609 return
1610 else:
1611 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001612 ([] if gerrit_auth else [self._gerrit_host]) +
1613 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614 DieWithError('Credentials for the following hosts are required:\n'
1615 ' %s\n'
1616 'These are read from %s (or legacy %s)\n'
1617 '%s' % (
1618 '\n '.join(missing),
1619 cookie_auth.get_gitcookies_path(),
1620 cookie_auth.get_netrc_path(),
1621 cookie_auth.get_new_password_message(git_host)))
1622
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001623 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001624 if not self.GetIssue():
1625 return
1626
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001627 status = self._GetChangeDetail()['status']
1628 if status in ('MERGED', 'ABANDONED'):
1629 DieWithError('Change %s has been %s, new uploads are not allowed' %
1630 (self.GetIssueURL(),
1631 'submitted' if status == 'MERGED' else 'abandoned'))
1632
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001633 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1634 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1635 # Apparently this check is not very important? Otherwise get_auth_email
1636 # could have been added to other implementations of Authenticator.
1637 cookies_auth = gerrit_util.Authenticator.get()
1638 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001639 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001640
1641 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001642 if self.GetIssueOwner() == cookies_user:
1643 return
1644 logging.debug('change %s owner is %s, cookies user is %s',
1645 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001646 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001647 # so ask what Gerrit thinks of this user.
1648 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1649 if details['email'] == self.GetIssueOwner():
1650 return
1651 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001652 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001653 'as %s.\n'
1654 'Uploading may fail due to lack of permissions.' %
1655 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1656 confirm_or_exit(action='upload')
1657
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001658 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001659 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001660 or CQ status, assuming adherence to a common workflow.
1661
1662 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001663 * 'error' - error from review tool (including deleted issues)
1664 * 'unsent' - no reviewers added
1665 * 'waiting' - waiting for review
1666 * 'reply' - waiting for uploader to reply to review
1667 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001668 * 'dry-run' - dry-running in the CQ
1669 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001670 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001671 """
1672 if not self.GetIssue():
1673 return None
1674
1675 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001676 data = self._GetChangeDetail([
1677 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001678 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001679 return 'error'
1680
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001681 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001682 return 'closed'
1683
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001684 cq_label = data['labels'].get('Commit-Queue', {})
1685 max_cq_vote = 0
1686 for vote in cq_label.get('all', []):
1687 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1688 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001689 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001690 if max_cq_vote == 1:
1691 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001692
Aaron Gable9ab38c62017-04-06 14:36:33 -07001693 if data['labels'].get('Code-Review', {}).get('approved'):
1694 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001695
1696 if not data.get('reviewers', {}).get('REVIEWER', []):
1697 return 'unsent'
1698
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001699 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001700 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001701 while messages:
1702 m = messages.pop()
1703 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001704 # Ignore replies from CQ.
1705 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001706 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001707 # Most recent message was by owner.
1708 return 'waiting'
1709 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001710 # Some reply from non-owner.
1711 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001712
1713 # Somehow there are no messages even though there are reviewers.
1714 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001715
1716 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001717 if not self.GetIssue():
1718 return None
1719
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001720 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001721 patchset = data['revisions'][data['current_revision']]['_number']
1722 self.SetPatchset(patchset)
1723 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001724
Aaron Gable636b13f2017-07-14 10:42:48 -07001725 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001726 gerrit_util.SetReview(
1727 self._GetGerritHost(), self._GerritChangeIdentifier(),
1728 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001729
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001730 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001731 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001732 # CURRENT_REVISION is included to get the latest patchset so that
1733 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001734 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001735 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1736 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001737 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001738 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001739 robot_file_comments = gerrit_util.GetChangeRobotComments(
1740 self._GetGerritHost(), self._GerritChangeIdentifier())
1741
1742 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001743 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001744 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001745 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001746 line_comments = file_comments.setdefault(path, [])
1747 line_comments.extend(
1748 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001749
1750 # Build dictionary of file comments for easy access and sorting later.
1751 # {author+date: {path: {patchset: {line: url+message}}}}
1752 comments = collections.defaultdict(
1753 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001754 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001755 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001756 tag = comment.get('tag', '')
1757 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001758 continue
1759 key = (comment['author']['email'], comment['updated'])
1760 if comment.get('side', 'REVISION') == 'PARENT':
1761 patchset = 'Base'
1762 else:
1763 patchset = 'PS%d' % comment['patch_set']
1764 line = comment.get('line', 0)
1765 url = ('https://%s/c/%s/%s/%s#%s%s' %
1766 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1767 'b' if comment.get('side') == 'PARENT' else '',
1768 str(line) if line else ''))
1769 comments[key][path][patchset][line] = (url, comment['message'])
1770
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001771 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001772 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001773 summary = self._BuildCommentSummary(msg, comments, readable)
1774 if summary:
1775 summaries.append(summary)
1776 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001777
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001778 @staticmethod
1779 def _BuildCommentSummary(msg, comments, readable):
1780 key = (msg['author']['email'], msg['date'])
1781 # Don't bother showing autogenerated messages that don't have associated
1782 # file or line comments. this will filter out most autogenerated
1783 # messages, but will keep robot comments like those from Tricium.
1784 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1785 if is_autogenerated and not comments.get(key):
1786 return None
1787 message = msg['message']
1788 # Gerrit spits out nanoseconds.
1789 assert len(msg['date'].split('.')[-1]) == 9
1790 date = datetime.datetime.strptime(msg['date'][:-3],
1791 '%Y-%m-%d %H:%M:%S.%f')
1792 if key in comments:
1793 message += '\n'
1794 for path, patchsets in sorted(comments.get(key, {}).items()):
1795 if readable:
1796 message += '\n%s' % path
1797 for patchset, lines in sorted(patchsets.items()):
1798 for line, (url, content) in sorted(lines.items()):
1799 if line:
1800 line_str = 'Line %d' % line
1801 path_str = '%s:%d:' % (path, line)
1802 else:
1803 line_str = 'File comment'
1804 path_str = '%s:0:' % path
1805 if readable:
1806 message += '\n %s, %s: %s' % (patchset, line_str, url)
1807 message += '\n %s\n' % content
1808 else:
1809 message += '\n%s ' % path_str
1810 message += '\n%s\n' % content
1811
1812 return _CommentSummary(
1813 date=date,
1814 message=message,
1815 sender=msg['author']['email'],
1816 autogenerated=is_autogenerated,
1817 # These could be inferred from the text messages and correlated with
1818 # Code-Review label maximum, however this is not reliable.
1819 # Leaving as is until the need arises.
1820 approval=False,
1821 disapproval=False,
1822 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001823
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001824 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001825 gerrit_util.AbandonChange(
1826 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001827
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001828 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001829 gerrit_util.SubmitChange(
1830 self._GetGerritHost(), self._GerritChangeIdentifier(),
1831 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001832
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001833 def _GetChangeDetail(self, options=None):
1834 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001835 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001836 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001837
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001838 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001839 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001840 options.append('CURRENT_COMMIT')
1841
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001842 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001843 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001844 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001845
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001846 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1847 # Assumption: data fetched before with extra options is suitable
1848 # for return for a smaller set of options.
1849 # For example, if we cached data for
1850 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1851 # and request is for options=[CURRENT_REVISION],
1852 # THEN we can return prior cached data.
1853 if options_set.issubset(cached_options_set):
1854 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001855
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001856 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001857 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001858 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001859 except gerrit_util.GerritError as e:
1860 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001861 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001862 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001863
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001864 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001865 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001866
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001867 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001868 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001869 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001870 data = gerrit_util.GetChangeCommit(
1871 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001872 except gerrit_util.GerritError as e:
1873 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001874 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001875 raise
agable32978d92016-11-01 12:55:02 -07001876 return data
1877
Karen Qian40c19422019-03-13 21:28:29 +00001878 def _IsCqConfigured(self):
1879 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001880 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001881
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001882 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001883 if git_common.is_dirty_git_tree('land'):
1884 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001885
tandriid60367b2016-06-22 05:25:12 -07001886 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001887 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001888 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001889 'which can test and land changes for you. '
1890 'Are you sure you wish to bypass it?\n',
1891 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001892 differs = True
tandriic4344b52016-08-29 06:04:54 -07001893 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001894 # Note: git diff outputs nothing if there is no diff.
1895 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001897 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001898 if detail['current_revision'] == last_upload:
1899 differs = False
1900 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001901 print('WARNING: Local branch contents differ from latest uploaded '
1902 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001903 if differs:
1904 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001905 confirm_or_exit(
1906 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1907 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001908 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001909 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001910 upstream = self.GetCommonAncestorWithUpstream()
1911 if self.GetIssue():
1912 description = self.FetchDescription()
1913 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001914 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001915 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001916 committing=True,
1917 may_prompt=not force,
1918 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001919 parallel=parallel,
1920 upstream=upstream,
1921 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001922 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001923 resultdb=resultdb,
1924 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001925
1926 self.SubmitIssue(wait_for_merge=True)
1927 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001928 links = self._GetChangeCommit().get('web_links', [])
1929 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001930 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001931 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001932 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001933 return 0
1934
Edward Lemurf38bc172019-09-03 21:02:13 +00001935 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001936 assert parsed_issue_arg.valid
1937
Edward Lemur125d60a2019-09-13 18:25:41 +00001938 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001939
1940 if parsed_issue_arg.hostname:
1941 self._gerrit_host = parsed_issue_arg.hostname
1942 self._gerrit_server = 'https://%s' % self._gerrit_host
1943
tandriic2405f52016-10-10 08:13:15 -07001944 try:
1945 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001946 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001947 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001948
1949 if not parsed_issue_arg.patchset:
1950 # Use current revision by default.
1951 revision_info = detail['revisions'][detail['current_revision']]
1952 patchset = int(revision_info['_number'])
1953 else:
1954 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001955 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1957 break
1958 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001959 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001960 (parsed_issue_arg.patchset, self.GetIssue()))
1961
Edward Lemur125d60a2019-09-13 18:25:41 +00001962 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001963 if remote_url.endswith('.git'):
1964 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001965 remote_url = remote_url.rstrip('/')
1966
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001967 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001968 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001969
1970 if remote_url != fetch_info['url']:
1971 DieWithError('Trying to patch a change from %s but this repo appears '
1972 'to be %s.' % (fetch_info['url'], remote_url))
1973
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001974 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001975
Aaron Gable62619a32017-06-16 08:22:09 -07001976 if force:
1977 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1978 print('Checked out commit for change %i patchset %i locally' %
1979 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001980 elif nocommit:
1981 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1982 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001983 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001984 RunGit(['cherry-pick', 'FETCH_HEAD'])
1985 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001986 (parsed_issue_arg.issue, patchset))
1987 print('Note: this created a local commit which does not have '
1988 'the same hash as the one uploaded for review. This will make '
1989 'uploading changes based on top of this branch difficult.\n'
1990 'If you want to do that, use "git cl patch --force" instead.')
1991
Stefan Zagerd08043c2017-10-12 12:07:02 -07001992 if self.GetBranch():
1993 self.SetIssue(parsed_issue_arg.issue)
1994 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001995 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001996 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1997 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1998 else:
1999 print('WARNING: You are in detached HEAD state.\n'
2000 'The patch has been applied to your checkout, but you will not be '
2001 'able to upload a new patch set to the gerrit issue.\n'
2002 'Try using the \'-b\' option if you would like to work on a '
2003 'branch and/or upload a new patch set.')
2004
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002005 return 0
2006
tandrii16e0b4e2016-06-07 10:34:28 -07002007 def _GerritCommitMsgHookCheck(self, offer_removal):
2008 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2009 if not os.path.exists(hook):
2010 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002011 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2012 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002013 data = gclient_utils.FileRead(hook)
2014 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2015 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002016 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002017 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002018 'and may interfere with it in subtle ways.\n'
2019 'We recommend you remove the commit-msg hook.')
2020 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002021 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002022 gclient_utils.rm_file_or_tree(hook)
2023 print('Gerrit commit-msg hook removed.')
2024 else:
2025 print('OK, will keep Gerrit commit-msg hook in place.')
2026
Edward Lemur1b52d872019-05-09 21:12:12 +00002027 def _CleanUpOldTraces(self):
2028 """Keep only the last |MAX_TRACES| traces."""
2029 try:
2030 traces = sorted([
2031 os.path.join(TRACES_DIR, f)
2032 for f in os.listdir(TRACES_DIR)
2033 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2034 and not f.startswith('tmp'))
2035 ])
2036 traces_to_delete = traces[:-MAX_TRACES]
2037 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002038 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002039 except OSError:
2040 print('WARNING: Failed to remove old git traces from\n'
2041 ' %s'
2042 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002043
Edward Lemur5737f022019-05-17 01:24:00 +00002044 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002045 """Zip and write the git push traces stored in traces_dir."""
2046 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002047 traces_zip = trace_name + '-traces'
2048 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002049 # Create a temporary dir to store git config and gitcookies in. It will be
2050 # compressed and stored next to the traces.
2051 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002052 git_info_zip = trace_name + '-git-info'
2053
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002054 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002055
Edward Lemur1b52d872019-05-09 21:12:12 +00002056 git_push_metadata['trace_name'] = trace_name
2057 gclient_utils.FileWrite(
2058 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2059
2060 # Keep only the first 6 characters of the git hashes on the packet
2061 # trace. This greatly decreases size after compression.
2062 packet_traces = os.path.join(traces_dir, 'trace-packet')
2063 if os.path.isfile(packet_traces):
2064 contents = gclient_utils.FileRead(packet_traces)
2065 gclient_utils.FileWrite(
2066 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2067 shutil.make_archive(traces_zip, 'zip', traces_dir)
2068
2069 # Collect and compress the git config and gitcookies.
2070 git_config = RunGit(['config', '-l'])
2071 gclient_utils.FileWrite(
2072 os.path.join(git_info_dir, 'git-config'),
2073 git_config)
2074
2075 cookie_auth = gerrit_util.Authenticator.get()
2076 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2077 gitcookies_path = cookie_auth.get_gitcookies_path()
2078 if os.path.isfile(gitcookies_path):
2079 gitcookies = gclient_utils.FileRead(gitcookies_path)
2080 gclient_utils.FileWrite(
2081 os.path.join(git_info_dir, 'gitcookies'),
2082 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2083 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2084
Edward Lemur1b52d872019-05-09 21:12:12 +00002085 gclient_utils.rmtree(git_info_dir)
2086
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002087 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002088 """Run git push and collect the traces resulting from the execution."""
2089 # Create a temporary directory to store traces in. Traces will be compressed
2090 # and stored in a 'traces' dir inside depot_tools.
2091 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002092 trace_name = os.path.join(
2093 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002094
2095 env = os.environ.copy()
2096 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2097 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002098 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002099 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2100 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2101 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2102
2103 try:
2104 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002105 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002106 before_push = time_time()
2107 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002108 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002109 env=env,
2110 print_stdout=True,
2111 # Flush after every line: useful for seeing progress when running as
2112 # recipe.
2113 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002114 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002115 except subprocess2.CalledProcessError as e:
2116 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002117 raise GitPushError(
2118 'Failed to create a change. Please examine output above for the '
2119 'reason of the failure.\n'
2120 'Hint: run command below to diagnose common Git/Gerrit '
2121 'credential problems:\n'
2122 ' git cl creds-check\n'
2123 '\n'
2124 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2125 'component including the files below.\n'
2126 'Review the files before upload, since they might contain sensitive '
2127 'information.\n'
2128 'Set the Restrict-View-Google label so that they are not publicly '
2129 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002130 finally:
2131 execution_time = time_time() - before_push
2132 metrics.collector.add_repeated('sub_commands', {
2133 'command': 'git push',
2134 'execution_time': execution_time,
2135 'exit_code': push_returncode,
2136 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2137 })
2138
Edward Lemur1b52d872019-05-09 21:12:12 +00002139 git_push_metadata['execution_time'] = execution_time
2140 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002141 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002142
Edward Lemur1b52d872019-05-09 21:12:12 +00002143 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002144 gclient_utils.rmtree(traces_dir)
2145
2146 return push_stdout
2147
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002148 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2149 change_desc):
2150 """Upload the current branch to Gerrit, retry if new remote HEAD is
2151 found. options and change_desc may be mutated."""
2152 try:
2153 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2154 change_desc)
2155 except GitPushError as e:
2156 remote, remote_branch = self.GetRemoteBranch()
2157 should_retry = remote_branch == DEFAULT_OLD_BRANCH and \
2158 gerrit_util.GetProjectHead(
2159 self._gerrit_host, self._GetGerritProject()) == 'refs/heads/main'
2160 if not should_retry:
2161 DieWithError(str(e), change_desc)
2162
2163 print("WARNING: Detected HEAD change in upstream, fetching remote state")
2164 RunGit(['fetch', remote])
2165 options.edit_description = False
2166 options.force = True
2167 try:
2168 self._CMDUploadChange(options, git_diff_args, custom_cl_base, change_desc)
2169 except GitPushError as e:
2170 DieWithError(str(e), change_desc)
2171
2172 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2173 change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002174 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002175 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002176 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002177
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002178 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002179 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002180 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002181 # User requested to change description
2182 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002183 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002184 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002185 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002186 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002187 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002188 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002189 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002190 if len(change_ids) == 1:
2191 change_id = change_ids[0]
2192 else:
2193 change_id = GenerateGerritChangeId(change_desc.description)
2194 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002195
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002196 if options.preserve_tryjobs:
2197 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002198
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002199 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002200 parent = self._ComputeParent(
2201 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002202 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002203 with gclient_utils.temporary_file() as desc_tempfile:
2204 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2205 ref_to_push = RunGit(
2206 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002207 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 if not git_footers.get_footer_change_id(change_desc.description):
2209 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002210 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002211 self._AddChangeIdToCommitMessage(
2212 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002213 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002214 # For no-squash mode, we assume the remote called "origin" is the one we
2215 # want. It is not worthwhile to support different workflows for
2216 # no-squash mode.
2217 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2219
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002220 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002221 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2222 ref_to_push)]).splitlines()
2223 if len(commits) > 1:
2224 print('WARNING: This will upload %d commits. Run the following command '
2225 'to see which commits will be uploaded: ' % len(commits))
2226 print('git log %s..%s' % (parent, ref_to_push))
2227 print('You can also use `git squash-branch` to squash these into a '
2228 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002229 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002230
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002231 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002232 cc = []
2233 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2234 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2235 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002236 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002237 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002238 if options.cc:
2239 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002240 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002241 if change_desc.get_cced():
2242 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002243 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2244 valid_accounts = set(reviewers + cc)
2245 # TODO(crbug/877717): relax this for all hosts.
2246 else:
2247 valid_accounts = gerrit_util.ValidAccounts(
2248 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002249 logging.info('accounts %s are recognized, %s invalid',
2250 sorted(valid_accounts),
2251 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002252
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002253 # Extra options that can be specified at push time. Doc:
2254 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002255 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002256
Aaron Gable844cf292017-06-28 11:32:59 -07002257 # By default, new changes are started in WIP mode, and subsequent patchsets
2258 # don't send email. At any time, passing --send-mail will mark the change
2259 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002260 if options.send_mail:
2261 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002262 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002263 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002264 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002265 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002266 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002267
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002268 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002269 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002270
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002271 # Set options.title in case user was prompted in _GetTitleForUpload and
2272 # _CMDUploadChange needs to be called again.
2273 options.title = self._GetTitleForUpload(options)
2274 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002275 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002276 refspec_opts.append(
2277 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002278
agablec6787972016-09-09 16:13:34 -07002279 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002280 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002281
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002282 for r in sorted(reviewers):
2283 if r in valid_accounts:
2284 refspec_opts.append('r=%s' % r)
2285 reviewers.remove(r)
2286 else:
2287 # TODO(tandrii): this should probably be a hard failure.
2288 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2289 % r)
2290 for c in sorted(cc):
2291 # refspec option will be rejected if cc doesn't correspond to an
2292 # account, even though REST call to add such arbitrary cc may succeed.
2293 if c in valid_accounts:
2294 refspec_opts.append('cc=%s' % c)
2295 cc.remove(c)
2296
rmistry9eadede2016-09-19 11:22:43 -07002297 if options.topic:
2298 # Documentation on Gerrit topics is here:
2299 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002300 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002301
Edward Lemur687ca902018-12-05 02:30:30 +00002302 if options.enable_auto_submit:
2303 refspec_opts.append('l=Auto-Submit+1')
2304 if options.use_commit_queue:
2305 refspec_opts.append('l=Commit-Queue+2')
2306 elif options.cq_dry_run:
2307 refspec_opts.append('l=Commit-Queue+1')
2308
2309 if change_desc.get_reviewers(tbr_only=True):
2310 score = gerrit_util.GetCodeReviewTbrScore(
2311 self._GetGerritHost(),
2312 self._GetGerritProject())
2313 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002314
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002315 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002316 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002317 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002318 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002319 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2320
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002321 refspec_suffix = ''
2322 if refspec_opts:
2323 refspec_suffix = '%' + ','.join(refspec_opts)
2324 assert ' ' not in refspec_suffix, (
2325 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2326 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2327
Edward Lemur1b52d872019-05-09 21:12:12 +00002328 git_push_metadata = {
2329 'gerrit_host': self._GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002330 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002331 'change_id': change_id,
2332 'description': change_desc.description,
2333 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002334 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2335 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002336
2337 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002338 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002339 change_numbers = [m.group(1)
2340 for m in map(regex.match, push_stdout.splitlines())
2341 if m]
2342 if len(change_numbers) != 1:
2343 DieWithError(
2344 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002345 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002346 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002347 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002348
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002349 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002350 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002351 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002352 gerrit_util.AddReviewers(
2353 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002354 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002355 reviewers, cc,
2356 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002357
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002358 return 0
2359
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002360 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2361 change_desc):
2362 """Computes parent of the generated commit to be uploaded to Gerrit.
2363
2364 Returns revision or a ref name.
2365 """
2366 if custom_cl_base:
2367 # Try to avoid creating additional unintended CLs when uploading, unless
2368 # user wants to take this risk.
2369 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2370 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2371 local_ref_of_target_remote])
2372 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002373 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002374 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2375 'If you proceed with upload, more than 1 CL may be created by '
2376 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2377 'If you are certain that specified base `%s` has already been '
2378 'uploaded to Gerrit as another CL, you may proceed.\n' %
2379 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2380 if not force:
2381 confirm_or_exit(
2382 'Do you take responsibility for cleaning up potential mess '
2383 'resulting from proceeding with upload?',
2384 action='upload')
2385 return custom_cl_base
2386
Aaron Gablef97e33d2017-03-30 15:44:27 -07002387 if remote != '.':
2388 return self.GetCommonAncestorWithUpstream()
2389
2390 # If our upstream branch is local, we base our squashed commit on its
2391 # squashed version.
2392 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2393
Aaron Gablef97e33d2017-03-30 15:44:27 -07002394 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002395 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002396 if upstream_branch_name == 'main':
2397 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002398
2399 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002400 # TODO(tandrii): consider checking parent change in Gerrit and using its
2401 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2402 # the tree hash of the parent branch. The upside is less likely bogus
2403 # requests to reupload parent change just because it's uploadhash is
2404 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002405 parent = scm.GIT.GetBranchConfig(
2406 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002407 # Verify that the upstream branch has been uploaded too, otherwise
2408 # Gerrit will create additional CLs when uploading.
2409 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2410 RunGitSilent(['rev-parse', parent + ':'])):
2411 DieWithError(
2412 '\nUpload upstream branch %s first.\n'
2413 'It is likely that this branch has been rebased since its last '
2414 'upload, so you just need to upload it again.\n'
2415 '(If you uploaded it with --no-squash, then branch dependencies '
2416 'are not supported, and you should reupload with --squash.)'
2417 % upstream_branch_name,
2418 change_desc)
2419 return parent
2420
Edward Lemura12175c2020-03-09 16:58:26 +00002421 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002422 """Re-commits using the current message, assumes the commit hook is in
2423 place.
2424 """
Edward Lemura12175c2020-03-09 16:58:26 +00002425 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002426 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002427 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002428 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002429 return new_log_desc
2430 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002431 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002432
tandriie113dfd2016-10-11 10:20:12 -07002433 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002434 try:
2435 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002436 except GerritChangeNotExists:
2437 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002438
2439 if data['status'] in ('ABANDONED', 'MERGED'):
2440 return 'CL %s is closed' % self.GetIssue()
2441
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002442 def GetGerritChange(self, patchset=None):
2443 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002444 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002445 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002446 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002447 data = self._GetChangeDetail(['ALL_REVISIONS'])
2448
2449 assert host and issue and patchset, 'CL must be uploaded first'
2450
2451 has_patchset = any(
2452 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002453 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002454 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002455 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002456 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002457
tandrii8c5a3532016-11-04 07:52:02 -07002458 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002459 'host': host,
2460 'change': issue,
2461 'project': data['project'],
2462 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002463 }
tandriie113dfd2016-10-11 10:20:12 -07002464
tandriide281ae2016-10-12 06:02:30 -07002465 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002466 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002467
Edward Lemur707d70b2018-02-07 00:50:14 +01002468 def GetReviewers(self):
2469 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002470 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002471
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002472
Lei Zhang8a0efc12020-08-05 19:58:45 +00002473def _get_bug_line_values(default_project_prefix, bugs):
2474 """Given default_project_prefix and comma separated list of bugs, yields bug
2475 line values.
tandriif9aefb72016-07-01 09:06:51 -07002476
2477 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002478 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002479 * string, which is left as is.
2480
2481 This function may produce more than one line, because bugdroid expects one
2482 project per line.
2483
Lei Zhang8a0efc12020-08-05 19:58:45 +00002484 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002485 ['v8:123', 'chromium:789']
2486 """
2487 default_bugs = []
2488 others = []
2489 for bug in bugs.split(','):
2490 bug = bug.strip()
2491 if bug:
2492 try:
2493 default_bugs.append(int(bug))
2494 except ValueError:
2495 others.append(bug)
2496
2497 if default_bugs:
2498 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002499 if default_project_prefix:
2500 if not default_project_prefix.endswith(':'):
2501 default_project_prefix += ':'
2502 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002503 else:
2504 yield default_bugs
2505 for other in sorted(others):
2506 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2507 yield other
2508
2509
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002510class ChangeDescription(object):
2511 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002512 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002513 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002514 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002515 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002516 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002517 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2518 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002519 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002520 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002521
Dan Beamd8b04ca2019-10-10 21:23:26 +00002522 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002523 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002524 if bug:
2525 regexp = re.compile(self.BUG_LINE)
2526 prefix = settings.GetBugPrefix()
2527 if not any((regexp.match(line) for line in self._description_lines)):
2528 values = list(_get_bug_line_values(prefix, bug))
2529 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002530 if fixed:
2531 regexp = re.compile(self.FIXED_LINE)
2532 prefix = settings.GetBugPrefix()
2533 if not any((regexp.match(line) for line in self._description_lines)):
2534 values = list(_get_bug_line_values(prefix, fixed))
2535 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002536
agable@chromium.org42c20792013-09-12 17:34:49 +00002537 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002538 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002539 return '\n'.join(self._description_lines)
2540
2541 def set_description(self, desc):
2542 if isinstance(desc, basestring):
2543 lines = desc.splitlines()
2544 else:
2545 lines = [line.rstrip() for line in desc]
2546 while lines and not lines[0]:
2547 lines.pop(0)
2548 while lines and not lines[-1]:
2549 lines.pop(-1)
2550 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002551
Edward Lemur5a644f82020-03-18 16:44:57 +00002552 def ensure_change_id(self, change_id):
2553 description = self.description
2554 footer_change_ids = git_footers.get_footer_change_id(description)
2555 # Make sure that the Change-Id in the description matches the given one.
2556 if footer_change_ids != [change_id]:
2557 if footer_change_ids:
2558 # Remove any existing Change-Id footers since they don't match the
2559 # expected change_id footer.
2560 description = git_footers.remove_footer(description, 'Change-Id')
2561 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2562 'if you want to set a new one.')
2563 # Add the expected Change-Id footer.
2564 description = git_footers.add_footer_change_id(description, change_id)
2565 self.set_description(description)
2566
Edward Lemur2c62b332020-03-12 22:12:33 +00002567 def update_reviewers(
2568 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002569 """Rewrites the R=/TBR= line(s) as a single line each.
2570
2571 Args:
2572 reviewers (list(str)) - list of additional emails to use for reviewers.
2573 tbrs (list(str)) - list of additional emails to use for TBRs.
2574 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2575 the change that are missing OWNER coverage. If this is not None, you
2576 must also pass a value for `change`.
2577 change (Change) - The Change that should be used for OWNERS lookups.
2578 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002579 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002580 assert isinstance(tbrs, list), tbrs
2581
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002582 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002583 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002584
2585 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002586 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002587
2588 reviewers = set(reviewers)
2589 tbrs = set(tbrs)
2590 LOOKUP = {
2591 'TBR': tbrs,
2592 'R': reviewers,
2593 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002594
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002595 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002596 regexp = re.compile(self.R_LINE)
2597 matches = [regexp.match(line) for line in self._description_lines]
2598 new_desc = [l for i, l in enumerate(self._description_lines)
2599 if not matches[i]]
2600 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002601
agable@chromium.org42c20792013-09-12 17:34:49 +00002602 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002603
2604 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002605 for match in matches:
2606 if not match:
2607 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002608 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2609
2610 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002611 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002612 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002613 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002614 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002615 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002616 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002617 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002618
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002619 # If any folks ended up in both groups, remove them from tbrs.
2620 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002621
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002622 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2623 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002624
2625 # Put the new lines in the description where the old first R= line was.
2626 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2627 if 0 <= line_loc < len(self._description_lines):
2628 if new_tbr_line:
2629 self._description_lines.insert(line_loc, new_tbr_line)
2630 if new_r_line:
2631 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002632 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002633 if new_r_line:
2634 self.append_footer(new_r_line)
2635 if new_tbr_line:
2636 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002637
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002638 def set_preserve_tryjobs(self):
2639 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2640 footers = git_footers.parse_footers(self.description)
2641 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2642 if v.lower() == 'true':
2643 return
2644 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2645
Anthony Polito8b955342019-09-24 19:01:36 +00002646 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002647 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002648 self.set_description([
2649 '# Enter a description of the change.',
2650 '# This will be displayed on the codereview site.',
2651 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002652 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002653 '--------------------',
2654 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002655 bug_regexp = re.compile(self.BUG_LINE)
2656 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002657 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002658 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2659 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002660 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002661
agable@chromium.org42c20792013-09-12 17:34:49 +00002662 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002663 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002664 if not content:
2665 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002666 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002667
Bruce Dawson2377b012018-01-11 16:46:49 -08002668 # Strip off comments and default inserted "Bug:" line.
2669 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002670 (line.startswith('#') or
2671 line.rstrip() == "Bug:" or
2672 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002673 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002674 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002675 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002676
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002677 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002678 """Adds a footer line to the description.
2679
2680 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2681 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2682 that Gerrit footers are always at the end.
2683 """
2684 parsed_footer_line = git_footers.parse_footer(line)
2685 if parsed_footer_line:
2686 # Line is a gerrit footer in the form: Footer-Key: any value.
2687 # Thus, must be appended observing Gerrit footer rules.
2688 self.set_description(
2689 git_footers.add_footer(self.description,
2690 key=parsed_footer_line[0],
2691 value=parsed_footer_line[1]))
2692 return
2693
2694 if not self._description_lines:
2695 self._description_lines.append(line)
2696 return
2697
2698 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2699 if gerrit_footers:
2700 # git_footers.split_footers ensures that there is an empty line before
2701 # actual (gerrit) footers, if any. We have to keep it that way.
2702 assert top_lines and top_lines[-1] == ''
2703 top_lines, separator = top_lines[:-1], top_lines[-1:]
2704 else:
2705 separator = [] # No need for separator if there are no gerrit_footers.
2706
2707 prev_line = top_lines[-1] if top_lines else ''
2708 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2709 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2710 top_lines.append('')
2711 top_lines.append(line)
2712 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002713
tandrii99a72f22016-08-17 14:33:24 -07002714 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002715 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002716 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002717 reviewers = [match.group(2).strip()
2718 for match in matches
2719 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002720 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002721
bradnelsond975b302016-10-23 12:20:23 -07002722 def get_cced(self):
2723 """Retrieves the list of reviewers."""
2724 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2725 cced = [match.group(2).strip() for match in matches if match]
2726 return cleanup_list(cced)
2727
Nodir Turakulov23b82142017-11-16 11:04:25 -08002728 def get_hash_tags(self):
2729 """Extracts and sanitizes a list of Gerrit hashtags."""
2730 subject = (self._description_lines or ('',))[0]
2731 subject = re.sub(
2732 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2733
2734 tags = []
2735 start = 0
2736 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2737 while True:
2738 m = bracket_exp.match(subject, start)
2739 if not m:
2740 break
2741 tags.append(self.sanitize_hash_tag(m.group(1)))
2742 start = m.end()
2743
2744 if not tags:
2745 # Try "Tag: " prefix.
2746 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2747 if m:
2748 tags.append(self.sanitize_hash_tag(m.group(1)))
2749 return tags
2750
2751 @classmethod
2752 def sanitize_hash_tag(cls, tag):
2753 """Returns a sanitized Gerrit hash tag.
2754
2755 A sanitized hashtag can be used as a git push refspec parameter value.
2756 """
2757 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2758
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002759
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002760def FindCodereviewSettingsFile(filename='codereview.settings'):
2761 """Finds the given file starting in the cwd and going up.
2762
2763 Only looks up to the top of the repository unless an
2764 'inherit-review-settings-ok' file exists in the root of the repository.
2765 """
2766 inherit_ok_file = 'inherit-review-settings-ok'
2767 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002768 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002769 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2770 root = '/'
2771 while True:
2772 if filename in os.listdir(cwd):
2773 if os.path.isfile(os.path.join(cwd, filename)):
2774 return open(os.path.join(cwd, filename))
2775 if cwd == root:
2776 break
2777 cwd = os.path.dirname(cwd)
2778
2779
2780def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002781 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002782 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002783
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002784 def SetProperty(name, setting, unset_error_ok=False):
2785 fullname = 'rietveld.' + name
2786 if setting in keyvals:
2787 RunGit(['config', fullname, keyvals[setting]])
2788 else:
2789 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2790
tandrii48df5812016-10-17 03:55:37 -07002791 if not keyvals.get('GERRIT_HOST', False):
2792 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002793 # Only server setting is required. Other settings can be absent.
2794 # In that case, we ignore errors raised during option deletion attempt.
2795 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2796 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2797 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002798 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002799 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2800 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002801 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2802 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002803 SetProperty(
2804 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002805
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002806 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002807 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002808
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002809 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002810 RunGit(['config', 'gerrit.squash-uploads',
2811 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002812
tandrii@chromium.org28253532016-04-14 13:46:56 +00002813 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002814 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002815 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2816
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002817 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002818 # should be of the form
2819 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2820 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002821 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2822 keyvals['ORIGIN_URL_CONFIG']])
2823
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002824
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002825def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002826 """Downloads a network object to a local file, like urllib.urlretrieve.
2827
2828 This is necessary because urllib is broken for SSL connections via a proxy.
2829 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002830 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002831 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002832
2833
ukai@chromium.org712d6102013-11-27 00:52:58 +00002834def hasSheBang(fname):
2835 """Checks fname is a #! script."""
2836 with open(fname) as f:
2837 return f.read(2).startswith('#!')
2838
2839
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002840def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002841 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002842
2843 Args:
2844 force: True to update hooks. False to install hooks if not present.
2845 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002846 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002847 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2848 if not os.access(dst, os.X_OK):
2849 if os.path.exists(dst):
2850 if not force:
2851 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002852 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002853 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002854 if not hasSheBang(dst):
2855 DieWithError('Not a script: %s\n'
2856 'You need to download from\n%s\n'
2857 'into .git/hooks/commit-msg and '
2858 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002859 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2860 except Exception:
2861 if os.path.exists(dst):
2862 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002863 DieWithError('\nFailed to download hooks.\n'
2864 'You need to download from\n%s\n'
2865 'into .git/hooks/commit-msg and '
2866 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002867
2868
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002869class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002870 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002871
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002872 _GOOGLESOURCE = 'googlesource.com'
2873
2874 def __init__(self):
2875 # Cached list of [host, identity, source], where source is either
2876 # .gitcookies or .netrc.
2877 self._all_hosts = None
2878
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002879 def ensure_configured_gitcookies(self):
2880 """Runs checks and suggests fixes to make git use .gitcookies from default
2881 path."""
2882 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2883 configured_path = RunGitSilent(
2884 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002885 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002886 if configured_path:
2887 self._ensure_default_gitcookies_path(configured_path, default)
2888 else:
2889 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002890
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002891 @staticmethod
2892 def _ensure_default_gitcookies_path(configured_path, default_path):
2893 assert configured_path
2894 if configured_path == default_path:
2895 print('git is already configured to use your .gitcookies from %s' %
2896 configured_path)
2897 return
2898
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002899 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002900 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2901 (configured_path, default_path))
2902
2903 if not os.path.exists(configured_path):
2904 print('However, your configured .gitcookies file is missing.')
2905 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2906 action='reconfigure')
2907 RunGit(['config', '--global', 'http.cookiefile', default_path])
2908 return
2909
2910 if os.path.exists(default_path):
2911 print('WARNING: default .gitcookies file already exists %s' %
2912 default_path)
2913 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2914 default_path)
2915
2916 confirm_or_exit('Move existing .gitcookies to default location?',
2917 action='move')
2918 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002919 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002920 print('Moved and reconfigured git to use .gitcookies from %s' %
2921 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002922
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002923 @staticmethod
2924 def _configure_gitcookies_path(default_path):
2925 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2926 if os.path.exists(netrc_path):
2927 print('You seem to be using outdated .netrc for git credentials: %s' %
2928 netrc_path)
2929 print('This tool will guide you through setting up recommended '
2930 '.gitcookies store for git credentials.\n'
2931 '\n'
2932 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2933 ' git config --global --unset http.cookiefile\n'
2934 ' mv %s %s.backup\n\n' % (default_path, default_path))
2935 confirm_or_exit(action='setup .gitcookies')
2936 RunGit(['config', '--global', 'http.cookiefile', default_path])
2937 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002938
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002939 def get_hosts_with_creds(self, include_netrc=False):
2940 if self._all_hosts is None:
2941 a = gerrit_util.CookiesAuthenticator()
2942 self._all_hosts = [
2943 (h, u, s)
2944 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002945 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2946 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002947 )
2948 if h.endswith(self._GOOGLESOURCE)
2949 ]
2950
2951 if include_netrc:
2952 return self._all_hosts
2953 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2954
2955 def print_current_creds(self, include_netrc=False):
2956 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2957 if not hosts:
2958 print('No Git/Gerrit credentials found')
2959 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002960 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002961 header = [('Host', 'User', 'Which file'),
2962 ['=' * l for l in lengths]]
2963 for row in (header + hosts):
2964 print('\t'.join((('%%+%ds' % l) % s)
2965 for l, s in zip(lengths, row)))
2966
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002967 @staticmethod
2968 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002969 """Parses identity "git-<username>.domain" into <username> and domain."""
2970 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002971 # distinguishable from sub-domains. But we do know typical domains:
2972 if identity.endswith('.chromium.org'):
2973 domain = 'chromium.org'
2974 username = identity[:-len('.chromium.org')]
2975 else:
2976 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002977 if username.startswith('git-'):
2978 username = username[len('git-'):]
2979 return username, domain
2980
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002981 def _canonical_git_googlesource_host(self, host):
2982 """Normalizes Gerrit hosts (with '-review') to Git host."""
2983 assert host.endswith(self._GOOGLESOURCE)
2984 # Prefix doesn't include '.' at the end.
2985 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2986 if prefix.endswith('-review'):
2987 prefix = prefix[:-len('-review')]
2988 return prefix + '.' + self._GOOGLESOURCE
2989
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002990 def _canonical_gerrit_googlesource_host(self, host):
2991 git_host = self._canonical_git_googlesource_host(host)
2992 prefix = git_host.split('.', 1)[0]
2993 return prefix + '-review.' + self._GOOGLESOURCE
2994
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002995 def _get_counterpart_host(self, host):
2996 assert host.endswith(self._GOOGLESOURCE)
2997 git = self._canonical_git_googlesource_host(host)
2998 gerrit = self._canonical_gerrit_googlesource_host(git)
2999 return git if gerrit == host else gerrit
3000
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003001 def has_generic_host(self):
3002 """Returns whether generic .googlesource.com has been configured.
3003
3004 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3005 """
3006 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3007 if host == '.' + self._GOOGLESOURCE:
3008 return True
3009 return False
3010
3011 def _get_git_gerrit_identity_pairs(self):
3012 """Returns map from canonic host to pair of identities (Git, Gerrit).
3013
3014 One of identities might be None, meaning not configured.
3015 """
3016 host_to_identity_pairs = {}
3017 for host, identity, _ in self.get_hosts_with_creds():
3018 canonical = self._canonical_git_googlesource_host(host)
3019 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3020 idx = 0 if canonical == host else 1
3021 pair[idx] = identity
3022 return host_to_identity_pairs
3023
3024 def get_partially_configured_hosts(self):
3025 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003026 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003027 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003028 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003029
3030 def get_conflicting_hosts(self):
3031 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003032 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003033 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003034 if None not in (i1, i2) and i1 != i2)
3035
3036 def get_duplicated_hosts(self):
3037 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003038 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003039
3040 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3041 'chromium.googlesource.com': 'chromium.org',
3042 'chrome-internal.googlesource.com': 'google.com',
3043 }
3044
3045 def get_hosts_with_wrong_identities(self):
3046 """Finds hosts which **likely** reference wrong identities.
3047
3048 Note: skips hosts which have conflicting identities for Git and Gerrit.
3049 """
3050 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003051 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003052 pair = self._get_git_gerrit_identity_pairs().get(host)
3053 if pair and pair[0] == pair[1]:
3054 _, domain = self._parse_identity(pair[0])
3055 if domain != expected:
3056 hosts.add(host)
3057 return hosts
3058
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003059 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003060 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003061 hosts = sorted(hosts)
3062 assert hosts
3063 if extra_column_func is None:
3064 extras = [''] * len(hosts)
3065 else:
3066 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003067 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3068 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003069 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003070 lines.append(tmpl % he)
3071 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003072
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003073 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003074 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003075 yield ('.googlesource.com wildcard record detected',
3076 ['Chrome Infrastructure team recommends to list full host names '
3077 'explicitly.'],
3078 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003079
3080 dups = self.get_duplicated_hosts()
3081 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003082 yield ('The following hosts were defined twice',
3083 self._format_hosts(dups),
3084 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003085
3086 partial = self.get_partially_configured_hosts()
3087 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003088 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3089 'These hosts are missing',
3090 self._format_hosts(partial, lambda host: 'but %s defined' %
3091 self._get_counterpart_host(host)),
3092 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003093
3094 conflicting = self.get_conflicting_hosts()
3095 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003096 yield ('The following Git hosts have differing credentials from their '
3097 'Gerrit counterparts',
3098 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3099 tuple(self._get_git_gerrit_identity_pairs()[host])),
3100 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003101
3102 wrong = self.get_hosts_with_wrong_identities()
3103 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003104 yield ('These hosts likely use wrong identity',
3105 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3106 (self._get_git_gerrit_identity_pairs()[host][0],
3107 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3108 wrong)
3109
3110 def find_and_report_problems(self):
3111 """Returns True if there was at least one problem, else False."""
3112 found = False
3113 bad_hosts = set()
3114 for title, sublines, hosts in self._find_problems():
3115 if not found:
3116 found = True
3117 print('\n\n.gitcookies problem report:\n')
3118 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003119 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003120 if sublines:
3121 print()
3122 print(' %s' % '\n '.join(sublines))
3123 print()
3124
3125 if bad_hosts:
3126 assert found
3127 print(' You can manually remove corresponding lines in your %s file and '
3128 'visit the following URLs with correct account to generate '
3129 'correct credential lines:\n' %
3130 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3131 print(' %s' % '\n '.join(sorted(set(
3132 gerrit_util.CookiesAuthenticator().get_new_password_url(
3133 self._canonical_git_googlesource_host(host))
3134 for host in bad_hosts
3135 ))))
3136 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003137
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003138
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003139@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003140def CMDcreds_check(parser, args):
3141 """Checks credentials and suggests changes."""
3142 _, _ = parser.parse_args(args)
3143
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003144 # Code below checks .gitcookies. Abort if using something else.
3145 authn = gerrit_util.Authenticator.get()
3146 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003147 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003148 'This command is not designed for bot environment. It checks '
3149 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003150 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3151 if isinstance(authn, gerrit_util.GceAuthenticator):
3152 message += (
3153 '\n'
3154 'If you need to run this on GCE or a cloudtop instance, '
3155 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3156 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003157
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003158 checker = _GitCookiesChecker()
3159 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003160
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003161 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003162 checker.print_current_creds(include_netrc=True)
3163
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003164 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003165 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003166 return 0
3167 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003168
3169
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003170@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003171def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003172 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003173 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003174 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003175 _, args = parser.parse_args(args)
3176 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003177 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003178 return RunGit(['config', 'branch.%s.base-url' % branch],
3179 error_ok=False).strip()
3180 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003181 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003182 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3183 error_ok=False).strip()
3184
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003185
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003186def color_for_status(status):
3187 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003188 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003189 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003190 'unsent': BOLD + Fore.YELLOW,
3191 'waiting': BOLD + Fore.RED,
3192 'reply': BOLD + Fore.YELLOW,
3193 'not lgtm': BOLD + Fore.RED,
3194 'lgtm': BOLD + Fore.GREEN,
3195 'commit': BOLD + Fore.MAGENTA,
3196 'closed': BOLD + Fore.CYAN,
3197 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003198 }.get(status, Fore.WHITE)
3199
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003200
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003201def get_cl_statuses(changes, fine_grained, max_processes=None):
3202 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003203
3204 If fine_grained is true, this will fetch CL statuses from the server.
3205 Otherwise, simply indicate if there's a matching url for the given branches.
3206
3207 If max_processes is specified, it is used as the maximum number of processes
3208 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3209 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003210
3211 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003212 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003213 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003214 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003215
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003216 if not fine_grained:
3217 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003218 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003219 for cl in changes:
3220 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003221 return
3222
3223 # First, sort out authentication issues.
3224 logging.debug('ensuring credentials exist')
3225 for cl in changes:
3226 cl.EnsureAuthenticated(force=False, refresh=True)
3227
3228 def fetch(cl):
3229 try:
3230 return (cl, cl.GetStatus())
3231 except:
3232 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003233 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003234 raise
3235
3236 threads_count = len(changes)
3237 if max_processes:
3238 threads_count = max(1, min(threads_count, max_processes))
3239 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3240
Edward Lemur61bf4172020-02-24 23:22:37 +00003241 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003242 fetched_cls = set()
3243 try:
3244 it = pool.imap_unordered(fetch, changes).__iter__()
3245 while True:
3246 try:
3247 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003248 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003249 break
3250 fetched_cls.add(cl)
3251 yield cl, status
3252 finally:
3253 pool.close()
3254
3255 # Add any branches that failed to fetch.
3256 for cl in set(changes) - fetched_cls:
3257 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003258
rmistry@google.com2dd99862015-06-22 12:22:18 +00003259
Jose Lopes3863fc52020-04-07 17:00:25 +00003260def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003261 """Uploads CLs of local branches that are dependents of the current branch.
3262
3263 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003264
3265 test1 -> test2.1 -> test3.1
3266 -> test3.2
3267 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003268
3269 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3270 run on the dependent branches in this order:
3271 test2.1, test3.1, test3.2, test2.2, test3.3
3272
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003273 Note: This function does not rebase your local dependent branches. Use it
3274 when you make a change to the parent branch that will not conflict
3275 with its dependent branches, and you would like their dependencies
3276 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003277 """
3278 if git_common.is_dirty_git_tree('upload-branch-deps'):
3279 return 1
3280
3281 root_branch = cl.GetBranch()
3282 if root_branch is None:
3283 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3284 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003285 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003286 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3287 'patchset dependencies without an uploaded CL.')
3288
3289 branches = RunGit(['for-each-ref',
3290 '--format=%(refname:short) %(upstream:short)',
3291 'refs/heads'])
3292 if not branches:
3293 print('No local branches found.')
3294 return 0
3295
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003296 # Create a dictionary of all local branches to the branches that are
3297 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003298 tracked_to_dependents = collections.defaultdict(list)
3299 for b in branches.splitlines():
3300 tokens = b.split()
3301 if len(tokens) == 2:
3302 branch_name, tracked = tokens
3303 tracked_to_dependents[tracked].append(branch_name)
3304
vapiera7fbd5a2016-06-16 09:17:49 -07003305 print()
3306 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003307 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003308
rmistry@google.com2dd99862015-06-22 12:22:18 +00003309 def traverse_dependents_preorder(branch, padding=''):
3310 dependents_to_process = tracked_to_dependents.get(branch, [])
3311 padding += ' '
3312 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003313 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003314 dependents.append(dependent)
3315 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003316
rmistry@google.com2dd99862015-06-22 12:22:18 +00003317 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003318 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003319
3320 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003321 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003322 return 0
3323
Jose Lopes3863fc52020-04-07 17:00:25 +00003324 if not force:
3325 confirm_or_exit('This command will checkout all dependent branches and run '
3326 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003327
rmistry@google.com2dd99862015-06-22 12:22:18 +00003328 # Record all dependents that failed to upload.
3329 failures = {}
3330 # Go through all dependents, checkout the branch and upload.
3331 try:
3332 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003333 print()
3334 print('--------------------------------------')
3335 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003336 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003337 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003338 try:
3339 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003340 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003341 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003342 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003343 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003344 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003345 finally:
3346 # Swap back to the original root branch.
3347 RunGit(['checkout', '-q', root_branch])
3348
vapiera7fbd5a2016-06-16 09:17:49 -07003349 print()
3350 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003351 for dependent_branch in dependents:
3352 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003353 print(' %s : %s' % (dependent_branch, upload_status))
3354 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003355
3356 return 0
3357
3358
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003359def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003360 """Given a proposed tag name, returns a tag name that is guaranteed to be
3361 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3362 or 'foo-3', and so on."""
3363
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003364 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003365 for suffix_num in itertools.count(1):
3366 if suffix_num == 1:
3367 to_check = proposed_tag
3368 else:
3369 to_check = '%s-%d' % (proposed_tag, suffix_num)
3370
3371 if to_check not in existing_tags:
3372 return to_check
3373
3374
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003375@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003376def CMDarchive(parser, args):
3377 """Archives and deletes branches associated with closed changelists."""
3378 parser.add_option(
3379 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003380 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003381 parser.add_option(
3382 '-f', '--force', action='store_true',
3383 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003384 parser.add_option(
3385 '-d', '--dry-run', action='store_true',
3386 help='Skip the branch tagging and removal steps.')
3387 parser.add_option(
3388 '-t', '--notags', action='store_true',
3389 help='Do not tag archived branches. '
3390 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003391 parser.add_option(
3392 '-p',
3393 '--pattern',
3394 default='git-cl-archived-{issue}-{branch}',
3395 help='Format string for archive tags. '
3396 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003397
kmarshall3bff56b2016-06-06 18:31:47 -07003398 options, args = parser.parse_args(args)
3399 if args:
3400 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003401
3402 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3403 if not branches:
3404 return 0
3405
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003406 tags = RunGit(['for-each-ref', '--format=%(refname)',
3407 'refs/tags']).splitlines() or []
3408 tags = [t.split('/')[-1] for t in tags]
3409
vapiera7fbd5a2016-06-16 09:17:49 -07003410 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003411 changes = [Changelist(branchref=b)
3412 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003413 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3414 statuses = get_cl_statuses(changes,
3415 fine_grained=True,
3416 max_processes=options.maxjobs)
3417 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003418 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3419 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003420 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003421 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003422 proposal.sort()
3423
3424 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003425 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003426 return 0
3427
Edward Lemur85153282020-02-14 22:06:29 +00003428 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003429
vapiera7fbd5a2016-06-16 09:17:49 -07003430 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003431 if options.notags:
3432 for next_item in proposal:
3433 print(' ' + next_item[0])
3434 else:
3435 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3436 for next_item in proposal:
3437 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003438
kmarshall9249e012016-08-23 12:02:16 -07003439 # Quit now on precondition failure or if instructed by the user, either
3440 # via an interactive prompt or by command line flags.
3441 if options.dry_run:
3442 print('\nNo changes were made (dry run).\n')
3443 return 0
3444 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003445 print('You are currently on a branch \'%s\' which is associated with a '
3446 'closed codereview issue, so archive cannot proceed. Please '
3447 'checkout another branch and run this command again.' %
3448 current_branch)
3449 return 1
kmarshall9249e012016-08-23 12:02:16 -07003450 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003451 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003452 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003453 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003454 return 1
3455
3456 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003457 if not options.notags:
3458 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003459
3460 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3461 # Clean up the tag if we failed to delete the branch.
3462 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003463
vapiera7fbd5a2016-06-16 09:17:49 -07003464 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003465
3466 return 0
3467
3468
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003469@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003470def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003471 """Show status of changelists.
3472
3473 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003474 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003475 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003476 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003477 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003478 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003479 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003480 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003481
3482 Also see 'git cl comments'.
3483 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003484 parser.add_option(
3485 '--no-branch-color',
3486 action='store_true',
3487 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003488 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003489 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003490 parser.add_option('-f', '--fast', action='store_true',
3491 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003492 parser.add_option(
3493 '-j', '--maxjobs', action='store', type=int,
3494 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003495 parser.add_option(
3496 '-i', '--issue', type=int,
3497 help='Operate on this issue instead of the current branch\'s implicit '
3498 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003499 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003500 if args:
3501 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003502
iannuccie53c9352016-08-17 14:40:40 -07003503 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003504 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003505
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003506 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003507 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003508 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003509 if cl.GetIssue():
3510 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003511 elif options.field == 'id':
3512 issueid = cl.GetIssue()
3513 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003514 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003515 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003516 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003517 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003518 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003519 elif options.field == 'status':
3520 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003521 elif options.field == 'url':
3522 url = cl.GetIssueURL()
3523 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003525 return 0
3526
3527 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3528 if not branches:
3529 print('No local branch found.')
3530 return 0
3531
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003532 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003533 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003534 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003535 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003536 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003537 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003538 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003539
Edward Lemur85153282020-02-14 22:06:29 +00003540 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003541
3542 def FormatBranchName(branch, colorize=False):
3543 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3544 an asterisk when it is the current branch."""
3545
3546 asterisk = ""
3547 color = Fore.RESET
3548 if branch == current_branch:
3549 asterisk = "* "
3550 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003551 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003552
3553 if colorize:
3554 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003555 return asterisk + branch_name
3556
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003557 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003558
3559 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003560 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3561 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003562 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003563 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003564 branch_statuses[c.GetBranch()] = status
3565 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003566 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003567 if url and (not status or status == 'error'):
3568 # The issue probably doesn't exist anymore.
3569 url += ' (broken)'
3570
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003571 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003572 # Turn off bold as well as colors.
3573 END = '\033[0m'
3574 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003575 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003576 color = ''
3577 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003578 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003579
Alan Cuttera3be9a52019-03-04 18:50:33 +00003580 branch_display = FormatBranchName(branch)
3581 padding = ' ' * (alignment - len(branch_display))
3582 if not options.no_branch_color:
3583 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003584
Alan Cuttera3be9a52019-03-04 18:50:33 +00003585 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3586 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003587
vapiera7fbd5a2016-06-16 09:17:49 -07003588 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003589 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003590 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003591 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003592 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003593 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003594 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003595 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003596 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003597 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003598 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003599 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600 return 0
3601
3602
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003603def colorize_CMDstatus_doc():
3604 """To be called once in main() to add colors to git cl status help."""
3605 colors = [i for i in dir(Fore) if i[0].isupper()]
3606
3607 def colorize_line(line):
3608 for color in colors:
3609 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003610 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003611 indent = len(line) - len(line.lstrip(' ')) + 1
3612 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3613 return line
3614
3615 lines = CMDstatus.__doc__.splitlines()
3616 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3617
3618
phajdan.jre328cf92016-08-22 04:12:17 -07003619def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003620 if path == '-':
3621 json.dump(contents, sys.stdout)
3622 else:
3623 with open(path, 'w') as f:
3624 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003625
3626
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003627@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003628@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003629def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003630 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003631
3632 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003633 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003634 parser.add_option('-r', '--reverse', action='store_true',
3635 help='Lookup the branch(es) for the specified issues. If '
3636 'no issues are specified, all branches with mapped '
3637 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003638 parser.add_option('--json',
3639 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003640 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003641
dnj@chromium.org406c4402015-03-03 17:22:28 +00003642 if options.reverse:
3643 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003644 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003645 # Reverse issue lookup.
3646 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003647
3648 git_config = {}
3649 for config in RunGit(['config', '--get-regexp',
3650 r'branch\..*issue']).splitlines():
3651 name, _space, val = config.partition(' ')
3652 git_config[name] = val
3653
dnj@chromium.org406c4402015-03-03 17:22:28 +00003654 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003655 issue = git_config.get(
3656 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003657 if issue:
3658 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003659 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003660 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003661 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003662 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003663 try:
3664 issue_num = int(issue)
3665 except ValueError:
3666 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003667 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003668 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003670 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003671 if options.json:
3672 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003673 return 0
3674
3675 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003676 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003677 if not issue.valid:
3678 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3679 'or no argument to list it.\n'
3680 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003681 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003682 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003683 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003684 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003685 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3686 if options.json:
3687 write_json(options.json, {
3688 'issue': cl.GetIssue(),
3689 'issue_url': cl.GetIssueURL(),
3690 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003691 return 0
3692
3693
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003694@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003695def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003696 """Shows or posts review comments for any changelist."""
3697 parser.add_option('-a', '--add-comment', dest='comment',
3698 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003699 parser.add_option('-p', '--publish', action='store_true',
3700 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003701 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003702 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003703 parser.add_option('-m', '--machine-readable', dest='readable',
3704 action='store_false', default=True,
3705 help='output comments in a format compatible with '
3706 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003707 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003708 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003709 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003710
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003711 issue = None
3712 if options.issue:
3713 try:
3714 issue = int(options.issue)
3715 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003716 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003717
Edward Lemur934836a2019-09-09 20:16:54 +00003718 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003719
3720 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003721 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003722 return 0
3723
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003724 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3725 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003726 for comment in summary:
3727 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003728 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003729 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003730 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003731 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003732 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003733 elif comment.autogenerated:
3734 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003735 else:
3736 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003737 print('\n%s%s %s%s\n%s' % (
3738 color,
3739 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3740 comment.sender,
3741 Fore.RESET,
3742 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3743
smut@google.comc85ac942015-09-15 16:34:43 +00003744 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003745 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003746 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003747 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3748 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003749 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003750 return 0
3751
3752
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003753@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003754@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003755def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003756 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003757 parser.add_option('-d', '--display', action='store_true',
3758 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003759 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003760 help='New description to set for this issue (- for stdin, '
3761 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003762 parser.add_option('-f', '--force', action='store_true',
3763 help='Delete any unpublished Gerrit edits for this issue '
3764 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003765
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003766 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003767
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003768 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003769 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003770 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003771 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003772 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003773
Edward Lemur934836a2019-09-09 20:16:54 +00003774 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003775 if target_issue_arg:
3776 kwargs['issue'] = target_issue_arg.issue
3777 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003778
3779 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003780 if not cl.GetIssue():
3781 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003782
Edward Lemur678a6842019-10-03 22:25:05 +00003783 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003784 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003785
Edward Lemur6c6827c2020-02-06 21:15:18 +00003786 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003787
smut@google.com34fb6b12015-07-13 20:03:26 +00003788 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003789 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003790 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003791
3792 if options.new_description:
3793 text = options.new_description
3794 if text == '-':
3795 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003796 elif text == '+':
3797 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003798 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003799
3800 description.set_description(text)
3801 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003802 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003803 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003804 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003805 return 0
3806
3807
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003808@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003809def CMDlint(parser, args):
3810 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003811 parser.add_option('--filter', action='append', metavar='-x,+y',
3812 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003813 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003814
3815 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003816 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003817 try:
3818 import cpplint
3819 import cpplint_chromium
3820 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003822 return 1
3823
3824 # Change the current working directory before calling lint so that it
3825 # shows the correct base.
3826 previous_cwd = os.getcwd()
3827 os.chdir(settings.GetRoot())
3828 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003829 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003830 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003831 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003833 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003834
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003835 # Process cpplint arguments, if any.
3836 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3837 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003838 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003839
Lei Zhang379d1ad2020-07-15 19:40:06 +00003840 include_regex = re.compile(settings.GetLintRegex())
3841 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003842 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3843 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003844 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003845 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003846 continue
3847
3848 if ignore_regex.match(filename):
3849 print('Ignoring file %s' % filename)
3850 continue
3851
3852 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3853 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003854 finally:
3855 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003856 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003857 if cpplint._cpplint_state.error_count != 0:
3858 return 1
3859 return 0
3860
3861
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003862@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003863def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003864 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003865 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003866 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003867 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003868 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003869 parser.add_option('--all', action='store_true',
3870 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003871 parser.add_option('--parallel', action='store_true',
3872 help='Run all tests specified by input_api.RunTests in all '
3873 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003874 parser.add_option('--resultdb', action='store_true',
3875 help='Run presubmit checks in the ResultSink environment '
3876 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003877 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003878 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003879
sbc@chromium.org71437c02015-04-09 19:29:40 +00003880 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882 return 1
3883
Edward Lemur934836a2019-09-09 20:16:54 +00003884 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003885 if args:
3886 base_branch = args[0]
3887 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003888 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003889 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003890
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003891 if cl.GetIssue():
3892 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003893 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003894 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003895
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003896 cl.RunHook(
3897 committing=not options.upload,
3898 may_prompt=False,
3899 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003900 parallel=options.parallel,
3901 upstream=base_branch,
3902 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003903 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003904 resultdb=options.resultdb,
3905 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003906 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003907
3908
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003909def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003910 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003911
3912 Works the same way as
3913 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3914 but can be called on demand on all platforms.
3915
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003916 The basic idea is to generate git hash of a state of the tree, original
3917 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003918 """
3919 lines = []
3920 tree_hash = RunGitSilent(['write-tree'])
3921 lines.append('tree %s' % tree_hash.strip())
3922 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3923 if code == 0:
3924 lines.append('parent %s' % parent.strip())
3925 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3926 lines.append('author %s' % author.strip())
3927 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3928 lines.append('committer %s' % committer.strip())
3929 lines.append('')
3930 # Note: Gerrit's commit-hook actually cleans message of some lines and
3931 # whitespace. This code is not doing this, but it clearly won't decrease
3932 # entropy.
3933 lines.append(message)
3934 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003935 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003936 return 'I%s' % change_hash.strip()
3937
3938
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003939def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003940 """Computes the remote branch ref to use for the CL.
3941
3942 Args:
3943 remote (str): The git remote for the CL.
3944 remote_branch (str): The git remote branch for the CL.
3945 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003946 """
3947 if not (remote and remote_branch):
3948 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003949
wittman@chromium.org455dc922015-01-26 20:15:50 +00003950 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003951 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003952 # refs, which are then translated into the remote full symbolic refs
3953 # below.
3954 if '/' not in target_branch:
3955 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3956 else:
3957 prefix_replacements = (
3958 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3959 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3960 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3961 )
3962 match = None
3963 for regex, replacement in prefix_replacements:
3964 match = re.search(regex, target_branch)
3965 if match:
3966 remote_branch = target_branch.replace(match.group(0), replacement)
3967 break
3968 if not match:
3969 # This is a branch path but not one we recognize; use as-is.
3970 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003971 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3972 # Handle the refs that need to land in different refs.
3973 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003974
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003975 # Migration to new default branch, only if available on remote.
3976 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
3977 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
3978 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
3979 stderr=subprocess2.PIPE):
3980 # TODO(crbug.com/ID): Print location to local git migration script.
3981 print("WARNING: Using new branch name %s instead of %s" % (
3982 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
3983 remote_branch = DEFAULT_NEW_BRANCH
3984
wittman@chromium.org455dc922015-01-26 20:15:50 +00003985 # Create the true path to the remote branch.
3986 # Does the following translation:
3987 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003988 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00003989 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3990 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3991 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3992 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3993 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3994 'refs/heads/')
3995 elif remote_branch.startswith('refs/remotes/branch-heads'):
3996 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003997
wittman@chromium.org455dc922015-01-26 20:15:50 +00003998 return remote_branch
3999
4000
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004001def cleanup_list(l):
4002 """Fixes a list so that comma separated items are put as individual items.
4003
4004 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4005 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4006 """
4007 items = sum((i.split(',') for i in l), [])
4008 stripped_items = (i.strip() for i in items)
4009 return sorted(filter(None, stripped_items))
4010
4011
Aaron Gable4db38df2017-11-03 14:59:07 -07004012@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004013@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004014def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004015 """Uploads the current changelist to codereview.
4016
4017 Can skip dependency patchset uploads for a branch by running:
4018 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004019 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004020 git config --unset branch.branch_name.skip-deps-uploads
4021 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004022
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004023 If the name of the checked out branch starts with "bug-" or "fix-" followed
4024 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004025 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004026
4027 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004028 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004029 [git-cl] add support for hashtags
4030 Foo bar: implement foo
4031 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004032 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004033 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4034 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004035 parser.add_option('--bypass-watchlists', action='store_true',
4036 dest='bypass_watchlists',
4037 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004038 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004039 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004040 parser.add_option('--message', '-m', dest='message',
4041 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004042 parser.add_option('-b', '--bug',
4043 help='pre-populate the bug number(s) for this issue. '
4044 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004045 parser.add_option('--message-file', dest='message_file',
4046 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004047 parser.add_option('--title', '-t', dest='title',
4048 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004049 parser.add_option('-T', '--skip-title', action='store_true',
4050 dest='skip_title',
4051 help='Use the most recent commit message as the title of '
4052 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004053 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004054 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004055 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004056 parser.add_option('--tbrs',
4057 action='append', default=[],
4058 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004059 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004060 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004061 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004062 parser.add_option('--hashtag', dest='hashtags',
4063 action='append', default=[],
4064 help=('Gerrit hashtag for new CL; '
4065 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004066 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004067 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004068 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004069 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004070 metavar='TARGET',
4071 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004072 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004073 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004074 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004075 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004076 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004077 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004078 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004079 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4080 const='TBR', help='add a set of OWNERS to TBR')
4081 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4082 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004083 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004084 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004085 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004086 'implies --send-mail')
4087 parser.add_option('-d', '--cq-dry-run',
4088 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004089 help='Send the patchset to do a CQ dry run right after '
4090 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004091 parser.add_option('--preserve-tryjobs', action='store_true',
4092 help='instruct the CQ to let tryjobs running even after '
4093 'new patchsets are uploaded instead of canceling '
4094 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004095 parser.add_option('--dependencies', action='store_true',
4096 help='Uploads CLs of all the local branches that depend on '
4097 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004098 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4099 help='Sends your change to the CQ after an approval. Only '
4100 'works on repos that have the Auto-Submit label '
4101 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004102 parser.add_option('--parallel', action='store_true',
4103 help='Run all tests specified by input_api.RunTests in all '
4104 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004105 parser.add_option('--no-autocc', action='store_true',
4106 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004107 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004108 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004109 parser.add_option('-R', '--retry-failed', action='store_true',
4110 help='Retry failed tryjobs from old patchset immediately '
4111 'after uploading new patchset. Cannot be used with '
4112 '--use-commit-queue or --cq-dry-run.')
4113 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4114 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004115 parser.add_option('--fixed', '-x',
4116 help='List of bugs that will be commented on and marked '
4117 'fixed (pre-populates "Fixed:" tag). Same format as '
4118 '-b option / "Bug:" tag. If fixing several issues, '
4119 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004120 parser.add_option('--edit-description', action='store_true', default=False,
4121 help='Modify description before upload. Cannot be used '
4122 'with --force. It is a noop when --no-squash is set '
4123 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004124 parser.add_option('--git-completion-helper', action="store_true",
4125 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004126 parser.add_option('--resultdb', action='store_true',
4127 help='Run presubmit checks in the ResultSink environment '
4128 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004129 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004130
rmistry@google.com2dd99862015-06-22 12:22:18 +00004131 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004132 (options, args) = parser.parse_args(args)
4133
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004134 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004135 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4136 if opt.help != optparse.SUPPRESS_HELP))
4137 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004138
sbc@chromium.org71437c02015-04-09 19:29:40 +00004139 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004140 return 1
4141
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004142 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004143 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004144 options.cc = cleanup_list(options.cc)
4145
Josipe827b0f2020-01-30 00:07:20 +00004146 if options.edit_description and options.force:
4147 parser.error('Only one of --force and --edit-description allowed')
4148
tandriib80458a2016-06-23 12:20:07 -07004149 if options.message_file:
4150 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004151 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004152 options.message = gclient_utils.FileRead(options.message_file)
4153 options.message_file = None
4154
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004155 if ([options.cq_dry_run,
4156 options.use_commit_queue,
4157 options.retry_failed].count(True) > 1):
4158 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4159 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004160
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004161 if options.skip_title and options.title:
4162 parser.error('Only one of --title and --skip-title allowed.')
4163
Aaron Gableedbc4132017-09-11 13:22:28 -07004164 if options.use_commit_queue:
4165 options.send_mail = True
4166
Edward Lesmes0dd54822020-03-26 18:24:25 +00004167 if options.squash is None:
4168 # Load default for user, repo, squash=true, in this order.
4169 options.squash = settings.GetSquashGerritUploads()
4170
Edward Lemur934836a2019-09-09 20:16:54 +00004171 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004172 # Warm change details cache now to avoid RPCs later, reducing latency for
4173 # developers.
4174 if cl.GetIssue():
4175 cl._GetChangeDetail(
4176 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4177
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004178 if options.retry_failed and not cl.GetIssue():
4179 print('No previous patchsets, so --retry-failed has no effect.')
4180 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004181
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004182 # cl.GetMostRecentPatchset uses cached information, and can return the last
4183 # patchset before upload. Calling it here makes it clear that it's the
4184 # last patchset before upload. Note that GetMostRecentPatchset will fail
4185 # if no CL has been uploaded yet.
4186 if options.retry_failed:
4187 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004188
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004189 ret = cl.CMDUpload(options, args, orig_args)
4190
4191 if options.retry_failed:
4192 if ret != 0:
4193 print('Upload failed, so --retry-failed has no effect.')
4194 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004195 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004196 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004197 jobs = _filter_failed_for_retry(builds)
4198 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004199 print('No failed tryjobs, so --retry-failed has no effect.')
4200 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004201 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004202
4203 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004204
4205
Francois Dorayd42c6812017-05-30 15:10:20 -04004206@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004207@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004208def CMDsplit(parser, args):
4209 """Splits a branch into smaller branches and uploads CLs.
4210
4211 Creates a branch and uploads a CL for each group of files modified in the
4212 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004213 comment, the string '$directory', is replaced with the directory containing
4214 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004215 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004216 parser.add_option('-d', '--description', dest='description_file',
4217 help='A text file containing a CL description in which '
4218 '$directory will be replaced by each CL\'s directory.')
4219 parser.add_option('-c', '--comment', dest='comment_file',
4220 help='A text file containing a CL comment.')
4221 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004222 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004223 help='List the files and reviewers for each CL that would '
4224 'be created, but don\'t create branches or CLs.')
4225 parser.add_option('--cq-dry-run', action='store_true',
4226 help='If set, will do a cq dry run for each uploaded CL. '
4227 'Please be careful when doing this; more than ~10 CLs '
4228 'has the potential to overload our build '
4229 'infrastructure. Try to upload these not during high '
4230 'load times (usually 11-3 Mountain View time). Email '
4231 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004232 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4233 default=True,
4234 help='Sends your change to the CQ after an approval. Only '
4235 'works on repos that have the Auto-Submit label '
4236 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004237 options, _ = parser.parse_args(args)
4238
4239 if not options.description_file:
4240 parser.error('No --description flag specified.')
4241
4242 def WrappedCMDupload(args):
4243 return CMDupload(OptionParser(), args)
4244
Edward Lemur2c62b332020-03-12 22:12:33 +00004245 return split_cl.SplitCl(
4246 options.description_file, options.comment_file, Changelist,
4247 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4248 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004249
4250
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004251@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004252@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004253def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004254 """DEPRECATED: Used to commit the current changelist via git-svn."""
4255 message = ('git-cl no longer supports committing to SVN repositories via '
4256 'git-svn. You probably want to use `git cl land` instead.')
4257 print(message)
4258 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004259
4260
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004261@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004262@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004263def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004264 """Commits the current changelist via git.
4265
4266 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4267 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004268 """
4269 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4270 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004271 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004272 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004273 parser.add_option('--parallel', action='store_true',
4274 help='Run all tests specified by input_api.RunTests in all '
4275 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004276 parser.add_option('--resultdb', action='store_true',
4277 help='Run presubmit checks in the ResultSink environment '
4278 'and send results to the ResultDB database.')
4279 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004280 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004281
Edward Lemur934836a2019-09-09 20:16:54 +00004282 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004283
Robert Iannucci2e73d432018-03-14 01:10:47 -07004284 if not cl.GetIssue():
4285 DieWithError('You must upload the change first to Gerrit.\n'
4286 ' If you would rather have `git cl land` upload '
4287 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004288 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4289 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004290
4291
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004292@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004293@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004294def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004295 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004296 parser.add_option('-b', dest='newbranch',
4297 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004298 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004299 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004300 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004301 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004302
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004303 group = optparse.OptionGroup(
4304 parser,
4305 'Options for continuing work on the current issue uploaded from a '
4306 'different clone (e.g. different machine). Must be used independently '
4307 'from the other options. No issue number should be specified, and the '
4308 'branch must have an issue number associated with it')
4309 group.add_option('--reapply', action='store_true', dest='reapply',
4310 help='Reset the branch and reapply the issue.\n'
4311 'CAUTION: This will undo any local changes in this '
4312 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004313
4314 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004315 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004316 parser.add_option_group(group)
4317
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004318 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004319
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004320 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004321 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004322 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004323 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004324 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004325
Edward Lemur934836a2019-09-09 20:16:54 +00004326 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004327 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004328 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004329
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004330 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004331 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004332 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004333
4334 RunGit(['reset', '--hard', upstream])
4335 if options.pull:
4336 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004337
Edward Lemur678a6842019-10-03 22:25:05 +00004338 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4339 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004340
4341 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004342 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004343
Edward Lemurf38bc172019-09-03 21:02:13 +00004344 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004345 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004346 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004347
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004348 # We don't want uncommitted changes mixed up with the patch.
4349 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004350 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004351
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004352 if options.newbranch:
4353 if options.force:
4354 RunGit(['branch', '-D', options.newbranch],
4355 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004356 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004357
Edward Lemur678a6842019-10-03 22:25:05 +00004358 cl = Changelist(
4359 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004360
Edward Lemur678a6842019-10-03 22:25:05 +00004361 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004362 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004363
Edward Lemurf38bc172019-09-03 21:02:13 +00004364 return cl.CMDPatchWithParsedIssue(
4365 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004366
4367
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004368def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004369 """Fetches the tree status and returns either 'open', 'closed',
4370 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004371 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004372 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004373 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004374 if status.find('closed') != -1 or status == '0':
4375 return 'closed'
4376 elif status.find('open') != -1 or status == '1':
4377 return 'open'
4378 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004379 return 'unset'
4380
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004381
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004382def GetTreeStatusReason():
4383 """Fetches the tree status from a json url and returns the message
4384 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004385 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004386 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004387 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004388 status = json.loads(connection.read())
4389 connection.close()
4390 return status['message']
4391
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004392
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004393@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004394def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004395 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004396 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004397 status = GetTreeStatus()
4398 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004399 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004400 return 2
4401
vapiera7fbd5a2016-06-16 09:17:49 -07004402 print('The tree is %s' % status)
4403 print()
4404 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004405 if status != 'open':
4406 return 1
4407 return 0
4408
4409
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004410@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004411def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004412 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4413 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004414 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004415 '-b', '--bot', action='append',
4416 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4417 'times to specify multiple builders. ex: '
4418 '"-b win_rel -b win_layout". See '
4419 'the try server waterfall for the builders name and the tests '
4420 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004421 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004422 '-B', '--bucket', default='',
4423 help=('Buildbucket bucket to send the try requests.'))
4424 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004425 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004426 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004427 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004428 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004430 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004431 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004432 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004433 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004434 '--category', default='git_cl_try', help='Specify custom build category.')
4435 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004436 '--project',
4437 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004438 'in recipe to determine to which repository or directory to '
4439 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004440 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004441 '-p', '--property', dest='properties', action='append', default=[],
4442 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004443 'key2=value2 etc. The value will be treated as '
4444 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004445 'NOTE: using this may make your tryjob not usable for CQ, '
4446 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004447 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004448 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4449 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004450 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004451 parser.add_option(
4452 '-R', '--retry-failed', action='store_true', default=False,
4453 help='Retry failed jobs from the latest set of tryjobs. '
4454 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004455 parser.add_option(
4456 '-i', '--issue', type=int,
4457 help='Operate on this issue instead of the current branch\'s implicit '
4458 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004459 options, args = parser.parse_args(args)
4460
machenbach@chromium.org45453142015-09-15 08:45:22 +00004461 # Make sure that all properties are prop=value pairs.
4462 bad_params = [x for x in options.properties if '=' not in x]
4463 if bad_params:
4464 parser.error('Got properties with missing "=": %s' % bad_params)
4465
maruel@chromium.org15192402012-09-06 12:38:29 +00004466 if args:
4467 parser.error('Unknown arguments: %s' % args)
4468
Edward Lemur934836a2019-09-09 20:16:54 +00004469 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004470 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004471 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004472
Edward Lemurf38bc172019-09-03 21:02:13 +00004473 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004474 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004475
tandriie113dfd2016-10-11 10:20:12 -07004476 error_message = cl.CannotTriggerTryJobReason()
4477 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004478 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004479
Edward Lemur45768512020-03-02 19:03:14 +00004480 if options.bot:
4481 if options.retry_failed:
4482 parser.error('--bot is not compatible with --retry-failed.')
4483 if not options.bucket:
4484 parser.error('A bucket (e.g. "chromium/try") is required.')
4485
4486 triggered = [b for b in options.bot if 'triggered' in b]
4487 if triggered:
4488 parser.error(
4489 'Cannot schedule builds on triggered bots: %s.\n'
4490 'This type of bot requires an initial job from a parent (usually a '
4491 'builder). Schedule a job on the parent instead.\n' % triggered)
4492
4493 if options.bucket.startswith('.master'):
4494 parser.error('Buildbot masters are not supported.')
4495
4496 project, bucket = _parse_bucket(options.bucket)
4497 if project is None or bucket is None:
4498 parser.error('Invalid bucket: %s.' % options.bucket)
4499 jobs = sorted((project, bucket, bot) for bot in options.bot)
4500 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004501 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004502 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004503 if options.verbose:
4504 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004505 jobs = _filter_failed_for_retry(builds)
4506 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004507 print('There are no failed jobs in the latest set of jobs '
4508 '(patchset #%d), doing nothing.' % patchset)
4509 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004510 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004511 if num_builders > 10:
4512 confirm_or_exit('There are %d builders with failed builds.'
4513 % num_builders, action='continue')
4514 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004515 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004516 print('git cl try with no bots now defaults to CQ dry run.')
4517 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4518 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004519
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004520 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004521 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004522 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004523 except BuildbucketResponseException as ex:
4524 print('ERROR: %s' % ex)
4525 return 1
4526 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004527
4528
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004529@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004530def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004531 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004532 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004533 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004534 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004535 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004536 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004537 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004538 '--color', action='store_true', default=setup_color.IS_TTY,
4539 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004540 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004541 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4542 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004543 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004544 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004545 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004546 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004547 parser.add_option(
4548 '-i', '--issue', type=int,
4549 help='Operate on this issue instead of the current branch\'s implicit '
4550 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004551 options, args = parser.parse_args(args)
4552 if args:
4553 parser.error('Unrecognized args: %s' % ' '.join(args))
4554
Edward Lemur934836a2019-09-09 20:16:54 +00004555 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004556 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004557 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004558
tandrii221ab252016-10-06 08:12:04 -07004559 patchset = options.patchset
4560 if not patchset:
4561 patchset = cl.GetMostRecentPatchset()
4562 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004563 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004564 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004565 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004566 cl.GetIssue())
4567
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004568 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004569 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004570 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004571 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004572 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004573 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004574 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004575 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004576 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004577 return 0
4578
4579
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004580@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004581@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004583 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004584 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004585 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004586 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004587
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004589 if args:
4590 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004591 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004592 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004593 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004594 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004595
4596 # Clear configured merge-base, if there is one.
4597 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004598 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004599 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004600 return 0
4601
4602
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004603@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004604def CMDweb(parser, args):
4605 """Opens the current CL in the web browser."""
4606 _, args = parser.parse_args(args)
4607 if args:
4608 parser.error('Unrecognized args: %s' % ' '.join(args))
4609
4610 issue_url = Changelist().GetIssueURL()
4611 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004612 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004613 return 1
4614
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004615 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004616 # allows us to hide the "Created new window in existing browser session."
4617 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004618 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004619 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004620 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004621 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004622 os.open(os.devnull, os.O_RDWR)
4623 try:
4624 webbrowser.open(issue_url)
4625 finally:
4626 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004627 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004628 return 0
4629
4630
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004631@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004632def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004633 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004634 parser.add_option('-d', '--dry-run', action='store_true',
4635 help='trigger in dry run mode')
4636 parser.add_option('-c', '--clear', action='store_true',
4637 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004638 parser.add_option(
4639 '-i', '--issue', type=int,
4640 help='Operate on this issue instead of the current branch\'s implicit '
4641 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004642 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004643 if args:
4644 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004645 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004646 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004647
Edward Lemur934836a2019-09-09 20:16:54 +00004648 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004649 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004650 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004651 elif options.dry_run:
4652 state = _CQState.DRY_RUN
4653 else:
4654 state = _CQState.COMMIT
4655 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004656 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004657 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004658 return 0
4659
4660
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004661@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004662def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004663 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004664 parser.add_option(
4665 '-i', '--issue', type=int,
4666 help='Operate on this issue instead of the current branch\'s implicit '
4667 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004668 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004669 if args:
4670 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004671 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004672 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004673 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004674 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004675 cl.CloseIssue()
4676 return 0
4677
4678
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004679@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004680def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004681 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004682 parser.add_option(
4683 '--stat',
4684 action='store_true',
4685 dest='stat',
4686 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004687 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004688 if args:
4689 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004690
Edward Lemur934836a2019-09-09 20:16:54 +00004691 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004692 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004693 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004694 if not issue:
4695 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004696
Aaron Gablea718c3e2017-08-28 17:47:28 -07004697 base = cl._GitGetBranchConfigValue('last-upload-hash')
4698 if not base:
4699 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4700 if not base:
4701 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4702 revision_info = detail['revisions'][detail['current_revision']]
4703 fetch_info = revision_info['fetch']['http']
4704 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4705 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004706
Aaron Gablea718c3e2017-08-28 17:47:28 -07004707 cmd = ['git', 'diff']
4708 if options.stat:
4709 cmd.append('--stat')
4710 cmd.append(base)
4711 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004712
4713 return 0
4714
4715
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004716@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004717def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004718 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004719 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004720 '--ignore-current',
4721 action='store_true',
4722 help='Ignore the CL\'s current reviewers and start from scratch.')
4723 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004724 '--ignore-self',
4725 action='store_true',
4726 help='Do not consider CL\'s author as an owners.')
4727 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004728 '--no-color',
4729 action='store_true',
4730 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004731 parser.add_option(
4732 '--batch',
4733 action='store_true',
4734 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004735 # TODO: Consider moving this to another command, since other
4736 # git-cl owners commands deal with owners for a given CL.
4737 parser.add_option(
4738 '--show-all',
4739 action='store_true',
4740 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004741 options, args = parser.parse_args(args)
4742
Edward Lemur934836a2019-09-09 20:16:54 +00004743 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004744 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004745
Yang Guo6e269a02019-06-26 11:17:02 +00004746 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004747 if len(args) == 0:
4748 print('No files specified for --show-all. Nothing to do.')
4749 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004750 for arg in args:
4751 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004752 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004753 database.load_data_needed_for([arg])
4754 print('Owners for %s:' % arg)
4755 for owner in sorted(database.all_possible_owners([arg], None)):
4756 print(' - %s' % owner)
4757 return 0
4758
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004759 if args:
4760 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004761 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004762 base_branch = args[0]
4763 else:
4764 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004765 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004766
Edward Lemur2c62b332020-03-12 22:12:33 +00004767 root = settings.GetRoot()
4768 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004769
4770 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004771 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004772 print('\n'.join(db.reviewers_for(affected_files, author)))
4773 return 0
4774
Edward Lemur2c62b332020-03-12 22:12:33 +00004775 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4776 original_owner_files = {
4777 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4778 for f in owner_files}
4779
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004780 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004781 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004782 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004783 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004784 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004785 fopen=open,
4786 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004787 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004788 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004789 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004790
4791
Aiden Bennerc08566e2018-10-03 17:52:42 +00004792def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004793 """Generates a diff command."""
4794 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004795 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4796
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004797 if allow_prefix:
4798 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4799 # case that diff.noprefix is set in the user's git config.
4800 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4801 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004802 diff_cmd += ['--no-prefix']
4803
4804 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004805
4806 if args:
4807 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004808 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004809 diff_cmd.append(arg)
4810 else:
4811 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004812
4813 return diff_cmd
4814
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004815
Jamie Madill5e96ad12020-01-13 16:08:35 +00004816def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4817 """Runs clang-format-diff and sets a return value if necessary."""
4818
4819 if not clang_diff_files:
4820 return 0
4821
4822 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4823 # formatted. This is used to block during the presubmit.
4824 return_value = 0
4825
4826 # Locate the clang-format binary in the checkout
4827 try:
4828 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4829 except clang_format.NotFoundError as e:
4830 DieWithError(e)
4831
4832 if opts.full or settings.GetFormatFullByDefault():
4833 cmd = [clang_format_tool]
4834 if not opts.dry_run and not opts.diff:
4835 cmd.append('-i')
4836 if opts.dry_run:
4837 for diff_file in clang_diff_files:
4838 with open(diff_file, 'r') as myfile:
4839 code = myfile.read().replace('\r\n', '\n')
4840 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4841 stdout = stdout.replace('\r\n', '\n')
4842 if opts.diff:
4843 sys.stdout.write(stdout)
4844 if code != stdout:
4845 return_value = 2
4846 else:
4847 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4848 if opts.diff:
4849 sys.stdout.write(stdout)
4850 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004851 try:
4852 script = clang_format.FindClangFormatScriptInChromiumTree(
4853 'clang-format-diff.py')
4854 except clang_format.NotFoundError as e:
4855 DieWithError(e)
4856
Edward Lesmes89624cd2020-04-06 17:51:56 +00004857 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004858 if not opts.dry_run and not opts.diff:
4859 cmd.append('-i')
4860
4861 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004862 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004863
Edward Lesmes89624cd2020-04-06 17:51:56 +00004864 env = os.environ.copy()
4865 env['PATH'] = (
4866 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4867 stdout = RunCommand(
4868 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004869 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004870 if opts.diff:
4871 sys.stdout.write(stdout)
4872 if opts.dry_run and len(stdout) > 0:
4873 return_value = 2
4874
4875 return return_value
4876
4877
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004878def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004879 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004880 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004881
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004882
enne@chromium.org555cfe42014-01-29 18:21:39 +00004883@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004884@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004885def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004886 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004887 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004888 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004889 parser.add_option('--full', action='store_true',
4890 help='Reformat the full content of all touched files')
4891 parser.add_option('--dry-run', action='store_true',
4892 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004893 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004894 '--no-clang-format',
4895 dest='clang_format',
4896 action='store_false',
4897 default=True,
4898 help='Disables formatting of various file types using clang-format.')
4899 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004900 '--python',
4901 action='store_true',
4902 default=None,
4903 help='Enables python formatting on all python files.')
4904 parser.add_option(
4905 '--no-python',
4906 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004907 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004908 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004909 'If neither --python or --no-python are set, python files that have a '
4910 '.style.yapf file in an ancestor directory will be formatted. '
4911 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004912 parser.add_option(
4913 '--js',
4914 action='store_true',
4915 help='Format javascript code with clang-format. '
4916 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004917 parser.add_option('--diff', action='store_true',
4918 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004919 parser.add_option('--presubmit', action='store_true',
4920 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004921 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004922
Garrett Beaty91a6f332020-01-06 16:57:24 +00004923 if opts.python is not None and opts.no_python:
4924 raise parser.error('Cannot set both --python and --no-python')
4925 if opts.no_python:
4926 opts.python = False
4927
Daniel Chengc55eecf2016-12-30 03:11:02 -08004928 # Normalize any remaining args against the current path, so paths relative to
4929 # the current directory are still resolved as expected.
4930 args = [os.path.join(os.getcwd(), arg) for arg in args]
4931
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004932 # git diff generates paths against the root of the repository. Change
4933 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004934 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004935 if rel_base_path:
4936 os.chdir(rel_base_path)
4937
digit@chromium.org29e47272013-05-17 17:01:46 +00004938 # Grab the merge-base commit, i.e. the upstream commit of the current
4939 # branch when it was created or the last time it was rebased. This is
4940 # to cover the case where the user may have called "git fetch origin",
4941 # moving the origin branch to a newer commit, but hasn't rebased yet.
4942 upstream_commit = None
4943 cl = Changelist()
4944 upstream_branch = cl.GetUpstreamBranch()
4945 if upstream_branch:
4946 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4947 upstream_commit = upstream_commit.strip()
4948
4949 if not upstream_commit:
4950 DieWithError('Could not find base commit for this branch. '
4951 'Are you in detached state?')
4952
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004953 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4954 diff_output = RunGit(changed_files_cmd)
4955 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004956 # Filter out files deleted by this CL
4957 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004958
Andreas Haas417d89c2020-02-06 10:24:27 +00004959 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004960 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004961
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004962 clang_diff_files = []
4963 if opts.clang_format:
4964 clang_diff_files = [
4965 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4966 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004967 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004968 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004969
Edward Lesmes50da7702020-03-30 19:23:43 +00004970 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004971
Jamie Madill5e96ad12020-01-13 16:08:35 +00004972 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4973 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004974
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004975 # Similar code to above, but using yapf on .py files rather than clang-format
4976 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004977 py_explicitly_disabled = opts.python is not None and not opts.python
4978 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004979 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4980 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004981
Aiden Bennerc08566e2018-10-03 17:52:42 +00004982 # Used for caching.
4983 yapf_configs = {}
4984 for f in python_diff_files:
4985 # Find the yapf style config for the current file, defaults to depot
4986 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004987 _FindYapfConfigFile(f, yapf_configs, top_dir)
4988
4989 # Turn on python formatting by default if a yapf config is specified.
4990 # This breaks in the case of this repo though since the specified
4991 # style file is also the global default.
4992 if opts.python is None:
4993 filtered_py_files = []
4994 for f in python_diff_files:
4995 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4996 filtered_py_files.append(f)
4997 else:
4998 filtered_py_files = python_diff_files
4999
5000 # Note: yapf still seems to fix indentation of the entire file
5001 # even if line ranges are specified.
5002 # See https://github.com/google/yapf/issues/499
5003 if not opts.full and filtered_py_files:
5004 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5005
Brian Sheedyb4307d52019-12-02 19:18:17 +00005006 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5007 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5008 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005009
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005010 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005011 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5012 # Default to pep8 if not .style.yapf is found.
5013 if not yapf_style:
5014 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005015
Peter Wend9399922020-06-17 17:33:49 +00005016 with open(f, 'r') as py_f:
5017 if 'python3' in py_f.readline():
5018 vpython_script = 'vpython3'
5019 else:
5020 vpython_script = 'vpython'
5021
5022 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005023
5024 has_formattable_lines = False
5025 if not opts.full:
5026 # Only run yapf over changed line ranges.
5027 for diff_start, diff_len in py_line_diffs[f]:
5028 diff_end = diff_start + diff_len - 1
5029 # Yapf errors out if diff_end < diff_start but this
5030 # is a valid line range diff for a removal.
5031 if diff_end >= diff_start:
5032 has_formattable_lines = True
5033 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5034 # If all line diffs were removals we have nothing to format.
5035 if not has_formattable_lines:
5036 continue
5037
5038 if opts.diff or opts.dry_run:
5039 cmd += ['--diff']
5040 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005041 stdout = RunCommand(cmd,
5042 error_ok=True,
5043 cwd=top_dir,
5044 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005045 if opts.diff:
5046 sys.stdout.write(stdout)
5047 elif len(stdout) > 0:
5048 return_value = 2
5049 else:
5050 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005051 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005052
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005053 # Format GN build files. Always run on full build files for canonical form.
5054 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005055 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005056 if opts.dry_run or opts.diff:
5057 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005058 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005059 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005060 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005061 cwd=top_dir)
5062 if opts.dry_run and gn_ret == 2:
5063 return_value = 2 # Not formatted.
5064 elif opts.diff and gn_ret == 2:
5065 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005066 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005067 elif gn_ret != 0:
5068 # For non-dry run cases (and non-2 return values for dry-run), a
5069 # nonzero error code indicates a failure, probably because the file
5070 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005071 DieWithError('gn format failed on ' + gn_diff_file +
5072 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005073
Ilya Shermane081cbe2017-08-15 17:51:04 -07005074 # Skip the metrics formatting from the global presubmit hook. These files have
5075 # a separate presubmit hook that issues an error if the files need formatting,
5076 # whereas the top-level presubmit script merely issues a warning. Formatting
5077 # these files is somewhat slow, so it's important not to duplicate the work.
5078 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005079 for diff_xml in GetDiffXMLs(diff_files):
5080 xml_dir = GetMetricsDir(diff_xml)
5081 if not xml_dir:
5082 continue
5083
Ilya Shermane081cbe2017-08-15 17:51:04 -07005084 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005085 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5086 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005087
5088 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5089 # command as histograms/pretty_print.py now needs a relative path argument
5090 # after splitting the histograms into multiple directories.
5091 # For example, in tools/metrics/ukm, pretty-print could be run using:
5092 # $ python pretty_print.py
5093 # But in tools/metrics/histogrmas, pretty-print should be run with an
5094 # additional relative path argument, like:
5095 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5096 # $ python pretty_print.py enums.xml
5097
5098 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5099 # version of histograms/pretty_print.py is released.
5100 filepath_required = os.path.exists(
5101 os.path.join(tool_dir, 'validate_prefix.py'))
5102
Weilun Shib92c4b72020-08-27 17:45:11 +00005103 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5104 or diff_xml.endswith('histogram_suffixes_list.xml')
5105 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005106 cmd.append(diff_xml)
5107
Ilya Shermane081cbe2017-08-15 17:51:04 -07005108 if opts.dry_run or opts.diff:
5109 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005110
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005111 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5112 # `shell` param and instead replace `'vpython'` with
5113 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005114 stdout = RunCommand(cmd,
5115 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005116 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005117 if opts.diff:
5118 sys.stdout.write(stdout)
5119 if opts.dry_run and stdout:
5120 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005121
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005122 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005123
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005124
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005125def GetDiffXMLs(diff_files):
5126 return [
5127 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5128 ]
5129
5130
5131def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005132 metrics_xml_dirs = [
5133 os.path.join('tools', 'metrics', 'actions'),
5134 os.path.join('tools', 'metrics', 'histograms'),
5135 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005136 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005137 os.path.join('tools', 'metrics', 'ukm'),
5138 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005139 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005140 if diff_xml.startswith(xml_dir):
5141 return xml_dir
5142 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005143
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005144
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005145@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005146@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005147def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005148 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005149 _, args = parser.parse_args(args)
5150
5151 if len(args) != 1:
5152 parser.print_help()
5153 return 1
5154
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005155 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005156 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005157 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005158
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005159 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005160
Edward Lemur52969c92020-02-06 18:15:28 +00005161 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005162 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005163 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005164
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005165 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005166 for key, issue in [x.split() for x in output.splitlines()]:
5167 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005168 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005169
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005170 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005171 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005172 return 1
5173 if len(branches) == 1:
5174 RunGit(['checkout', branches[0]])
5175 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005176 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005177 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005178 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005179 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005180 try:
5181 RunGit(['checkout', branches[int(which)]])
5182 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005183 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005184 return 1
5185
5186 return 0
5187
5188
maruel@chromium.org29404b52014-09-08 22:58:00 +00005189def CMDlol(parser, args):
5190 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005191 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005192 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5193 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5194 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005195 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005196 return 0
5197
5198
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005199class OptionParser(optparse.OptionParser):
5200 """Creates the option parse and add --verbose support."""
5201 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005202 optparse.OptionParser.__init__(
5203 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005204 self.add_option(
5205 '-v', '--verbose', action='count', default=0,
5206 help='Use 2 times for more debugging info')
5207
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005208 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005209 try:
5210 return self._parse_args(args)
5211 finally:
5212 # Regardless of success or failure of args parsing, we want to report
5213 # metrics, but only after logging has been initialized (if parsing
5214 # succeeded).
5215 global settings
5216 settings = Settings()
5217
5218 if not metrics.DISABLE_METRICS_COLLECTION:
5219 # GetViewVCUrl ultimately calls logging method.
5220 project_url = settings.GetViewVCUrl().strip('/+')
5221 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5222 metrics.collector.add('project_urls', [project_url])
5223
5224 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005225 # Create an optparse.Values object that will store only the actual passed
5226 # options, without the defaults.
5227 actual_options = optparse.Values()
5228 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5229 # Create an optparse.Values object with the default options.
5230 options = optparse.Values(self.get_default_values().__dict__)
5231 # Update it with the options passed by the user.
5232 options._update_careful(actual_options.__dict__)
5233 # Store the options passed by the user in an _actual_options attribute.
5234 # We store only the keys, and not the values, since the values can contain
5235 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005236 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005237
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005238 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005239 logging.basicConfig(
5240 level=levels[min(options.verbose, len(levels) - 1)],
5241 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5242 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005243
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005244 return options, args
5245
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005247def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005248 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005249 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005250 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005251 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005252
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005253 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005254 dispatcher = subcommand.CommandDispatcher(__name__)
5255 try:
5256 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005257 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005258 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005259 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005260 if e.code != 500:
5261 raise
5262 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005263 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005264 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005265 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266
5267
5268if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005269 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5270 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005271 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005272 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005273 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005274 sys.exit(main(sys.argv[1:]))