blob: 6f40737dedad7a0315f54f28cfb7cbe6b3793f9a [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
Christopher Lamf732cd52017-01-24 12:40:11 +1100148def DieWithError(message, change_desc=None):
149 if change_desc:
150 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000151 print('\n ** Content of CL description **\n' +
152 '='*72 + '\n' +
153 change_desc.description + '\n' +
154 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100155
vapiera7fbd5a2016-06-16 09:17:49 -0700156 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000157 sys.exit(1)
158
159
Christopher Lamf732cd52017-01-24 12:40:11 +1100160def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000161 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000162 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000163 with open(backup_path, 'w') as backup_file:
164 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100165
166
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000167def GetNoGitPagerEnv():
168 env = os.environ.copy()
169 # 'cat' is a magical git string that disables pagers on all platforms.
170 env['GIT_PAGER'] = 'cat'
171 return env
172
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000173
bsep@chromium.org627d9002016-04-29 00:00:52 +0000174def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000176 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
177 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000178 except subprocess2.CalledProcessError as e:
179 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000180 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000181 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
182 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000183 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000184
185
186def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000187 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000188 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000189
190
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000191def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000192 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700193 if suppress_stderr:
194 stderr = subprocess2.VOID
195 else:
196 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000197 try:
tandrii5d48c322016-08-18 16:19:37 -0700198 (out, _), code = subprocess2.communicate(['git'] + args,
199 env=GetNoGitPagerEnv(),
200 stdout=subprocess2.PIPE,
201 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700203 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900204 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000205 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000206
207
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000208def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000209 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000210 return RunGitWithCode(args, suppress_stderr=True)[1]
211
212
tandrii2a16b952016-10-19 07:09:44 -0700213def time_sleep(seconds):
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700216 return time.sleep(seconds)
217
218
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000219def time_time():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return time.time()
223
224
Edward Lemur1b52d872019-05-09 21:12:12 +0000225def datetime_now():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return datetime.datetime.now()
229
230
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100231def confirm_or_exit(prefix='', action='confirm'):
232 """Asks user to press enter to continue or press Ctrl+C to abort."""
233 if not prefix or prefix.endswith('\n'):
234 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100235 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100236 mid = ' Press'
237 elif prefix.endswith(' '):
238 mid = 'press'
239 else:
240 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000241 gclient_utils.AskForData(
242 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100243
244
245def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000246 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000247 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100248 while True:
249 if 'yes'.startswith(result):
250 return True
251 if 'no'.startswith(result):
252 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000253 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100254
255
machenbach@chromium.org45453142015-09-15 08:45:22 +0000256def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000257 prop_list = getattr(options, 'properties', [])
258 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000259 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260 try:
261 properties[key] = json.loads(val)
262 except ValueError:
263 pass # If a value couldn't be evaluated, treat it as a string.
264 return properties
265
266
Edward Lemur4c707a22019-09-24 21:13:43 +0000267def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000268 """Calls a buildbucket v2 method and returns the parsed json response."""
269 headers = {
270 'Accept': 'application/json',
271 'Content-Type': 'application/json',
272 }
273 request = json.dumps(request)
274 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
275
276 logging.info('POST %s with %s' % (url, request))
277
278 attempts = 1
279 time_to_sleep = 1
280 while True:
281 response, content = http.request(url, 'POST', body=request, headers=headers)
282 if response.status == 200:
283 return json.loads(content[4:])
284 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
285 msg = '%s error when calling POST %s with %s: %s' % (
286 response.status, url, request, content)
287 raise BuildbucketResponseException(msg)
288 logging.debug(
289 '%s error when calling POST %s with %s. '
290 'Sleeping for %d seconds and retrying...' % (
291 response.status, url, request, time_to_sleep))
292 time.sleep(time_to_sleep)
293 time_to_sleep *= 2
294 attempts += 1
295
296 assert False, 'unreachable'
297
298
Edward Lemur6215c792019-10-03 21:59:05 +0000299def _parse_bucket(raw_bucket):
300 legacy = True
301 project = bucket = None
302 if '/' in raw_bucket:
303 legacy = False
304 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000305 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000306 elif raw_bucket.startswith('luci.'):
307 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000308 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000309 elif '.' in raw_bucket:
310 project = raw_bucket.split('.')[0]
311 bucket = raw_bucket
312 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000313 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000314 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
315 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000316
317
Quinten Yearsley777660f2020-03-04 23:37:06 +0000318def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700320
321 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000322 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000323 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700324 options: Command-line options.
325 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000327 for project, bucket, builder in jobs:
328 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000329 print('To see results here, run: git cl try-results')
330 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700331
Quinten Yearsley777660f2020-03-04 23:37:06 +0000332 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000333 if not requests:
334 return
335
Edward Lemur5b929a42019-10-21 17:57:39 +0000336 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 http.force_exception_to_status_code = True
338
339 batch_request = {'requests': requests}
340 batch_response = _call_buildbucket(
341 http, options.buildbucket_host, 'Batch', batch_request)
342
343 errors = [
344 ' ' + response['error']['message']
345 for response in batch_response.get('responses', [])
346 if 'error' in response
347 ]
348 if errors:
349 raise BuildbucketResponseException(
350 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
351
352
Quinten Yearsley777660f2020-03-04 23:37:06 +0000353def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000354 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000355 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000356 shared_properties = {
357 'category': options.ensure_value('category', 'git_cl_try')
358 }
359 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000360 shared_properties['clobber'] = True
361 shared_properties.update(_get_properties_from_options(options) or {})
362
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000363 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000364 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000365 shared_tags.append({'key': 'retry_failed',
366 'value': '1'})
367
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000369 for (project, bucket, builder) in jobs:
370 properties = shared_properties.copy()
371 if 'presubmit' in builder.lower():
372 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373
Edward Lemur45768512020-03-02 19:03:14 +0000374 requests.append({
375 'scheduleBuild': {
376 'requestId': str(uuid.uuid4()),
377 'builder': {
378 'project': getattr(options, 'project', None) or project,
379 'bucket': bucket,
380 'builder': builder,
381 },
382 'gerritChanges': gerrit_changes,
383 'properties': properties,
384 'tags': [
385 {'key': 'builder', 'value': builder},
386 ] + shared_tags,
387 }
388 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000389
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000390 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000391 requests[-1]['scheduleBuild']['gitilesCommit'] = {
392 'host': gerrit_changes[0]['host'],
393 'project': gerrit_changes[0]['project'],
394 'id': options.revision
395 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000396
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000398
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000399
Quinten Yearsley777660f2020-03-04 23:37:06 +0000400def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000401 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000402
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000403 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000404 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000405 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000406 request = {
407 'predicate': {
408 'gerritChanges': [changelist.GetGerritChange(patchset)],
409 },
410 'fields': ','.join('builds.*.' + field for field in fields),
411 }
tandrii221ab252016-10-06 08:12:04 -0700412
Edward Lemur5b929a42019-10-21 17:57:39 +0000413 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000414 if authenticator.has_cached_credentials():
415 http = authenticator.authorize(httplib2.Http())
416 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700417 print('Warning: Some results might be missing because %s' %
418 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000419 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000420 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000421 http.force_exception_to_status_code = True
422
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000423 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
424 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426
Edward Lemur5b929a42019-10-21 17:57:39 +0000427def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000428 """Fetches builds from the latest patchset that has builds (within
429 the last few patchsets).
430
431 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 changelist (Changelist): The CL to fetch builds for
433 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000434 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
435 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000437 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
438 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000439 """
440 assert buildbucket_host
441 assert changelist.GetIssue(), 'CL must be uploaded first'
442 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000443 if latest_patchset is None:
444 assert changelist.GetMostRecentPatchset()
445 ps = changelist.GetMostRecentPatchset()
446 else:
447 assert latest_patchset > 0, latest_patchset
448 ps = latest_patchset
449
Quinten Yearsley983111f2019-09-26 17:18:48 +0000450 min_ps = max(1, ps - 5)
451 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000452 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000453 if len(builds):
454 return builds, ps
455 ps -= 1
456 return [], 0
457
458
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459def _filter_failed_for_retry(all_builds):
460 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000461
462 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000463 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000464 i.e. a list of buildbucket.v2.Builds which includes status and builder
465 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000466
467 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000468 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000469 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470 """
Edward Lemur45768512020-03-02 19:03:14 +0000471 grouped = {}
472 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000473 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000474 key = (builder['project'], builder['bucket'], builder['builder'])
475 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000476
Edward Lemur45768512020-03-02 19:03:14 +0000477 jobs = []
478 for (project, bucket, builder), builds in grouped.items():
479 if 'triggered' in builder:
480 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
481 'from a parent. Please schedule a manual job for the parent '
482 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000483 continue
484 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
485 # Don't retry if any are running.
486 continue
Edward Lemur45768512020-03-02 19:03:14 +0000487 # If builder had several builds, retry only if the last one failed.
488 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
489 # build, but in case of retrying failed jobs retrying a flaky one makes
490 # sense.
491 builds = sorted(builds, key=lambda b: b['createTime'])
492 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
493 continue
494 # Don't retry experimental build previously triggered by CQ.
495 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
496 for t in builds[-1]['tags']):
497 continue
498 jobs.append((project, bucket, builder))
499
500 # Sort the jobs to make testing easier.
501 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000502
503
Quinten Yearsley777660f2020-03-04 23:37:06 +0000504def _print_tryjobs(options, builds):
505 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000506 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000507 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000508 return
509
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000510 longest_builder = max(len(b['builder']['builder']) for b in builds)
511 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000513 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
514 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000515
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000516 builds_by_status = {}
517 for b in builds:
518 builds_by_status.setdefault(b['status'], []).append({
519 'id': b['id'],
520 'name': name_fmt.format(
521 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
522 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 sort_key = lambda b: (b['name'], b['id'])
525
526 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 if not builds:
529 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000530
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000531 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000532 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 else:
535 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 print(colorize(title))
538 for b in sorted(builds, key=sort_key):
539 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540
541 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 print_builds(
543 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
544 print_builds(
545 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
546 color=Fore.MAGENTA)
547 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
548 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
549 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000550 print_builds('Started:', builds_by_status.pop('STARTED', []),
551 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 print_builds(
553 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000555 print_builds(
556 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000557 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558
559
Aiden Bennerc08566e2018-10-03 17:52:42 +0000560def _ComputeDiffLineRanges(files, upstream_commit):
561 """Gets the changed line ranges for each file since upstream_commit.
562
563 Parses a git diff on provided files and returns a dict that maps a file name
564 to an ordered list of range tuples in the form (start_line, count).
565 Ranges are in the same format as a git diff.
566 """
567 # If files is empty then diff_output will be a full diff.
568 if len(files) == 0:
569 return {}
570
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000571 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000572 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000573 diff_output = RunGit(diff_cmd)
574
575 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
576 # 2 capture groups
577 # 0 == fname of diff file
578 # 1 == 'diff_start,diff_count' or 'diff_start'
579 # will match each of
580 # diff --git a/foo.foo b/foo.py
581 # @@ -12,2 +14,3 @@
582 # @@ -12,2 +17 @@
583 # running re.findall on the above string with pattern will give
584 # [('foo.py', ''), ('', '14,3'), ('', '17')]
585
586 curr_file = None
587 line_diffs = {}
588 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
589 if match[0] != '':
590 # Will match the second filename in diff --git a/a.py b/b.py.
591 curr_file = match[0]
592 line_diffs[curr_file] = []
593 else:
594 # Matches +14,3
595 if ',' in match[1]:
596 diff_start, diff_count = match[1].split(',')
597 else:
598 # Single line changes are of the form +12 instead of +12,1.
599 diff_start = match[1]
600 diff_count = 1
601
602 diff_start = int(diff_start)
603 diff_count = int(diff_count)
604
605 # If diff_count == 0 this is a removal we can ignore.
606 line_diffs[curr_file].append((diff_start, diff_count))
607
608 return line_diffs
609
610
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000611def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000612 """Checks if a yapf file is in any parent directory of fpath until top_dir.
613
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000614 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000615 is found returns None. Uses yapf_config_cache as a cache for previously found
616 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000617 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000618 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000619 # Return result if we've already computed it.
620 if fpath in yapf_config_cache:
621 return yapf_config_cache[fpath]
622
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000623 parent_dir = os.path.dirname(fpath)
624 if os.path.isfile(fpath):
625 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000626 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000627 # Otherwise fpath is a directory
628 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
629 if os.path.isfile(yapf_file):
630 ret = yapf_file
631 elif fpath == top_dir or parent_dir == fpath:
632 # If we're at the top level directory, or if we're at root
633 # there is no provided style.
634 ret = None
635 else:
636 # Otherwise recurse on the current directory.
637 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000638 yapf_config_cache[fpath] = ret
639 return ret
640
641
Brian Sheedyb4307d52019-12-02 19:18:17 +0000642def _GetYapfIgnorePatterns(top_dir):
643 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000644
645 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
646 but this functionality appears to break when explicitly passing files to
647 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000648 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000649 the .yapfignore file should be in the directory that yapf is invoked from,
650 which we assume to be the top level directory in this case.
651
652 Args:
653 top_dir: The top level directory for the repository being formatted.
654
655 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000656 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000657 """
658 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000659 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000660 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000661 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000662
Brian Sheedyb4307d52019-12-02 19:18:17 +0000663 with open(yapfignore_file) as f:
664 for line in f.readlines():
665 stripped_line = line.strip()
666 # Comments and blank lines should be ignored.
667 if stripped_line.startswith('#') or stripped_line == '':
668 continue
669 ignore_patterns.add(stripped_line)
670 return ignore_patterns
671
672
673def _FilterYapfIgnoredFiles(filepaths, patterns):
674 """Filters out any filepaths that match any of the given patterns.
675
676 Args:
677 filepaths: An iterable of strings containing filepaths to filter.
678 patterns: An iterable of strings containing fnmatch patterns to filter on.
679
680 Returns:
681 A list of strings containing all the elements of |filepaths| that did not
682 match any of the patterns in |patterns|.
683 """
684 # Not inlined so that tests can use the same implementation.
685 return [f for f in filepaths
686 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000687
688
Aaron Gable13101a62018-02-09 13:20:41 -0800689def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000690 """Prints statistics about the change to the user."""
691 # --no-ext-diff is broken in some versions of Git, so try to work around
692 # this by overriding the environment (but there is still a problem if the
693 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000694 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000695 if 'GIT_EXTERNAL_DIFF' in env:
696 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000697
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000698 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800699 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000700 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000701
702
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000703class BuildbucketResponseException(Exception):
704 pass
705
706
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000707class Settings(object):
708 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000709 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000710 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711 self.tree_status_url = None
712 self.viewvc_url = None
713 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000714 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000715 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000716 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000717 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000718 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000719
Edward Lemur26964072020-02-19 19:18:51 +0000720 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000721 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000722 if self.updated:
723 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000724
Edward Lemur26964072020-02-19 19:18:51 +0000725 # The only value that actually changes the behavior is
726 # autoupdate = "false". Everything else means "true".
727 autoupdate = (
728 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
729
730 cr_settings_file = FindCodereviewSettingsFile()
731 if autoupdate != 'false' and cr_settings_file:
732 LoadCodereviewSettingsFromFile(cr_settings_file)
733 cr_settings_file.close()
734
735 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000736
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000737 @staticmethod
738 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000739 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000742 if self.root is None:
743 self.root = os.path.abspath(self.GetRelativeRoot())
744 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746 def GetTreeStatusUrl(self, error_ok=False):
747 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000748 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
749 if self.tree_status_url is None and not error_ok:
750 DieWithError(
751 'You must configure your tree status URL by running '
752 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000753 return self.tree_status_url
754
755 def GetViewVCUrl(self):
756 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000757 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 return self.viewvc_url
759
rmistry@google.com90752582014-01-14 21:04:50 +0000760 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000761 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000762
rmistry@google.com5626a922015-02-26 14:03:30 +0000763 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000764 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000765 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000766 return run_post_upload_hook == "True"
767
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000768 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000769 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000770
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000771 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000772 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000773 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000774 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
775 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000776 # Default is squash now (http://crbug.com/611892#c23).
777 self.squash_gerrit_uploads = self._GetConfig(
778 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 return self.squash_gerrit_uploads
780
Edward Lesmes4de54132020-05-05 19:41:33 +0000781 def GetSquashGerritUploadsOverride(self):
782 """Return True or False if codereview.settings should be overridden.
783
784 Returns None if no override has been defined.
785 """
786 # See also http://crbug.com/611892#c23
787 result = self._GetConfig('gerrit.override-squash-uploads').lower()
788 if result == 'true':
789 return True
790 if result == 'false':
791 return False
792 return None
793
tandrii@chromium.org28253532016-04-14 13:46:56 +0000794 def GetGerritSkipEnsureAuthenticated(self):
795 """Return True if EnsureAuthenticated should not be done for Gerrit
796 uploads."""
797 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000798 self.gerrit_skip_ensure_authenticated = self._GetConfig(
799 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000800 return self.gerrit_skip_ensure_authenticated
801
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000802 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000803 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000804 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000805 # Git requires single quotes for paths with spaces. We need to replace
806 # them with double quotes for Windows to treat such paths as a single
807 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000808 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000809 return self.git_editor or None
810
thestig@chromium.org44202a22014-03-11 19:22:18 +0000811 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000812 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000813
814 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000815 return self._GetConfig(
816 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000817
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000818 def GetFormatFullByDefault(self):
819 if self.format_full_by_default is None:
820 result = (
821 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
822 error_ok=True).strip())
823 self.format_full_by_default = (result == 'true')
824 return self.format_full_by_default
825
Edward Lemur26964072020-02-19 19:18:51 +0000826 def _GetConfig(self, key, default=''):
827 self._LazyUpdateIfNeeded()
828 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000829
830
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000831class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000832 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000833 NONE = 'none'
834 DRY_RUN = 'dry_run'
835 COMMIT = 'commit'
836
837 ALL_STATES = [NONE, DRY_RUN, COMMIT]
838
839
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000840class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000841 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000842 self.issue = issue
843 self.patchset = patchset
844 self.hostname = hostname
845
846 @property
847 def valid(self):
848 return self.issue is not None
849
850
Edward Lemurf38bc172019-09-03 21:02:13 +0000851def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000852 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
853 fail_result = _ParsedIssueNumberArgument()
854
Edward Lemur678a6842019-10-03 22:25:05 +0000855 if isinstance(arg, int):
856 return _ParsedIssueNumberArgument(issue=arg)
857 if not isinstance(arg, basestring):
858 return fail_result
859
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000860 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000861 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000862 if not arg.startswith('http'):
863 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700864
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000865 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000866 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
867 if url.startswith(short_url):
868 url = gerrit_url + url[len(short_url):]
869 break
870
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000871 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000872 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000873 except ValueError:
874 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200875
Edward Lemur678a6842019-10-03 22:25:05 +0000876 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
877 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
878 # Short urls like https://domain/<issue_number> can be used, but don't allow
879 # specifying the patchset (you'd 404), but we allow that here.
880 if parsed_url.path == '/':
881 part = parsed_url.fragment
882 else:
883 part = parsed_url.path
884
885 match = re.match(
886 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
887 if not match:
888 return fail_result
889
890 issue = int(match.group('issue'))
891 patchset = match.group('patchset')
892 return _ParsedIssueNumberArgument(
893 issue=issue,
894 patchset=int(patchset) if patchset else None,
895 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000896
897
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000898def _create_description_from_log(args):
899 """Pulls out the commit log to use as a base for the CL description."""
900 log_args = []
901 if len(args) == 1 and not args[0].endswith('.'):
902 log_args = [args[0] + '..']
903 elif len(args) == 1 and args[0].endswith('...'):
904 log_args = [args[0][:-1]]
905 elif len(args) == 2:
906 log_args = [args[0] + '..' + args[1]]
907 else:
908 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000909 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000910
911
Aaron Gablea45ee112016-11-22 15:14:38 -0800912class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700913 def __init__(self, issue, url):
914 self.issue = issue
915 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800916 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700917
918 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800919 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700920 self.issue, self.url)
921
922
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100923_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000924 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100925 # TODO(tandrii): these two aren't known in Gerrit.
926 'approval', 'disapproval'])
927
928
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000929class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000930 """Changelist works with one changelist in local branch.
931
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000932 Notes:
933 * Not safe for concurrent multi-{thread,process} use.
934 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700935 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000936 """
937
Edward Lemur125d60a2019-09-13 18:25:41 +0000938 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000939 """Create a new ChangeList instance.
940
Edward Lemurf38bc172019-09-03 21:02:13 +0000941 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000942 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000943 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000944 global settings
945 if not settings:
946 # Happens when git_cl.py is used as a utility library.
947 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000948
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000949 self.branchref = branchref
950 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000951 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000952 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000953 else:
954 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000955 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000956 self.lookedup_issue = False
957 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000958 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000959 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000960 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000961 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800962 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000963 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000964 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000965
Edward Lemur125d60a2019-09-13 18:25:41 +0000966 # Lazily cached values.
967 self._gerrit_host = None # e.g. chromium-review.googlesource.com
968 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
969 # Map from change number (issue) to its detail cache.
970 self._detail_cache = {}
971
972 if codereview_host is not None:
973 assert not codereview_host.startswith('https://'), codereview_host
974 self._gerrit_host = codereview_host
975 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000976
977 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700978 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000979
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700980 The return value is a string suitable for passing to git cl with the --cc
981 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000982 """
983 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000984 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800985 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000986 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
987 return self.cc
988
Daniel Cheng7227d212017-11-17 08:12:37 -0800989 def ExtendCC(self, more_cc):
990 """Extends the list of users to cc on this CL based on the changed files."""
991 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000992
993 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000994 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000995 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +0000996 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000997 if not branchref:
998 return None
999 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001000 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001001 return self.branch
1002
1003 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001004 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005 self.GetBranch() # Poke the lazy loader.
1006 return self.branchref
1007
Edward Lemur85153282020-02-14 22:06:29 +00001008 def _GitGetBranchConfigValue(self, key, default=None):
1009 return scm.GIT.GetBranchConfig(
1010 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001011
Edward Lemur85153282020-02-14 22:06:29 +00001012 def _GitSetBranchConfigValue(self, key, value):
1013 action = 'set %s to %r' % (key, value)
1014 if not value:
1015 action = 'unset %s' % key
1016 assert self.GetBranch(), 'a branch is needed to ' + action
1017 return scm.GIT.SetBranchConfig(
1018 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001019
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001020 @staticmethod
1021 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001022 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001023 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001025 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1026 settings.GetRoot(), branch)
1027 if not remote or not upstream_branch:
1028 DieWithError(
1029 'Unable to determine default branch to diff against.\n'
1030 'Either pass complete "git diff"-style arguments, like\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001031 ' git cl upload origin/main\n'
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001032 'or verify this branch is set up to track another \n'
1033 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034
1035 return remote, upstream_branch
1036
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001037 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001038 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001039 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001040 DieWithError('The upstream for the current branch (%s) does not exist '
1041 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001042 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001043 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001044
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001045 def GetUpstreamBranch(self):
1046 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001047 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001048 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001049 upstream_branch = upstream_branch.replace('refs/heads/',
1050 'refs/remotes/%s/' % remote)
1051 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1052 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 self.upstream_branch = upstream_branch
1054 return self.upstream_branch
1055
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001056 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001057 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001058 remote, branch = None, self.GetBranch()
1059 seen_branches = set()
1060 while branch not in seen_branches:
1061 seen_branches.add(branch)
1062 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001063 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001064 if remote != '.' or branch.startswith('refs/remotes'):
1065 break
1066 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001067 remotes = RunGit(['remote'], error_ok=True).split()
1068 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001069 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001070 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001071 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001072 logging.warn('Could not determine which remote this change is '
1073 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001074 else:
1075 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001076 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001077 branch = 'HEAD'
1078 if branch.startswith('refs/remotes'):
1079 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001080 elif branch.startswith('refs/branch-heads/'):
1081 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001082 else:
1083 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001084 return self._remote
1085
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001086 def GetRemoteUrl(self):
1087 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1088
1089 Returns None if there is no remote.
1090 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001091 is_cached, value = self._cached_remote_url
1092 if is_cached:
1093 return value
1094
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001095 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001096 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001097
Edward Lemur298f2cf2019-02-22 21:40:39 +00001098 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001099 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001100 if host:
1101 self._cached_remote_url = (True, url)
1102 return url
1103
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001104 # If it cannot be parsed as an url, assume it is a local directory,
1105 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001106 logging.warning('"%s" doesn\'t appear to point to a git host. '
1107 'Interpreting it as a local directory.', url)
1108 if not os.path.isdir(url):
1109 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001110 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1111 'but it doesn\'t exist.',
1112 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001113 return None
1114
1115 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001116 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001117
Edward Lemur79d4f992019-11-11 23:49:02 +00001118 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001119 if not host:
1120 logging.error(
1121 'Remote "%(remote)s" for branch "%(branch)s" points to '
1122 '"%(cache_path)s", but it is misconfigured.\n'
1123 '"%(cache_path)s" must be a git repo and must have a remote named '
1124 '"%(remote)s" pointing to the git host.', {
1125 'remote': remote,
1126 'cache_path': cache_path,
1127 'branch': self.GetBranch()})
1128 return None
1129
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001130 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001131 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001133 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001134 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001135 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001136 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001137 if self.issue is not None:
1138 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001139 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 return self.issue
1141
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001142 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001144 issue = self.GetIssue()
1145 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001146 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001147 server = self.GetCodereviewServer()
1148 if short:
1149 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1150 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001151
Edward Lemur6c6827c2020-02-06 21:15:18 +00001152 def FetchDescription(self, pretty=False):
1153 assert self.GetIssue(), 'issue is required to query Gerrit'
1154
Edward Lemur9aa1a962020-02-25 00:58:38 +00001155 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001156 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1157 current_rev = data['current_revision']
1158 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001159
1160 if not pretty:
1161 return self.description
1162
1163 # Set width to 72 columns + 2 space indent.
1164 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1165 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1166 lines = self.description.splitlines()
1167 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168
1169 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001170 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001171 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001172 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001173 if self.patchset is not None:
1174 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001175 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001176 return self.patchset
1177
Edward Lemur9aa1a962020-02-25 00:58:38 +00001178 def GetAuthor(self):
1179 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1180
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001182 """Set this branch's patchset. If patchset=0, clears the patchset."""
1183 assert self.GetBranch()
1184 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001185 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001186 else:
1187 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001188 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001189
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001190 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001191 """Set this branch's issue. If issue isn't given, clears the issue."""
1192 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001194 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001195 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001196 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001197 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001198 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001199 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001200 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201 else:
tandrii5d48c322016-08-18 16:19:37 -07001202 # Reset all of these just to be clean.
1203 reset_suffixes = [
1204 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001205 ISSUE_CONFIG_KEY,
1206 PATCHSET_CONFIG_KEY,
1207 CODEREVIEW_SERVER_CONFIG_KEY,
1208 'gerritsquashhash',
1209 ]
tandrii5d48c322016-08-18 16:19:37 -07001210 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001211 try:
1212 self._GitSetBranchConfigValue(prop, None)
1213 except subprocess2.CalledProcessError:
1214 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001215 msg = RunGit(['log', '-1', '--format=%B']).strip()
1216 if msg and git_footers.get_footer_change_id(msg):
1217 print('WARNING: The change patched into this branch has a Change-Id. '
1218 'Removing it.')
1219 RunGit(['commit', '--amend', '-m',
1220 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001221 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001222 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001223 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001224
Edward Lemur2c62b332020-03-12 22:12:33 +00001225 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001226 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001227 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001228 except subprocess2.CalledProcessError:
1229 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001230 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001231 'This branch probably doesn\'t exist anymore. To reset the\n'
1232 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001233 ' git branch --set-upstream-to origin/main %s\n'
1234 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001235 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001236
dsansomee2d6fd92016-09-08 00:10:47 -07001237 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001238 assert self.GetIssue(), 'issue is required to update description'
1239
1240 if gerrit_util.HasPendingChangeEdit(
1241 self._GetGerritHost(), self._GerritChangeIdentifier()):
1242 if not force:
1243 confirm_or_exit(
1244 'The description cannot be modified while the issue has a pending '
1245 'unpublished edit. Either publish the edit in the Gerrit web UI '
1246 'or delete it.\n\n', action='delete the unpublished edit')
1247
1248 gerrit_util.DeletePendingChangeEdit(
1249 self._GetGerritHost(), self._GerritChangeIdentifier())
1250 gerrit_util.SetCommitMessage(
1251 self._GetGerritHost(), self._GerritChangeIdentifier(),
1252 description, notify='NONE')
1253
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001254 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001255
Edward Lemur75526302020-02-27 22:31:05 +00001256 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001257 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001258 '--root', settings.GetRoot(),
1259 '--upstream', upstream,
1260 ]
1261
1262 args.extend(['--verbose'] * verbose)
1263
Edward Lemur99df04e2020-03-05 19:39:43 +00001264 author = self.GetAuthor()
1265 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001266 issue = self.GetIssue()
1267 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001268 if author:
1269 args.extend(['--author', author])
1270 if gerrit_url:
1271 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001272 if issue:
1273 args.extend(['--issue', str(issue)])
1274 if patchset:
1275 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001276
Edward Lemur75526302020-02-27 22:31:05 +00001277 return args
1278
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001279 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001280 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001281 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1282 args = self._GetCommonPresubmitArgs(verbose, upstream)
1283 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001284 if may_prompt:
1285 args.append('--may_prompt')
1286 if parallel:
1287 args.append('--parallel')
1288 if all_files:
1289 args.append('--all_files')
1290
1291 with gclient_utils.temporary_file() as description_file:
1292 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001293
1294 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001295 args.extend(['--json_output', json_output])
1296 args.extend(['--description_file', description_file])
Saagar Sanghavi531d9922020-08-10 20:14:01 +00001297 args.extend(['--gerrit_project', self._GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001298
1299 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001300 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001301 if resultdb and realm:
1302 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1303 elif resultdb:
1304 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1305 # it is not required to pass the realm flag
1306 print('Note: ResultDB reporting will NOT be performed because --realm'
1307 ' was not specified. To enable ResultDB, please run the command'
1308 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001309
1310 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001311 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001312
Edward Lemur227d5102020-02-25 23:45:35 +00001313 metrics.collector.add_repeated('sub_commands', {
1314 'command': 'presubmit',
1315 'execution_time': time_time() - start,
1316 'exit_code': exit_code,
1317 })
1318
1319 if exit_code:
1320 sys.exit(exit_code)
1321
1322 json_results = gclient_utils.FileRead(json_output)
1323 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001324
Edward Lemur75526302020-02-27 22:31:05 +00001325 def RunPostUploadHook(self, verbose, upstream, description):
1326 args = self._GetCommonPresubmitArgs(verbose, upstream)
1327 args.append('--post_upload')
1328
1329 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001330 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001331 args.extend(['--description_file', description_file])
1332 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1333 p.wait()
1334
Edward Lemur5a644f82020-03-18 16:44:57 +00001335 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1336 # Get description message for upload.
1337 if self.GetIssue():
1338 description = self.FetchDescription()
1339 elif options.message:
1340 description = options.message
1341 else:
1342 description = _create_description_from_log(git_diff_args)
1343 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001344 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001345
1346 # Extract bug number from branch name.
1347 bug = options.bug
1348 fixed = options.fixed
1349 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1350 self.GetBranch())
1351 if not bug and not fixed and match:
1352 if match.group('type') == 'bug':
1353 bug = match.group('bugnum')
1354 else:
1355 fixed = match.group('bugnum')
1356
1357 change_description = ChangeDescription(description, bug, fixed)
1358
1359 # Set the reviewer list now so that presubmit checks can access it.
1360 if options.reviewers or options.tbrs or options.add_owners_to:
1361 change_description.update_reviewers(
1362 options.reviewers, options.tbrs, options.add_owners_to, files,
1363 self.GetAuthor())
1364
1365 return change_description
1366
1367 def _GetTitleForUpload(self, options):
1368 # When not squashing, just return options.title.
1369 if not options.squash:
1370 return options.title
1371
1372 # On first upload, patchset title is always this string, while options.title
1373 # gets converted to first line of message.
1374 if not self.GetIssue():
1375 return 'Initial upload'
1376
1377 # When uploading subsequent patchsets, options.message is taken as the title
1378 # if options.title is not provided.
1379 if options.title:
1380 return options.title
1381 if options.message:
1382 return options.message.strip()
1383
1384 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001385 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001386 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001387 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001388 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1389 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001390
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001391 def CMDUpload(self, options, git_diff_args, orig_args):
1392 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001393 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001394 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001395 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001396 else:
1397 if self.GetBranch() is None:
1398 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1399
1400 # Default to diffing against common ancestor of upstream branch
1401 base_branch = self.GetCommonAncestorWithUpstream()
1402 git_diff_args = [base_branch, 'HEAD']
1403
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001404 # Fast best-effort checks to abort before running potentially expensive
1405 # hooks if uploading is likely to fail anyway. Passing these checks does
1406 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001407 self.EnsureAuthenticated(force=options.force)
1408 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001409
1410 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001411 watchlist = watchlists.Watchlists(settings.GetRoot())
1412 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001413 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001414 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001415
Edward Lemur5a644f82020-03-18 16:44:57 +00001416 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001417 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001418 hook_results = self.RunHook(
1419 committing=False,
1420 may_prompt=not options.force,
1421 verbose=options.verbose,
1422 parallel=options.parallel,
1423 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001424 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001425 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001426 resultdb=options.resultdb,
1427 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001428 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001429
Aaron Gable13101a62018-02-09 13:20:41 -08001430 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001431 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001432 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001433 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001434 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001435 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001436 # Run post upload hooks, if specified.
1437 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001438 self.RunPostUploadHook(
1439 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001440
1441 # Upload all dependencies if specified.
1442 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001443 print()
1444 print('--dependencies has been specified.')
1445 print('All dependent local branches will be re-uploaded.')
1446 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001447 # Remove the dependencies flag from args so that we do not end up in a
1448 # loop.
1449 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001450 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001451 return ret
1452
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001453 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001454 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001455
1456 Issue must have been already uploaded and known.
1457 """
1458 assert new_state in _CQState.ALL_STATES
1459 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001460 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001461 vote_map = {
1462 _CQState.NONE: 0,
1463 _CQState.DRY_RUN: 1,
1464 _CQState.COMMIT: 2,
1465 }
1466 labels = {'Commit-Queue': vote_map[new_state]}
1467 notify = False if new_state == _CQState.DRY_RUN else None
1468 gerrit_util.SetReview(
1469 self._GetGerritHost(), self._GerritChangeIdentifier(),
1470 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001471 return 0
1472 except KeyboardInterrupt:
1473 raise
1474 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001475 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001476 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001477 ' * Your project has no CQ,\n'
1478 ' * You don\'t have permission to change the CQ state,\n'
1479 ' * There\'s a bug in this code (see stack trace below).\n'
1480 'Consider specifying which bots to trigger manually or asking your '
1481 'project owners for permissions or contacting Chrome Infra at:\n'
1482 'https://www.chromium.org/infra\n\n' %
1483 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001484 # Still raise exception so that stack trace is printed.
1485 raise
1486
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001487 def _GetGerritHost(self):
1488 # Lazy load of configs.
1489 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001490 if self._gerrit_host and '.' not in self._gerrit_host:
1491 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1492 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001493 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001494 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001495 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001496 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001497 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1498 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001499 return self._gerrit_host
1500
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001501 def _GetGitHost(self):
1502 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001503 remote_url = self.GetRemoteUrl()
1504 if not remote_url:
1505 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001506 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001507
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001508 def GetCodereviewServer(self):
1509 if not self._gerrit_server:
1510 # If we're on a branch then get the server potentially associated
1511 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001512 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001513 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001514 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001515 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001516 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517 if not self._gerrit_server:
1518 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1519 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001520 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001521 parts[0] = parts[0] + '-review'
1522 self._gerrit_host = '.'.join(parts)
1523 self._gerrit_server = 'https://%s' % self._gerrit_host
1524 return self._gerrit_server
1525
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001526 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001527 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001528 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001529 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001530 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001531 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001532 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001533 if project.endswith('.git'):
1534 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001535 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1536 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1537 # gitiles/git-over-https protocol. E.g.,
1538 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1539 # as
1540 # https://chromium.googlesource.com/v8/v8
1541 if project.startswith('a/'):
1542 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001543 return project
1544
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001545 def _GerritChangeIdentifier(self):
1546 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1547
1548 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001549 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001550 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001551 project = self._GetGerritProject()
1552 if project:
1553 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1554 # Fall back on still unique, but less efficient change number.
1555 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001556
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001557 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001559 if settings.GetGerritSkipEnsureAuthenticated():
1560 # For projects with unusual authentication schemes.
1561 # See http://crbug.com/603378.
1562 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001563
1564 # Check presence of cookies only if using cookies-based auth method.
1565 cookie_auth = gerrit_util.Authenticator.get()
1566 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001567 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001568
Florian Mayerae510e82020-01-30 21:04:48 +00001569 remote_url = self.GetRemoteUrl()
1570 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001571 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001572 return
1573 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001574 logging.warning('Ignoring branch %(branch)s with non-https remote '
1575 '%(remote)s', {
1576 'branch': self.branch,
1577 'remote': self.GetRemoteUrl()
1578 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001579 return
1580
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001581 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001582 self.GetCodereviewServer()
1583 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001584 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001585
1586 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1587 git_auth = cookie_auth.get_auth_header(git_host)
1588 if gerrit_auth and git_auth:
1589 if gerrit_auth == git_auth:
1590 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001591 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001592 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001593 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001594 ' %s\n'
1595 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001596 ' Consider running the following command:\n'
1597 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001598 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001599 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001600 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001601 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001602 cookie_auth.get_new_password_message(git_host)))
1603 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001604 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001605 return
1606 else:
1607 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001608 ([] if gerrit_auth else [self._gerrit_host]) +
1609 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001610 DieWithError('Credentials for the following hosts are required:\n'
1611 ' %s\n'
1612 'These are read from %s (or legacy %s)\n'
1613 '%s' % (
1614 '\n '.join(missing),
1615 cookie_auth.get_gitcookies_path(),
1616 cookie_auth.get_netrc_path(),
1617 cookie_auth.get_new_password_message(git_host)))
1618
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001619 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001620 if not self.GetIssue():
1621 return
1622
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001623 status = self._GetChangeDetail()['status']
1624 if status in ('MERGED', 'ABANDONED'):
1625 DieWithError('Change %s has been %s, new uploads are not allowed' %
1626 (self.GetIssueURL(),
1627 'submitted' if status == 'MERGED' else 'abandoned'))
1628
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001629 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1630 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1631 # Apparently this check is not very important? Otherwise get_auth_email
1632 # could have been added to other implementations of Authenticator.
1633 cookies_auth = gerrit_util.Authenticator.get()
1634 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001635 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001636
1637 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001638 if self.GetIssueOwner() == cookies_user:
1639 return
1640 logging.debug('change %s owner is %s, cookies user is %s',
1641 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001642 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001643 # so ask what Gerrit thinks of this user.
1644 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1645 if details['email'] == self.GetIssueOwner():
1646 return
1647 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001648 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001649 'as %s.\n'
1650 'Uploading may fail due to lack of permissions.' %
1651 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1652 confirm_or_exit(action='upload')
1653
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001654 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001655 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001656 or CQ status, assuming adherence to a common workflow.
1657
1658 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001659 * 'error' - error from review tool (including deleted issues)
1660 * 'unsent' - no reviewers added
1661 * 'waiting' - waiting for review
1662 * 'reply' - waiting for uploader to reply to review
1663 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001664 * 'dry-run' - dry-running in the CQ
1665 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001666 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001667 """
1668 if not self.GetIssue():
1669 return None
1670
1671 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001672 data = self._GetChangeDetail([
1673 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001674 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001675 return 'error'
1676
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001677 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001678 return 'closed'
1679
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001680 cq_label = data['labels'].get('Commit-Queue', {})
1681 max_cq_vote = 0
1682 for vote in cq_label.get('all', []):
1683 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1684 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001685 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001686 if max_cq_vote == 1:
1687 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001688
Aaron Gable9ab38c62017-04-06 14:36:33 -07001689 if data['labels'].get('Code-Review', {}).get('approved'):
1690 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001691
1692 if not data.get('reviewers', {}).get('REVIEWER', []):
1693 return 'unsent'
1694
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001695 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001696 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001697 while messages:
1698 m = messages.pop()
1699 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001700 # Ignore replies from CQ.
1701 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001702 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001703 # Most recent message was by owner.
1704 return 'waiting'
1705 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001706 # Some reply from non-owner.
1707 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001708
1709 # Somehow there are no messages even though there are reviewers.
1710 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001711
1712 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001713 if not self.GetIssue():
1714 return None
1715
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001716 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001717 patchset = data['revisions'][data['current_revision']]['_number']
1718 self.SetPatchset(patchset)
1719 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720
Aaron Gable636b13f2017-07-14 10:42:48 -07001721 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001722 gerrit_util.SetReview(
1723 self._GetGerritHost(), self._GerritChangeIdentifier(),
1724 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001725
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001726 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001727 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001728 # CURRENT_REVISION is included to get the latest patchset so that
1729 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001730 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001731 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1732 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001733 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001734 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001735 robot_file_comments = gerrit_util.GetChangeRobotComments(
1736 self._GetGerritHost(), self._GerritChangeIdentifier())
1737
1738 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001739 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001740 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001741 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001742 line_comments = file_comments.setdefault(path, [])
1743 line_comments.extend(
1744 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001745
1746 # Build dictionary of file comments for easy access and sorting later.
1747 # {author+date: {path: {patchset: {line: url+message}}}}
1748 comments = collections.defaultdict(
1749 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001750 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001751 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001752 tag = comment.get('tag', '')
1753 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001754 continue
1755 key = (comment['author']['email'], comment['updated'])
1756 if comment.get('side', 'REVISION') == 'PARENT':
1757 patchset = 'Base'
1758 else:
1759 patchset = 'PS%d' % comment['patch_set']
1760 line = comment.get('line', 0)
1761 url = ('https://%s/c/%s/%s/%s#%s%s' %
1762 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1763 'b' if comment.get('side') == 'PARENT' else '',
1764 str(line) if line else ''))
1765 comments[key][path][patchset][line] = (url, comment['message'])
1766
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001767 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001768 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001769 summary = self._BuildCommentSummary(msg, comments, readable)
1770 if summary:
1771 summaries.append(summary)
1772 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001773
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001774 @staticmethod
1775 def _BuildCommentSummary(msg, comments, readable):
1776 key = (msg['author']['email'], msg['date'])
1777 # Don't bother showing autogenerated messages that don't have associated
1778 # file or line comments. this will filter out most autogenerated
1779 # messages, but will keep robot comments like those from Tricium.
1780 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1781 if is_autogenerated and not comments.get(key):
1782 return None
1783 message = msg['message']
1784 # Gerrit spits out nanoseconds.
1785 assert len(msg['date'].split('.')[-1]) == 9
1786 date = datetime.datetime.strptime(msg['date'][:-3],
1787 '%Y-%m-%d %H:%M:%S.%f')
1788 if key in comments:
1789 message += '\n'
1790 for path, patchsets in sorted(comments.get(key, {}).items()):
1791 if readable:
1792 message += '\n%s' % path
1793 for patchset, lines in sorted(patchsets.items()):
1794 for line, (url, content) in sorted(lines.items()):
1795 if line:
1796 line_str = 'Line %d' % line
1797 path_str = '%s:%d:' % (path, line)
1798 else:
1799 line_str = 'File comment'
1800 path_str = '%s:0:' % path
1801 if readable:
1802 message += '\n %s, %s: %s' % (patchset, line_str, url)
1803 message += '\n %s\n' % content
1804 else:
1805 message += '\n%s ' % path_str
1806 message += '\n%s\n' % content
1807
1808 return _CommentSummary(
1809 date=date,
1810 message=message,
1811 sender=msg['author']['email'],
1812 autogenerated=is_autogenerated,
1813 # These could be inferred from the text messages and correlated with
1814 # Code-Review label maximum, however this is not reliable.
1815 # Leaving as is until the need arises.
1816 approval=False,
1817 disapproval=False,
1818 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001819
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001821 gerrit_util.AbandonChange(
1822 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001824 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001825 gerrit_util.SubmitChange(
1826 self._GetGerritHost(), self._GerritChangeIdentifier(),
1827 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001828
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001829 def _GetChangeDetail(self, options=None):
1830 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001831 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001832 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001833
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001834 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001835 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001836 options.append('CURRENT_COMMIT')
1837
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001838 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001839 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001840 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001841
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001842 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1843 # Assumption: data fetched before with extra options is suitable
1844 # for return for a smaller set of options.
1845 # For example, if we cached data for
1846 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1847 # and request is for options=[CURRENT_REVISION],
1848 # THEN we can return prior cached data.
1849 if options_set.issubset(cached_options_set):
1850 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001851
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001852 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001853 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001854 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001855 except gerrit_util.GerritError as e:
1856 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001857 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001858 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001859
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001860 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001861 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001862
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001863 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001864 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001865 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001866 data = gerrit_util.GetChangeCommit(
1867 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001868 except gerrit_util.GerritError as e:
1869 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001870 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001871 raise
agable32978d92016-11-01 12:55:02 -07001872 return data
1873
Karen Qian40c19422019-03-13 21:28:29 +00001874 def _IsCqConfigured(self):
1875 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001876 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001877
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001878 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001879 if git_common.is_dirty_git_tree('land'):
1880 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001881
tandriid60367b2016-06-22 05:25:12 -07001882 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001883 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001884 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001885 'which can test and land changes for you. '
1886 'Are you sure you wish to bypass it?\n',
1887 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001888 differs = True
tandriic4344b52016-08-29 06:04:54 -07001889 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001890 # Note: git diff outputs nothing if there is no diff.
1891 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001892 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001893 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001894 if detail['current_revision'] == last_upload:
1895 differs = False
1896 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001897 print('WARNING: Local branch contents differ from latest uploaded '
1898 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001899 if differs:
1900 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001901 confirm_or_exit(
1902 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1903 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001904 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001905 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001906 upstream = self.GetCommonAncestorWithUpstream()
1907 if self.GetIssue():
1908 description = self.FetchDescription()
1909 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001910 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001911 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001912 committing=True,
1913 may_prompt=not force,
1914 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001915 parallel=parallel,
1916 upstream=upstream,
1917 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001918 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001919 resultdb=resultdb,
1920 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001921
1922 self.SubmitIssue(wait_for_merge=True)
1923 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001924 links = self._GetChangeCommit().get('web_links', [])
1925 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001926 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001927 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001928 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001929 return 0
1930
Edward Lemurf38bc172019-09-03 21:02:13 +00001931 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001932 assert parsed_issue_arg.valid
1933
Edward Lemur125d60a2019-09-13 18:25:41 +00001934 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001935
1936 if parsed_issue_arg.hostname:
1937 self._gerrit_host = parsed_issue_arg.hostname
1938 self._gerrit_server = 'https://%s' % self._gerrit_host
1939
tandriic2405f52016-10-10 08:13:15 -07001940 try:
1941 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001942 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001943 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001944
1945 if not parsed_issue_arg.patchset:
1946 # Use current revision by default.
1947 revision_info = detail['revisions'][detail['current_revision']]
1948 patchset = int(revision_info['_number'])
1949 else:
1950 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001951 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001952 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1953 break
1954 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001955 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 (parsed_issue_arg.patchset, self.GetIssue()))
1957
Edward Lemur125d60a2019-09-13 18:25:41 +00001958 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001959 if remote_url.endswith('.git'):
1960 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001961 remote_url = remote_url.rstrip('/')
1962
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001963 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001964 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001965
1966 if remote_url != fetch_info['url']:
1967 DieWithError('Trying to patch a change from %s but this repo appears '
1968 'to be %s.' % (fetch_info['url'], remote_url))
1969
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001970 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001971
Aaron Gable62619a32017-06-16 08:22:09 -07001972 if force:
1973 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1974 print('Checked out commit for change %i patchset %i locally' %
1975 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001976 elif nocommit:
1977 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1978 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001979 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001980 RunGit(['cherry-pick', 'FETCH_HEAD'])
1981 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001982 (parsed_issue_arg.issue, patchset))
1983 print('Note: this created a local commit which does not have '
1984 'the same hash as the one uploaded for review. This will make '
1985 'uploading changes based on top of this branch difficult.\n'
1986 'If you want to do that, use "git cl patch --force" instead.')
1987
Stefan Zagerd08043c2017-10-12 12:07:02 -07001988 if self.GetBranch():
1989 self.SetIssue(parsed_issue_arg.issue)
1990 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001991 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001992 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1993 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1994 else:
1995 print('WARNING: You are in detached HEAD state.\n'
1996 'The patch has been applied to your checkout, but you will not be '
1997 'able to upload a new patch set to the gerrit issue.\n'
1998 'Try using the \'-b\' option if you would like to work on a '
1999 'branch and/or upload a new patch set.')
2000
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 return 0
2002
tandrii16e0b4e2016-06-07 10:34:28 -07002003 def _GerritCommitMsgHookCheck(self, offer_removal):
2004 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2005 if not os.path.exists(hook):
2006 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002007 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2008 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002009 data = gclient_utils.FileRead(hook)
2010 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2011 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002012 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002013 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002014 'and may interfere with it in subtle ways.\n'
2015 'We recommend you remove the commit-msg hook.')
2016 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002017 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002018 gclient_utils.rm_file_or_tree(hook)
2019 print('Gerrit commit-msg hook removed.')
2020 else:
2021 print('OK, will keep Gerrit commit-msg hook in place.')
2022
Edward Lemur1b52d872019-05-09 21:12:12 +00002023 def _CleanUpOldTraces(self):
2024 """Keep only the last |MAX_TRACES| traces."""
2025 try:
2026 traces = sorted([
2027 os.path.join(TRACES_DIR, f)
2028 for f in os.listdir(TRACES_DIR)
2029 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2030 and not f.startswith('tmp'))
2031 ])
2032 traces_to_delete = traces[:-MAX_TRACES]
2033 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002034 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002035 except OSError:
2036 print('WARNING: Failed to remove old git traces from\n'
2037 ' %s'
2038 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002039
Edward Lemur5737f022019-05-17 01:24:00 +00002040 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002041 """Zip and write the git push traces stored in traces_dir."""
2042 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002043 traces_zip = trace_name + '-traces'
2044 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002045 # Create a temporary dir to store git config and gitcookies in. It will be
2046 # compressed and stored next to the traces.
2047 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002048 git_info_zip = trace_name + '-git-info'
2049
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002050 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002051
Edward Lemur1b52d872019-05-09 21:12:12 +00002052 git_push_metadata['trace_name'] = trace_name
2053 gclient_utils.FileWrite(
2054 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2055
2056 # Keep only the first 6 characters of the git hashes on the packet
2057 # trace. This greatly decreases size after compression.
2058 packet_traces = os.path.join(traces_dir, 'trace-packet')
2059 if os.path.isfile(packet_traces):
2060 contents = gclient_utils.FileRead(packet_traces)
2061 gclient_utils.FileWrite(
2062 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2063 shutil.make_archive(traces_zip, 'zip', traces_dir)
2064
2065 # Collect and compress the git config and gitcookies.
2066 git_config = RunGit(['config', '-l'])
2067 gclient_utils.FileWrite(
2068 os.path.join(git_info_dir, 'git-config'),
2069 git_config)
2070
2071 cookie_auth = gerrit_util.Authenticator.get()
2072 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2073 gitcookies_path = cookie_auth.get_gitcookies_path()
2074 if os.path.isfile(gitcookies_path):
2075 gitcookies = gclient_utils.FileRead(gitcookies_path)
2076 gclient_utils.FileWrite(
2077 os.path.join(git_info_dir, 'gitcookies'),
2078 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2079 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2080
Edward Lemur1b52d872019-05-09 21:12:12 +00002081 gclient_utils.rmtree(git_info_dir)
2082
2083 def _RunGitPushWithTraces(
2084 self, change_desc, refspec, refspec_opts, git_push_metadata):
2085 """Run git push and collect the traces resulting from the execution."""
2086 # Create a temporary directory to store traces in. Traces will be compressed
2087 # and stored in a 'traces' dir inside depot_tools.
2088 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002089 trace_name = os.path.join(
2090 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002091
2092 env = os.environ.copy()
2093 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2094 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002095 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002096 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2097 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2098 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2099
2100 try:
2101 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002102 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002103 before_push = time_time()
2104 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002105 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002106 env=env,
2107 print_stdout=True,
2108 # Flush after every line: useful for seeing progress when running as
2109 # recipe.
2110 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002111 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002112 except subprocess2.CalledProcessError as e:
2113 push_returncode = e.returncode
2114 DieWithError('Failed to create a change. Please examine output above '
2115 'for the reason of the failure.\n'
2116 'Hint: run command below to diagnose common Git/Gerrit '
2117 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002118 ' git cl creds-check\n'
2119 '\n'
2120 'If git-cl is not working correctly, file a bug under the '
2121 'Infra>SDK component including the files below.\n'
2122 'Review the files before upload, since they might contain '
2123 'sensitive information.\n'
2124 'Set the Restrict-View-Google label so that they are not '
2125 'publicly accessible.\n'
2126 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002127 change_desc)
2128 finally:
2129 execution_time = time_time() - before_push
2130 metrics.collector.add_repeated('sub_commands', {
2131 'command': 'git push',
2132 'execution_time': execution_time,
2133 'exit_code': push_returncode,
2134 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2135 })
2136
Edward Lemur1b52d872019-05-09 21:12:12 +00002137 git_push_metadata['execution_time'] = execution_time
2138 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002139 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002140
Edward Lemur1b52d872019-05-09 21:12:12 +00002141 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002142 gclient_utils.rmtree(traces_dir)
2143
2144 return push_stdout
2145
Edward Lemura12175c2020-03-09 16:58:26 +00002146 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002147 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002149 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002150 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002151
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002152 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002153 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002154 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002155 # User requested to change description
2156 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002157 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002158 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002159 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002160 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002161 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002162 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002163 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002164 if len(change_ids) == 1:
2165 change_id = change_ids[0]
2166 else:
2167 change_id = GenerateGerritChangeId(change_desc.description)
2168 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002169
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002170 if options.preserve_tryjobs:
2171 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002172
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002173 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002174 parent = self._ComputeParent(
2175 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002176 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002177 with gclient_utils.temporary_file() as desc_tempfile:
2178 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2179 ref_to_push = RunGit(
2180 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002181 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002182 if not git_footers.get_footer_change_id(change_desc.description):
2183 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002184 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002185 self._AddChangeIdToCommitMessage(
2186 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002187 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002188 # For no-squash mode, we assume the remote called "origin" is the one we
2189 # want. It is not worthwhile to support different workflows for
2190 # no-squash mode.
2191 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002192 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2193
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002194 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002195 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2196 ref_to_push)]).splitlines()
2197 if len(commits) > 1:
2198 print('WARNING: This will upload %d commits. Run the following command '
2199 'to see which commits will be uploaded: ' % len(commits))
2200 print('git log %s..%s' % (parent, ref_to_push))
2201 print('You can also use `git squash-branch` to squash these into a '
2202 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002203 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002205 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002206 cc = []
2207 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2208 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2209 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002210 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002211 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002212 if options.cc:
2213 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002214 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002215 if change_desc.get_cced():
2216 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002217 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2218 valid_accounts = set(reviewers + cc)
2219 # TODO(crbug/877717): relax this for all hosts.
2220 else:
2221 valid_accounts = gerrit_util.ValidAccounts(
2222 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002223 logging.info('accounts %s are recognized, %s invalid',
2224 sorted(valid_accounts),
2225 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002226
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002227 # Extra options that can be specified at push time. Doc:
2228 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002229 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002230
Aaron Gable844cf292017-06-28 11:32:59 -07002231 # By default, new changes are started in WIP mode, and subsequent patchsets
2232 # don't send email. At any time, passing --send-mail will mark the change
2233 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002234 if options.send_mail:
2235 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002236 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002237 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002238 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002239 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002240 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002241
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002242 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002243 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002244
Edward Lemur5a644f82020-03-18 16:44:57 +00002245 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002246 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002247 # Punctuation and whitespace in |title| must be percent-encoded.
2248 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002249
agablec6787972016-09-09 16:13:34 -07002250 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002251 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002252
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002253 for r in sorted(reviewers):
2254 if r in valid_accounts:
2255 refspec_opts.append('r=%s' % r)
2256 reviewers.remove(r)
2257 else:
2258 # TODO(tandrii): this should probably be a hard failure.
2259 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2260 % r)
2261 for c in sorted(cc):
2262 # refspec option will be rejected if cc doesn't correspond to an
2263 # account, even though REST call to add such arbitrary cc may succeed.
2264 if c in valid_accounts:
2265 refspec_opts.append('cc=%s' % c)
2266 cc.remove(c)
2267
rmistry9eadede2016-09-19 11:22:43 -07002268 if options.topic:
2269 # Documentation on Gerrit topics is here:
2270 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002271 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002272
Edward Lemur687ca902018-12-05 02:30:30 +00002273 if options.enable_auto_submit:
2274 refspec_opts.append('l=Auto-Submit+1')
2275 if options.use_commit_queue:
2276 refspec_opts.append('l=Commit-Queue+2')
2277 elif options.cq_dry_run:
2278 refspec_opts.append('l=Commit-Queue+1')
2279
2280 if change_desc.get_reviewers(tbr_only=True):
2281 score = gerrit_util.GetCodeReviewTbrScore(
2282 self._GetGerritHost(),
2283 self._GetGerritProject())
2284 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002285
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002286 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002287 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002288 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002289 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002290 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2291
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002292 refspec_suffix = ''
2293 if refspec_opts:
2294 refspec_suffix = '%' + ','.join(refspec_opts)
2295 assert ' ' not in refspec_suffix, (
2296 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2297 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2298
Edward Lemur1b52d872019-05-09 21:12:12 +00002299 git_push_metadata = {
2300 'gerrit_host': self._GetGerritHost(),
2301 'title': title or '<untitled>',
2302 'change_id': change_id,
2303 'description': change_desc.description,
2304 }
2305 push_stdout = self._RunGitPushWithTraces(
2306 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307
2308 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002309 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 change_numbers = [m.group(1)
2311 for m in map(regex.match, push_stdout.splitlines())
2312 if m]
2313 if len(change_numbers) != 1:
2314 DieWithError(
2315 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002316 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002318 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002319
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002320 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002321 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002322 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002323 gerrit_util.AddReviewers(
2324 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002325 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002326 reviewers, cc,
2327 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002328
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 return 0
2330
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002331 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2332 change_desc):
2333 """Computes parent of the generated commit to be uploaded to Gerrit.
2334
2335 Returns revision or a ref name.
2336 """
2337 if custom_cl_base:
2338 # Try to avoid creating additional unintended CLs when uploading, unless
2339 # user wants to take this risk.
2340 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2341 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2342 local_ref_of_target_remote])
2343 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002344 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002345 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2346 'If you proceed with upload, more than 1 CL may be created by '
2347 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2348 'If you are certain that specified base `%s` has already been '
2349 'uploaded to Gerrit as another CL, you may proceed.\n' %
2350 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2351 if not force:
2352 confirm_or_exit(
2353 'Do you take responsibility for cleaning up potential mess '
2354 'resulting from proceeding with upload?',
2355 action='upload')
2356 return custom_cl_base
2357
Aaron Gablef97e33d2017-03-30 15:44:27 -07002358 if remote != '.':
2359 return self.GetCommonAncestorWithUpstream()
2360
2361 # If our upstream branch is local, we base our squashed commit on its
2362 # squashed version.
2363 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2364
Aaron Gablef97e33d2017-03-30 15:44:27 -07002365 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002366 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002367 if upstream_branch_name == 'main':
2368 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002369
2370 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002371 # TODO(tandrii): consider checking parent change in Gerrit and using its
2372 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2373 # the tree hash of the parent branch. The upside is less likely bogus
2374 # requests to reupload parent change just because it's uploadhash is
2375 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002376 parent = scm.GIT.GetBranchConfig(
2377 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002378 # Verify that the upstream branch has been uploaded too, otherwise
2379 # Gerrit will create additional CLs when uploading.
2380 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2381 RunGitSilent(['rev-parse', parent + ':'])):
2382 DieWithError(
2383 '\nUpload upstream branch %s first.\n'
2384 'It is likely that this branch has been rebased since its last '
2385 'upload, so you just need to upload it again.\n'
2386 '(If you uploaded it with --no-squash, then branch dependencies '
2387 'are not supported, and you should reupload with --squash.)'
2388 % upstream_branch_name,
2389 change_desc)
2390 return parent
2391
Edward Lemura12175c2020-03-09 16:58:26 +00002392 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002393 """Re-commits using the current message, assumes the commit hook is in
2394 place.
2395 """
Edward Lemura12175c2020-03-09 16:58:26 +00002396 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002397 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002398 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002399 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002400 return new_log_desc
2401 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002402 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403
tandriie113dfd2016-10-11 10:20:12 -07002404 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002405 try:
2406 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002407 except GerritChangeNotExists:
2408 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002409
2410 if data['status'] in ('ABANDONED', 'MERGED'):
2411 return 'CL %s is closed' % self.GetIssue()
2412
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002413 def GetGerritChange(self, patchset=None):
2414 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002415 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002416 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002417 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002418 data = self._GetChangeDetail(['ALL_REVISIONS'])
2419
2420 assert host and issue and patchset, 'CL must be uploaded first'
2421
2422 has_patchset = any(
2423 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002424 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002425 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002426 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002427 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002428
tandrii8c5a3532016-11-04 07:52:02 -07002429 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002430 'host': host,
2431 'change': issue,
2432 'project': data['project'],
2433 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002434 }
tandriie113dfd2016-10-11 10:20:12 -07002435
tandriide281ae2016-10-12 06:02:30 -07002436 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002437 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002438
Edward Lemur707d70b2018-02-07 00:50:14 +01002439 def GetReviewers(self):
2440 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002441 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002442
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002443
Lei Zhang8a0efc12020-08-05 19:58:45 +00002444def _get_bug_line_values(default_project_prefix, bugs):
2445 """Given default_project_prefix and comma separated list of bugs, yields bug
2446 line values.
tandriif9aefb72016-07-01 09:06:51 -07002447
2448 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002449 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002450 * string, which is left as is.
2451
2452 This function may produce more than one line, because bugdroid expects one
2453 project per line.
2454
Lei Zhang8a0efc12020-08-05 19:58:45 +00002455 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002456 ['v8:123', 'chromium:789']
2457 """
2458 default_bugs = []
2459 others = []
2460 for bug in bugs.split(','):
2461 bug = bug.strip()
2462 if bug:
2463 try:
2464 default_bugs.append(int(bug))
2465 except ValueError:
2466 others.append(bug)
2467
2468 if default_bugs:
2469 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002470 if default_project_prefix:
2471 if not default_project_prefix.endswith(':'):
2472 default_project_prefix += ':'
2473 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002474 else:
2475 yield default_bugs
2476 for other in sorted(others):
2477 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2478 yield other
2479
2480
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002481class ChangeDescription(object):
2482 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002483 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002484 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002485 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002486 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002487 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002488 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2489 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002490 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002491 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002492
Dan Beamd8b04ca2019-10-10 21:23:26 +00002493 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002494 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002495 if bug:
2496 regexp = re.compile(self.BUG_LINE)
2497 prefix = settings.GetBugPrefix()
2498 if not any((regexp.match(line) for line in self._description_lines)):
2499 values = list(_get_bug_line_values(prefix, bug))
2500 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002501 if fixed:
2502 regexp = re.compile(self.FIXED_LINE)
2503 prefix = settings.GetBugPrefix()
2504 if not any((regexp.match(line) for line in self._description_lines)):
2505 values = list(_get_bug_line_values(prefix, fixed))
2506 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002507
agable@chromium.org42c20792013-09-12 17:34:49 +00002508 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002509 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002510 return '\n'.join(self._description_lines)
2511
2512 def set_description(self, desc):
2513 if isinstance(desc, basestring):
2514 lines = desc.splitlines()
2515 else:
2516 lines = [line.rstrip() for line in desc]
2517 while lines and not lines[0]:
2518 lines.pop(0)
2519 while lines and not lines[-1]:
2520 lines.pop(-1)
2521 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002522
Edward Lemur5a644f82020-03-18 16:44:57 +00002523 def ensure_change_id(self, change_id):
2524 description = self.description
2525 footer_change_ids = git_footers.get_footer_change_id(description)
2526 # Make sure that the Change-Id in the description matches the given one.
2527 if footer_change_ids != [change_id]:
2528 if footer_change_ids:
2529 # Remove any existing Change-Id footers since they don't match the
2530 # expected change_id footer.
2531 description = git_footers.remove_footer(description, 'Change-Id')
2532 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2533 'if you want to set a new one.')
2534 # Add the expected Change-Id footer.
2535 description = git_footers.add_footer_change_id(description, change_id)
2536 self.set_description(description)
2537
Edward Lemur2c62b332020-03-12 22:12:33 +00002538 def update_reviewers(
2539 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002540 """Rewrites the R=/TBR= line(s) as a single line each.
2541
2542 Args:
2543 reviewers (list(str)) - list of additional emails to use for reviewers.
2544 tbrs (list(str)) - list of additional emails to use for TBRs.
2545 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2546 the change that are missing OWNER coverage. If this is not None, you
2547 must also pass a value for `change`.
2548 change (Change) - The Change that should be used for OWNERS lookups.
2549 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002550 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002551 assert isinstance(tbrs, list), tbrs
2552
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002553 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002554 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002555
2556 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002557 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002558
2559 reviewers = set(reviewers)
2560 tbrs = set(tbrs)
2561 LOOKUP = {
2562 'TBR': tbrs,
2563 'R': reviewers,
2564 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002565
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002566 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002567 regexp = re.compile(self.R_LINE)
2568 matches = [regexp.match(line) for line in self._description_lines]
2569 new_desc = [l for i, l in enumerate(self._description_lines)
2570 if not matches[i]]
2571 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002572
agable@chromium.org42c20792013-09-12 17:34:49 +00002573 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002574
2575 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002576 for match in matches:
2577 if not match:
2578 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002579 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2580
2581 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002582 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002583 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002584 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002585 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002586 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002587 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002588 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002589
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002590 # If any folks ended up in both groups, remove them from tbrs.
2591 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002592
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002593 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2594 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002595
2596 # Put the new lines in the description where the old first R= line was.
2597 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2598 if 0 <= line_loc < len(self._description_lines):
2599 if new_tbr_line:
2600 self._description_lines.insert(line_loc, new_tbr_line)
2601 if new_r_line:
2602 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002603 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002604 if new_r_line:
2605 self.append_footer(new_r_line)
2606 if new_tbr_line:
2607 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002608
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002609 def set_preserve_tryjobs(self):
2610 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2611 footers = git_footers.parse_footers(self.description)
2612 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2613 if v.lower() == 'true':
2614 return
2615 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2616
Anthony Polito8b955342019-09-24 19:01:36 +00002617 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002618 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002619 self.set_description([
2620 '# Enter a description of the change.',
2621 '# This will be displayed on the codereview site.',
2622 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002623 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002624 '--------------------',
2625 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002626 bug_regexp = re.compile(self.BUG_LINE)
2627 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002628 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002629 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2630 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002631 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002632
agable@chromium.org42c20792013-09-12 17:34:49 +00002633 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002634 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002635 if not content:
2636 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002637 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002638
Bruce Dawson2377b012018-01-11 16:46:49 -08002639 # Strip off comments and default inserted "Bug:" line.
2640 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002641 (line.startswith('#') or
2642 line.rstrip() == "Bug:" or
2643 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002644 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002645 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002646 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002647
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002648 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002649 """Adds a footer line to the description.
2650
2651 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2652 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2653 that Gerrit footers are always at the end.
2654 """
2655 parsed_footer_line = git_footers.parse_footer(line)
2656 if parsed_footer_line:
2657 # Line is a gerrit footer in the form: Footer-Key: any value.
2658 # Thus, must be appended observing Gerrit footer rules.
2659 self.set_description(
2660 git_footers.add_footer(self.description,
2661 key=parsed_footer_line[0],
2662 value=parsed_footer_line[1]))
2663 return
2664
2665 if not self._description_lines:
2666 self._description_lines.append(line)
2667 return
2668
2669 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2670 if gerrit_footers:
2671 # git_footers.split_footers ensures that there is an empty line before
2672 # actual (gerrit) footers, if any. We have to keep it that way.
2673 assert top_lines and top_lines[-1] == ''
2674 top_lines, separator = top_lines[:-1], top_lines[-1:]
2675 else:
2676 separator = [] # No need for separator if there are no gerrit_footers.
2677
2678 prev_line = top_lines[-1] if top_lines else ''
2679 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2680 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2681 top_lines.append('')
2682 top_lines.append(line)
2683 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002684
tandrii99a72f22016-08-17 14:33:24 -07002685 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002686 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002687 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002688 reviewers = [match.group(2).strip()
2689 for match in matches
2690 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002691 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002692
bradnelsond975b302016-10-23 12:20:23 -07002693 def get_cced(self):
2694 """Retrieves the list of reviewers."""
2695 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2696 cced = [match.group(2).strip() for match in matches if match]
2697 return cleanup_list(cced)
2698
Nodir Turakulov23b82142017-11-16 11:04:25 -08002699 def get_hash_tags(self):
2700 """Extracts and sanitizes a list of Gerrit hashtags."""
2701 subject = (self._description_lines or ('',))[0]
2702 subject = re.sub(
2703 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2704
2705 tags = []
2706 start = 0
2707 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2708 while True:
2709 m = bracket_exp.match(subject, start)
2710 if not m:
2711 break
2712 tags.append(self.sanitize_hash_tag(m.group(1)))
2713 start = m.end()
2714
2715 if not tags:
2716 # Try "Tag: " prefix.
2717 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2718 if m:
2719 tags.append(self.sanitize_hash_tag(m.group(1)))
2720 return tags
2721
2722 @classmethod
2723 def sanitize_hash_tag(cls, tag):
2724 """Returns a sanitized Gerrit hash tag.
2725
2726 A sanitized hashtag can be used as a git push refspec parameter value.
2727 """
2728 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2729
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002730
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002731def FindCodereviewSettingsFile(filename='codereview.settings'):
2732 """Finds the given file starting in the cwd and going up.
2733
2734 Only looks up to the top of the repository unless an
2735 'inherit-review-settings-ok' file exists in the root of the repository.
2736 """
2737 inherit_ok_file = 'inherit-review-settings-ok'
2738 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002739 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002740 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2741 root = '/'
2742 while True:
2743 if filename in os.listdir(cwd):
2744 if os.path.isfile(os.path.join(cwd, filename)):
2745 return open(os.path.join(cwd, filename))
2746 if cwd == root:
2747 break
2748 cwd = os.path.dirname(cwd)
2749
2750
2751def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002752 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002753 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002754
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002755 def SetProperty(name, setting, unset_error_ok=False):
2756 fullname = 'rietveld.' + name
2757 if setting in keyvals:
2758 RunGit(['config', fullname, keyvals[setting]])
2759 else:
2760 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2761
tandrii48df5812016-10-17 03:55:37 -07002762 if not keyvals.get('GERRIT_HOST', False):
2763 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002764 # Only server setting is required. Other settings can be absent.
2765 # In that case, we ignore errors raised during option deletion attempt.
2766 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2767 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2768 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002769 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002770 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2771 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002772 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2773 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002774 SetProperty(
2775 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002776
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002777 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002778 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002779
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002780 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002781 RunGit(['config', 'gerrit.squash-uploads',
2782 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002783
tandrii@chromium.org28253532016-04-14 13:46:56 +00002784 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002785 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002786 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002788 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002789 # should be of the form
2790 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2791 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002792 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2793 keyvals['ORIGIN_URL_CONFIG']])
2794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002795
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002796def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002797 """Downloads a network object to a local file, like urllib.urlretrieve.
2798
2799 This is necessary because urllib is broken for SSL connections via a proxy.
2800 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002801 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002802 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002803
2804
ukai@chromium.org712d6102013-11-27 00:52:58 +00002805def hasSheBang(fname):
2806 """Checks fname is a #! script."""
2807 with open(fname) as f:
2808 return f.read(2).startswith('#!')
2809
2810
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002811def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002812 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002813
2814 Args:
2815 force: True to update hooks. False to install hooks if not present.
2816 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002817 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002818 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2819 if not os.access(dst, os.X_OK):
2820 if os.path.exists(dst):
2821 if not force:
2822 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002823 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002824 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002825 if not hasSheBang(dst):
2826 DieWithError('Not a script: %s\n'
2827 'You need to download from\n%s\n'
2828 'into .git/hooks/commit-msg and '
2829 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002830 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2831 except Exception:
2832 if os.path.exists(dst):
2833 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002834 DieWithError('\nFailed to download hooks.\n'
2835 'You need to download from\n%s\n'
2836 'into .git/hooks/commit-msg and '
2837 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002838
2839
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002840class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002841 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002842
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002843 _GOOGLESOURCE = 'googlesource.com'
2844
2845 def __init__(self):
2846 # Cached list of [host, identity, source], where source is either
2847 # .gitcookies or .netrc.
2848 self._all_hosts = None
2849
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002850 def ensure_configured_gitcookies(self):
2851 """Runs checks and suggests fixes to make git use .gitcookies from default
2852 path."""
2853 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2854 configured_path = RunGitSilent(
2855 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002856 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002857 if configured_path:
2858 self._ensure_default_gitcookies_path(configured_path, default)
2859 else:
2860 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002861
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002862 @staticmethod
2863 def _ensure_default_gitcookies_path(configured_path, default_path):
2864 assert configured_path
2865 if configured_path == default_path:
2866 print('git is already configured to use your .gitcookies from %s' %
2867 configured_path)
2868 return
2869
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002870 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002871 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2872 (configured_path, default_path))
2873
2874 if not os.path.exists(configured_path):
2875 print('However, your configured .gitcookies file is missing.')
2876 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2877 action='reconfigure')
2878 RunGit(['config', '--global', 'http.cookiefile', default_path])
2879 return
2880
2881 if os.path.exists(default_path):
2882 print('WARNING: default .gitcookies file already exists %s' %
2883 default_path)
2884 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2885 default_path)
2886
2887 confirm_or_exit('Move existing .gitcookies to default location?',
2888 action='move')
2889 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002890 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002891 print('Moved and reconfigured git to use .gitcookies from %s' %
2892 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002893
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002894 @staticmethod
2895 def _configure_gitcookies_path(default_path):
2896 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2897 if os.path.exists(netrc_path):
2898 print('You seem to be using outdated .netrc for git credentials: %s' %
2899 netrc_path)
2900 print('This tool will guide you through setting up recommended '
2901 '.gitcookies store for git credentials.\n'
2902 '\n'
2903 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2904 ' git config --global --unset http.cookiefile\n'
2905 ' mv %s %s.backup\n\n' % (default_path, default_path))
2906 confirm_or_exit(action='setup .gitcookies')
2907 RunGit(['config', '--global', 'http.cookiefile', default_path])
2908 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002909
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002910 def get_hosts_with_creds(self, include_netrc=False):
2911 if self._all_hosts is None:
2912 a = gerrit_util.CookiesAuthenticator()
2913 self._all_hosts = [
2914 (h, u, s)
2915 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002916 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2917 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002918 )
2919 if h.endswith(self._GOOGLESOURCE)
2920 ]
2921
2922 if include_netrc:
2923 return self._all_hosts
2924 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2925
2926 def print_current_creds(self, include_netrc=False):
2927 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2928 if not hosts:
2929 print('No Git/Gerrit credentials found')
2930 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002931 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002932 header = [('Host', 'User', 'Which file'),
2933 ['=' * l for l in lengths]]
2934 for row in (header + hosts):
2935 print('\t'.join((('%%+%ds' % l) % s)
2936 for l, s in zip(lengths, row)))
2937
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002938 @staticmethod
2939 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002940 """Parses identity "git-<username>.domain" into <username> and domain."""
2941 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002942 # distinguishable from sub-domains. But we do know typical domains:
2943 if identity.endswith('.chromium.org'):
2944 domain = 'chromium.org'
2945 username = identity[:-len('.chromium.org')]
2946 else:
2947 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002948 if username.startswith('git-'):
2949 username = username[len('git-'):]
2950 return username, domain
2951
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002952 def _canonical_git_googlesource_host(self, host):
2953 """Normalizes Gerrit hosts (with '-review') to Git host."""
2954 assert host.endswith(self._GOOGLESOURCE)
2955 # Prefix doesn't include '.' at the end.
2956 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2957 if prefix.endswith('-review'):
2958 prefix = prefix[:-len('-review')]
2959 return prefix + '.' + self._GOOGLESOURCE
2960
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002961 def _canonical_gerrit_googlesource_host(self, host):
2962 git_host = self._canonical_git_googlesource_host(host)
2963 prefix = git_host.split('.', 1)[0]
2964 return prefix + '-review.' + self._GOOGLESOURCE
2965
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002966 def _get_counterpart_host(self, host):
2967 assert host.endswith(self._GOOGLESOURCE)
2968 git = self._canonical_git_googlesource_host(host)
2969 gerrit = self._canonical_gerrit_googlesource_host(git)
2970 return git if gerrit == host else gerrit
2971
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002972 def has_generic_host(self):
2973 """Returns whether generic .googlesource.com has been configured.
2974
2975 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2976 """
2977 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2978 if host == '.' + self._GOOGLESOURCE:
2979 return True
2980 return False
2981
2982 def _get_git_gerrit_identity_pairs(self):
2983 """Returns map from canonic host to pair of identities (Git, Gerrit).
2984
2985 One of identities might be None, meaning not configured.
2986 """
2987 host_to_identity_pairs = {}
2988 for host, identity, _ in self.get_hosts_with_creds():
2989 canonical = self._canonical_git_googlesource_host(host)
2990 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2991 idx = 0 if canonical == host else 1
2992 pair[idx] = identity
2993 return host_to_identity_pairs
2994
2995 def get_partially_configured_hosts(self):
2996 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002997 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002998 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002999 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003000
3001 def get_conflicting_hosts(self):
3002 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003003 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003004 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003005 if None not in (i1, i2) and i1 != i2)
3006
3007 def get_duplicated_hosts(self):
3008 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003009 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003010
3011 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3012 'chromium.googlesource.com': 'chromium.org',
3013 'chrome-internal.googlesource.com': 'google.com',
3014 }
3015
3016 def get_hosts_with_wrong_identities(self):
3017 """Finds hosts which **likely** reference wrong identities.
3018
3019 Note: skips hosts which have conflicting identities for Git and Gerrit.
3020 """
3021 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003022 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003023 pair = self._get_git_gerrit_identity_pairs().get(host)
3024 if pair and pair[0] == pair[1]:
3025 _, domain = self._parse_identity(pair[0])
3026 if domain != expected:
3027 hosts.add(host)
3028 return hosts
3029
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003030 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003031 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003032 hosts = sorted(hosts)
3033 assert hosts
3034 if extra_column_func is None:
3035 extras = [''] * len(hosts)
3036 else:
3037 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003038 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3039 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003040 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003041 lines.append(tmpl % he)
3042 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003043
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003044 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003045 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003046 yield ('.googlesource.com wildcard record detected',
3047 ['Chrome Infrastructure team recommends to list full host names '
3048 'explicitly.'],
3049 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003050
3051 dups = self.get_duplicated_hosts()
3052 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003053 yield ('The following hosts were defined twice',
3054 self._format_hosts(dups),
3055 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003056
3057 partial = self.get_partially_configured_hosts()
3058 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003059 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3060 'These hosts are missing',
3061 self._format_hosts(partial, lambda host: 'but %s defined' %
3062 self._get_counterpart_host(host)),
3063 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003064
3065 conflicting = self.get_conflicting_hosts()
3066 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003067 yield ('The following Git hosts have differing credentials from their '
3068 'Gerrit counterparts',
3069 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3070 tuple(self._get_git_gerrit_identity_pairs()[host])),
3071 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003072
3073 wrong = self.get_hosts_with_wrong_identities()
3074 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003075 yield ('These hosts likely use wrong identity',
3076 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3077 (self._get_git_gerrit_identity_pairs()[host][0],
3078 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3079 wrong)
3080
3081 def find_and_report_problems(self):
3082 """Returns True if there was at least one problem, else False."""
3083 found = False
3084 bad_hosts = set()
3085 for title, sublines, hosts in self._find_problems():
3086 if not found:
3087 found = True
3088 print('\n\n.gitcookies problem report:\n')
3089 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003090 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003091 if sublines:
3092 print()
3093 print(' %s' % '\n '.join(sublines))
3094 print()
3095
3096 if bad_hosts:
3097 assert found
3098 print(' You can manually remove corresponding lines in your %s file and '
3099 'visit the following URLs with correct account to generate '
3100 'correct credential lines:\n' %
3101 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3102 print(' %s' % '\n '.join(sorted(set(
3103 gerrit_util.CookiesAuthenticator().get_new_password_url(
3104 self._canonical_git_googlesource_host(host))
3105 for host in bad_hosts
3106 ))))
3107 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003108
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003109
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003110@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003111def CMDcreds_check(parser, args):
3112 """Checks credentials and suggests changes."""
3113 _, _ = parser.parse_args(args)
3114
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003115 # Code below checks .gitcookies. Abort if using something else.
3116 authn = gerrit_util.Authenticator.get()
3117 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003118 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003119 'This command is not designed for bot environment. It checks '
3120 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003121 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3122 if isinstance(authn, gerrit_util.GceAuthenticator):
3123 message += (
3124 '\n'
3125 'If you need to run this on GCE or a cloudtop instance, '
3126 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3127 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003128
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003129 checker = _GitCookiesChecker()
3130 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003131
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003132 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003133 checker.print_current_creds(include_netrc=True)
3134
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003135 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003136 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003137 return 0
3138 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003139
3140
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003141@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003142def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003143 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003144 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003145 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003146 _, args = parser.parse_args(args)
3147 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003148 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003149 return RunGit(['config', 'branch.%s.base-url' % branch],
3150 error_ok=False).strip()
3151 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003152 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003153 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3154 error_ok=False).strip()
3155
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003156
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003157def color_for_status(status):
3158 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003159 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003160 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003161 'unsent': BOLD + Fore.YELLOW,
3162 'waiting': BOLD + Fore.RED,
3163 'reply': BOLD + Fore.YELLOW,
3164 'not lgtm': BOLD + Fore.RED,
3165 'lgtm': BOLD + Fore.GREEN,
3166 'commit': BOLD + Fore.MAGENTA,
3167 'closed': BOLD + Fore.CYAN,
3168 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003169 }.get(status, Fore.WHITE)
3170
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003171
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003172def get_cl_statuses(changes, fine_grained, max_processes=None):
3173 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003174
3175 If fine_grained is true, this will fetch CL statuses from the server.
3176 Otherwise, simply indicate if there's a matching url for the given branches.
3177
3178 If max_processes is specified, it is used as the maximum number of processes
3179 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3180 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003181
3182 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003183 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003184 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003185 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003186
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003187 if not fine_grained:
3188 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003189 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003190 for cl in changes:
3191 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003192 return
3193
3194 # First, sort out authentication issues.
3195 logging.debug('ensuring credentials exist')
3196 for cl in changes:
3197 cl.EnsureAuthenticated(force=False, refresh=True)
3198
3199 def fetch(cl):
3200 try:
3201 return (cl, cl.GetStatus())
3202 except:
3203 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003204 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003205 raise
3206
3207 threads_count = len(changes)
3208 if max_processes:
3209 threads_count = max(1, min(threads_count, max_processes))
3210 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3211
Edward Lemur61bf4172020-02-24 23:22:37 +00003212 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003213 fetched_cls = set()
3214 try:
3215 it = pool.imap_unordered(fetch, changes).__iter__()
3216 while True:
3217 try:
3218 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003219 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003220 break
3221 fetched_cls.add(cl)
3222 yield cl, status
3223 finally:
3224 pool.close()
3225
3226 # Add any branches that failed to fetch.
3227 for cl in set(changes) - fetched_cls:
3228 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003229
rmistry@google.com2dd99862015-06-22 12:22:18 +00003230
Jose Lopes3863fc52020-04-07 17:00:25 +00003231def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003232 """Uploads CLs of local branches that are dependents of the current branch.
3233
3234 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003235
3236 test1 -> test2.1 -> test3.1
3237 -> test3.2
3238 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003239
3240 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3241 run on the dependent branches in this order:
3242 test2.1, test3.1, test3.2, test2.2, test3.3
3243
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003244 Note: This function does not rebase your local dependent branches. Use it
3245 when you make a change to the parent branch that will not conflict
3246 with its dependent branches, and you would like their dependencies
3247 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003248 """
3249 if git_common.is_dirty_git_tree('upload-branch-deps'):
3250 return 1
3251
3252 root_branch = cl.GetBranch()
3253 if root_branch is None:
3254 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3255 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003256 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003257 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3258 'patchset dependencies without an uploaded CL.')
3259
3260 branches = RunGit(['for-each-ref',
3261 '--format=%(refname:short) %(upstream:short)',
3262 'refs/heads'])
3263 if not branches:
3264 print('No local branches found.')
3265 return 0
3266
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003267 # Create a dictionary of all local branches to the branches that are
3268 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003269 tracked_to_dependents = collections.defaultdict(list)
3270 for b in branches.splitlines():
3271 tokens = b.split()
3272 if len(tokens) == 2:
3273 branch_name, tracked = tokens
3274 tracked_to_dependents[tracked].append(branch_name)
3275
vapiera7fbd5a2016-06-16 09:17:49 -07003276 print()
3277 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003278 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003279
rmistry@google.com2dd99862015-06-22 12:22:18 +00003280 def traverse_dependents_preorder(branch, padding=''):
3281 dependents_to_process = tracked_to_dependents.get(branch, [])
3282 padding += ' '
3283 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003284 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003285 dependents.append(dependent)
3286 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003287
rmistry@google.com2dd99862015-06-22 12:22:18 +00003288 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003289 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003290
3291 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003292 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003293 return 0
3294
Jose Lopes3863fc52020-04-07 17:00:25 +00003295 if not force:
3296 confirm_or_exit('This command will checkout all dependent branches and run '
3297 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003298
rmistry@google.com2dd99862015-06-22 12:22:18 +00003299 # Record all dependents that failed to upload.
3300 failures = {}
3301 # Go through all dependents, checkout the branch and upload.
3302 try:
3303 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003304 print()
3305 print('--------------------------------------')
3306 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003307 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003308 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003309 try:
3310 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003311 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003312 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003313 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003314 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003315 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003316 finally:
3317 # Swap back to the original root branch.
3318 RunGit(['checkout', '-q', root_branch])
3319
vapiera7fbd5a2016-06-16 09:17:49 -07003320 print()
3321 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003322 for dependent_branch in dependents:
3323 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003324 print(' %s : %s' % (dependent_branch, upload_status))
3325 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003326
3327 return 0
3328
3329
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003330def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003331 """Given a proposed tag name, returns a tag name that is guaranteed to be
3332 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3333 or 'foo-3', and so on."""
3334
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003335 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003336 for suffix_num in itertools.count(1):
3337 if suffix_num == 1:
3338 to_check = proposed_tag
3339 else:
3340 to_check = '%s-%d' % (proposed_tag, suffix_num)
3341
3342 if to_check not in existing_tags:
3343 return to_check
3344
3345
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003346@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003347def CMDarchive(parser, args):
3348 """Archives and deletes branches associated with closed changelists."""
3349 parser.add_option(
3350 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003351 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003352 parser.add_option(
3353 '-f', '--force', action='store_true',
3354 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003355 parser.add_option(
3356 '-d', '--dry-run', action='store_true',
3357 help='Skip the branch tagging and removal steps.')
3358 parser.add_option(
3359 '-t', '--notags', action='store_true',
3360 help='Do not tag archived branches. '
3361 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003362 parser.add_option(
3363 '-p',
3364 '--pattern',
3365 default='git-cl-archived-{issue}-{branch}',
3366 help='Format string for archive tags. '
3367 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003368
kmarshall3bff56b2016-06-06 18:31:47 -07003369 options, args = parser.parse_args(args)
3370 if args:
3371 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003372
3373 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3374 if not branches:
3375 return 0
3376
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003377 tags = RunGit(['for-each-ref', '--format=%(refname)',
3378 'refs/tags']).splitlines() or []
3379 tags = [t.split('/')[-1] for t in tags]
3380
vapiera7fbd5a2016-06-16 09:17:49 -07003381 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003382 changes = [Changelist(branchref=b)
3383 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003384 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3385 statuses = get_cl_statuses(changes,
3386 fine_grained=True,
3387 max_processes=options.maxjobs)
3388 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003389 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3390 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003391 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003392 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003393 proposal.sort()
3394
3395 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003396 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003397 return 0
3398
Edward Lemur85153282020-02-14 22:06:29 +00003399 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003400
vapiera7fbd5a2016-06-16 09:17:49 -07003401 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003402 if options.notags:
3403 for next_item in proposal:
3404 print(' ' + next_item[0])
3405 else:
3406 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3407 for next_item in proposal:
3408 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003409
kmarshall9249e012016-08-23 12:02:16 -07003410 # Quit now on precondition failure or if instructed by the user, either
3411 # via an interactive prompt or by command line flags.
3412 if options.dry_run:
3413 print('\nNo changes were made (dry run).\n')
3414 return 0
3415 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003416 print('You are currently on a branch \'%s\' which is associated with a '
3417 'closed codereview issue, so archive cannot proceed. Please '
3418 'checkout another branch and run this command again.' %
3419 current_branch)
3420 return 1
kmarshall9249e012016-08-23 12:02:16 -07003421 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003422 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003423 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003424 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003425 return 1
3426
3427 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003428 if not options.notags:
3429 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003430
3431 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3432 # Clean up the tag if we failed to delete the branch.
3433 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003434
vapiera7fbd5a2016-06-16 09:17:49 -07003435 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003436
3437 return 0
3438
3439
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003440@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003441def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003442 """Show status of changelists.
3443
3444 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003445 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003446 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003447 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003448 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003449 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003450 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003451 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003452
3453 Also see 'git cl comments'.
3454 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003455 parser.add_option(
3456 '--no-branch-color',
3457 action='store_true',
3458 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003459 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003460 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003461 parser.add_option('-f', '--fast', action='store_true',
3462 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003463 parser.add_option(
3464 '-j', '--maxjobs', action='store', type=int,
3465 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003466 parser.add_option(
3467 '-i', '--issue', type=int,
3468 help='Operate on this issue instead of the current branch\'s implicit '
3469 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003470 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003471 if args:
3472 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003473
iannuccie53c9352016-08-17 14:40:40 -07003474 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003475 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003476
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003477 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003478 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003479 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003480 if cl.GetIssue():
3481 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003482 elif options.field == 'id':
3483 issueid = cl.GetIssue()
3484 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003485 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003486 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003487 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003488 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003489 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003490 elif options.field == 'status':
3491 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003492 elif options.field == 'url':
3493 url = cl.GetIssueURL()
3494 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003495 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003496 return 0
3497
3498 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3499 if not branches:
3500 print('No local branch found.')
3501 return 0
3502
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003503 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003504 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003505 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003506 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003507 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003508 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003509 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003510
Edward Lemur85153282020-02-14 22:06:29 +00003511 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003512
3513 def FormatBranchName(branch, colorize=False):
3514 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3515 an asterisk when it is the current branch."""
3516
3517 asterisk = ""
3518 color = Fore.RESET
3519 if branch == current_branch:
3520 asterisk = "* "
3521 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003522 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003523
3524 if colorize:
3525 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003526 return asterisk + branch_name
3527
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003528 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003529
3530 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003531 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3532 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003533 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003534 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003535 branch_statuses[c.GetBranch()] = status
3536 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003537 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003538 if url and (not status or status == 'error'):
3539 # The issue probably doesn't exist anymore.
3540 url += ' (broken)'
3541
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003542 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003543 # Turn off bold as well as colors.
3544 END = '\033[0m'
3545 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003546 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003547 color = ''
3548 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003549 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003550
Alan Cuttera3be9a52019-03-04 18:50:33 +00003551 branch_display = FormatBranchName(branch)
3552 padding = ' ' * (alignment - len(branch_display))
3553 if not options.no_branch_color:
3554 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003555
Alan Cuttera3be9a52019-03-04 18:50:33 +00003556 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3557 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003558
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003560 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003561 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003562 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003563 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003564 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003565 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003566 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003567 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003568 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003569 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003570 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003571 return 0
3572
3573
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003574def colorize_CMDstatus_doc():
3575 """To be called once in main() to add colors to git cl status help."""
3576 colors = [i for i in dir(Fore) if i[0].isupper()]
3577
3578 def colorize_line(line):
3579 for color in colors:
3580 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003581 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003582 indent = len(line) - len(line.lstrip(' ')) + 1
3583 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3584 return line
3585
3586 lines = CMDstatus.__doc__.splitlines()
3587 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3588
3589
phajdan.jre328cf92016-08-22 04:12:17 -07003590def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003591 if path == '-':
3592 json.dump(contents, sys.stdout)
3593 else:
3594 with open(path, 'w') as f:
3595 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003596
3597
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003598@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003599@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003601 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003602
3603 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003604 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003605 parser.add_option('-r', '--reverse', action='store_true',
3606 help='Lookup the branch(es) for the specified issues. If '
3607 'no issues are specified, all branches with mapped '
3608 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003609 parser.add_option('--json',
3610 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003611 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003612
dnj@chromium.org406c4402015-03-03 17:22:28 +00003613 if options.reverse:
3614 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003615 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003616 # Reverse issue lookup.
3617 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003618
3619 git_config = {}
3620 for config in RunGit(['config', '--get-regexp',
3621 r'branch\..*issue']).splitlines():
3622 name, _space, val = config.partition(' ')
3623 git_config[name] = val
3624
dnj@chromium.org406c4402015-03-03 17:22:28 +00003625 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003626 issue = git_config.get(
3627 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003628 if issue:
3629 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003630 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003631 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003632 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003633 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003634 try:
3635 issue_num = int(issue)
3636 except ValueError:
3637 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003638 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003639 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003640 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003641 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003642 if options.json:
3643 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003644 return 0
3645
3646 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003647 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003648 if not issue.valid:
3649 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3650 'or no argument to list it.\n'
3651 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003652 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003653 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003654 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003655 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003656 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3657 if options.json:
3658 write_json(options.json, {
3659 'issue': cl.GetIssue(),
3660 'issue_url': cl.GetIssueURL(),
3661 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003662 return 0
3663
3664
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003665@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003666def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003667 """Shows or posts review comments for any changelist."""
3668 parser.add_option('-a', '--add-comment', dest='comment',
3669 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003670 parser.add_option('-p', '--publish', action='store_true',
3671 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003672 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003673 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003674 parser.add_option('-m', '--machine-readable', dest='readable',
3675 action='store_false', default=True,
3676 help='output comments in a format compatible with '
3677 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003678 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003679 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003680 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003681
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003682 issue = None
3683 if options.issue:
3684 try:
3685 issue = int(options.issue)
3686 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003687 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003688
Edward Lemur934836a2019-09-09 20:16:54 +00003689 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003690
3691 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003692 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003693 return 0
3694
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003695 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3696 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003697 for comment in summary:
3698 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003699 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003700 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003701 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003702 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003703 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003704 elif comment.autogenerated:
3705 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003706 else:
3707 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003708 print('\n%s%s %s%s\n%s' % (
3709 color,
3710 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3711 comment.sender,
3712 Fore.RESET,
3713 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3714
smut@google.comc85ac942015-09-15 16:34:43 +00003715 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003716 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003717 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003718 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3719 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003720 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003721 return 0
3722
3723
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003724@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003725@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003726def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003727 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003728 parser.add_option('-d', '--display', action='store_true',
3729 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003730 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003731 help='New description to set for this issue (- for stdin, '
3732 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003733 parser.add_option('-f', '--force', action='store_true',
3734 help='Delete any unpublished Gerrit edits for this issue '
3735 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003736
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003737 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003738
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003739 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003740 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003741 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003742 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003743 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003744
Edward Lemur934836a2019-09-09 20:16:54 +00003745 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003746 if target_issue_arg:
3747 kwargs['issue'] = target_issue_arg.issue
3748 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003749
3750 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003751 if not cl.GetIssue():
3752 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003753
Edward Lemur678a6842019-10-03 22:25:05 +00003754 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003755 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003756
Edward Lemur6c6827c2020-02-06 21:15:18 +00003757 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003758
smut@google.com34fb6b12015-07-13 20:03:26 +00003759 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003761 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003762
3763 if options.new_description:
3764 text = options.new_description
3765 if text == '-':
3766 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003767 elif text == '+':
3768 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003769 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003770
3771 description.set_description(text)
3772 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003773 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003774 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003775 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003776 return 0
3777
3778
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003779@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003780def CMDlint(parser, args):
3781 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003782 parser.add_option('--filter', action='append', metavar='-x,+y',
3783 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003784 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003785
3786 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003787 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003788 try:
3789 import cpplint
3790 import cpplint_chromium
3791 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003792 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003793 return 1
3794
3795 # Change the current working directory before calling lint so that it
3796 # shows the correct base.
3797 previous_cwd = os.getcwd()
3798 os.chdir(settings.GetRoot())
3799 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003800 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003801 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003802 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003803 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003804 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003805
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003806 # Process cpplint arguments, if any.
3807 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3808 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003809 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003810
Lei Zhang379d1ad2020-07-15 19:40:06 +00003811 include_regex = re.compile(settings.GetLintRegex())
3812 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003813 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3814 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003815 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003816 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003817 continue
3818
3819 if ignore_regex.match(filename):
3820 print('Ignoring file %s' % filename)
3821 continue
3822
3823 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3824 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003825 finally:
3826 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003827 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003828 if cpplint._cpplint_state.error_count != 0:
3829 return 1
3830 return 0
3831
3832
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003833@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003834def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003835 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003836 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003837 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003838 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003839 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003840 parser.add_option('--all', action='store_true',
3841 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003842 parser.add_option('--parallel', action='store_true',
3843 help='Run all tests specified by input_api.RunTests in all '
3844 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003845 parser.add_option('--resultdb', action='store_true',
3846 help='Run presubmit checks in the ResultSink environment '
3847 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003848 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003849 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850
sbc@chromium.org71437c02015-04-09 19:29:40 +00003851 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003852 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003853 return 1
3854
Edward Lemur934836a2019-09-09 20:16:54 +00003855 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856 if args:
3857 base_branch = args[0]
3858 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003859 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003860 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003861
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003862 if cl.GetIssue():
3863 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003864 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003865 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003866
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003867 cl.RunHook(
3868 committing=not options.upload,
3869 may_prompt=False,
3870 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003871 parallel=options.parallel,
3872 upstream=base_branch,
3873 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003874 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003875 resultdb=options.resultdb,
3876 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003877 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003878
3879
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003880def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003881 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003882
3883 Works the same way as
3884 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3885 but can be called on demand on all platforms.
3886
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003887 The basic idea is to generate git hash of a state of the tree, original
3888 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003889 """
3890 lines = []
3891 tree_hash = RunGitSilent(['write-tree'])
3892 lines.append('tree %s' % tree_hash.strip())
3893 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3894 if code == 0:
3895 lines.append('parent %s' % parent.strip())
3896 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3897 lines.append('author %s' % author.strip())
3898 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3899 lines.append('committer %s' % committer.strip())
3900 lines.append('')
3901 # Note: Gerrit's commit-hook actually cleans message of some lines and
3902 # whitespace. This code is not doing this, but it clearly won't decrease
3903 # entropy.
3904 lines.append(message)
3905 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003906 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003907 return 'I%s' % change_hash.strip()
3908
3909
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003910def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003911 """Computes the remote branch ref to use for the CL.
3912
3913 Args:
3914 remote (str): The git remote for the CL.
3915 remote_branch (str): The git remote branch for the CL.
3916 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003917 """
3918 if not (remote and remote_branch):
3919 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003920
wittman@chromium.org455dc922015-01-26 20:15:50 +00003921 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003922 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003923 # refs, which are then translated into the remote full symbolic refs
3924 # below.
3925 if '/' not in target_branch:
3926 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3927 else:
3928 prefix_replacements = (
3929 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3930 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3931 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3932 )
3933 match = None
3934 for regex, replacement in prefix_replacements:
3935 match = re.search(regex, target_branch)
3936 if match:
3937 remote_branch = target_branch.replace(match.group(0), replacement)
3938 break
3939 if not match:
3940 # This is a branch path but not one we recognize; use as-is.
3941 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003942 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3943 # Handle the refs that need to land in different refs.
3944 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003945
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003946 # Migration to new default branch, only if available on remote.
3947 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
3948 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
3949 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
3950 stderr=subprocess2.PIPE):
3951 # TODO(crbug.com/ID): Print location to local git migration script.
3952 print("WARNING: Using new branch name %s instead of %s" % (
3953 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
3954 remote_branch = DEFAULT_NEW_BRANCH
3955
wittman@chromium.org455dc922015-01-26 20:15:50 +00003956 # Create the true path to the remote branch.
3957 # Does the following translation:
3958 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003959 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00003960 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3961 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3962 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3963 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3964 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3965 'refs/heads/')
3966 elif remote_branch.startswith('refs/remotes/branch-heads'):
3967 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003968
wittman@chromium.org455dc922015-01-26 20:15:50 +00003969 return remote_branch
3970
3971
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003972def cleanup_list(l):
3973 """Fixes a list so that comma separated items are put as individual items.
3974
3975 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3976 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3977 """
3978 items = sum((i.split(',') for i in l), [])
3979 stripped_items = (i.strip() for i in items)
3980 return sorted(filter(None, stripped_items))
3981
3982
Aaron Gable4db38df2017-11-03 14:59:07 -07003983@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003984@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003985def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003986 """Uploads the current changelist to codereview.
3987
3988 Can skip dependency patchset uploads for a branch by running:
3989 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003990 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003991 git config --unset branch.branch_name.skip-deps-uploads
3992 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003993
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003994 If the name of the checked out branch starts with "bug-" or "fix-" followed
3995 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003996 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003997
3998 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003999 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004000 [git-cl] add support for hashtags
4001 Foo bar: implement foo
4002 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004003 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004004 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4005 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004006 parser.add_option('--bypass-watchlists', action='store_true',
4007 dest='bypass_watchlists',
4008 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004009 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004010 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004011 parser.add_option('--message', '-m', dest='message',
4012 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004013 parser.add_option('-b', '--bug',
4014 help='pre-populate the bug number(s) for this issue. '
4015 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004016 parser.add_option('--message-file', dest='message_file',
4017 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004018 parser.add_option('--title', '-t', dest='title',
4019 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004020 parser.add_option('-T', '--skip-title', action='store_true',
4021 dest='skip_title',
4022 help='Use the most recent commit message as the title of '
4023 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004024 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004025 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004026 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004027 parser.add_option('--tbrs',
4028 action='append', default=[],
4029 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004030 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004031 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004032 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004033 parser.add_option('--hashtag', dest='hashtags',
4034 action='append', default=[],
4035 help=('Gerrit hashtag for new CL; '
4036 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004037 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004038 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004039 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004040 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004041 metavar='TARGET',
4042 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004043 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004044 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004045 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004046 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004047 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004048 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004049 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004050 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4051 const='TBR', help='add a set of OWNERS to TBR')
4052 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4053 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004054 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004055 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004056 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004057 'implies --send-mail')
4058 parser.add_option('-d', '--cq-dry-run',
4059 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004060 help='Send the patchset to do a CQ dry run right after '
4061 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004062 parser.add_option('--preserve-tryjobs', action='store_true',
4063 help='instruct the CQ to let tryjobs running even after '
4064 'new patchsets are uploaded instead of canceling '
4065 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004066 parser.add_option('--dependencies', action='store_true',
4067 help='Uploads CLs of all the local branches that depend on '
4068 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004069 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4070 help='Sends your change to the CQ after an approval. Only '
4071 'works on repos that have the Auto-Submit label '
4072 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004073 parser.add_option('--parallel', action='store_true',
4074 help='Run all tests specified by input_api.RunTests in all '
4075 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004076 parser.add_option('--no-autocc', action='store_true',
4077 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004078 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004079 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004080 parser.add_option('-R', '--retry-failed', action='store_true',
4081 help='Retry failed tryjobs from old patchset immediately '
4082 'after uploading new patchset. Cannot be used with '
4083 '--use-commit-queue or --cq-dry-run.')
4084 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4085 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004086 parser.add_option('--fixed', '-x',
4087 help='List of bugs that will be commented on and marked '
4088 'fixed (pre-populates "Fixed:" tag). Same format as '
4089 '-b option / "Bug:" tag. If fixing several issues, '
4090 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004091 parser.add_option('--edit-description', action='store_true', default=False,
4092 help='Modify description before upload. Cannot be used '
4093 'with --force. It is a noop when --no-squash is set '
4094 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004095 parser.add_option('--git-completion-helper', action="store_true",
4096 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004097 parser.add_option('--resultdb', action='store_true',
4098 help='Run presubmit checks in the ResultSink environment '
4099 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004100 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004101
rmistry@google.com2dd99862015-06-22 12:22:18 +00004102 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004103 (options, args) = parser.parse_args(args)
4104
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004105 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004106 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4107 if opt.help != optparse.SUPPRESS_HELP))
4108 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004109
sbc@chromium.org71437c02015-04-09 19:29:40 +00004110 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004111 return 1
4112
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004113 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004114 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004115 options.cc = cleanup_list(options.cc)
4116
Josipe827b0f2020-01-30 00:07:20 +00004117 if options.edit_description and options.force:
4118 parser.error('Only one of --force and --edit-description allowed')
4119
tandriib80458a2016-06-23 12:20:07 -07004120 if options.message_file:
4121 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004122 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004123 options.message = gclient_utils.FileRead(options.message_file)
4124 options.message_file = None
4125
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004126 if ([options.cq_dry_run,
4127 options.use_commit_queue,
4128 options.retry_failed].count(True) > 1):
4129 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4130 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004131
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004132 if options.skip_title and options.title:
4133 parser.error('Only one of --title and --skip-title allowed.')
4134
Aaron Gableedbc4132017-09-11 13:22:28 -07004135 if options.use_commit_queue:
4136 options.send_mail = True
4137
Edward Lesmes0dd54822020-03-26 18:24:25 +00004138 if options.squash is None:
4139 # Load default for user, repo, squash=true, in this order.
4140 options.squash = settings.GetSquashGerritUploads()
4141
Edward Lemur934836a2019-09-09 20:16:54 +00004142 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004143 # Warm change details cache now to avoid RPCs later, reducing latency for
4144 # developers.
4145 if cl.GetIssue():
4146 cl._GetChangeDetail(
4147 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4148
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004149 if options.retry_failed and not cl.GetIssue():
4150 print('No previous patchsets, so --retry-failed has no effect.')
4151 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004152
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004153 # cl.GetMostRecentPatchset uses cached information, and can return the last
4154 # patchset before upload. Calling it here makes it clear that it's the
4155 # last patchset before upload. Note that GetMostRecentPatchset will fail
4156 # if no CL has been uploaded yet.
4157 if options.retry_failed:
4158 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004159
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004160 ret = cl.CMDUpload(options, args, orig_args)
4161
4162 if options.retry_failed:
4163 if ret != 0:
4164 print('Upload failed, so --retry-failed has no effect.')
4165 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004166 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004167 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004168 jobs = _filter_failed_for_retry(builds)
4169 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004170 print('No failed tryjobs, so --retry-failed has no effect.')
4171 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004172 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004173
4174 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004175
4176
Francois Dorayd42c6812017-05-30 15:10:20 -04004177@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004178@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004179def CMDsplit(parser, args):
4180 """Splits a branch into smaller branches and uploads CLs.
4181
4182 Creates a branch and uploads a CL for each group of files modified in the
4183 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004184 comment, the string '$directory', is replaced with the directory containing
4185 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004186 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004187 parser.add_option('-d', '--description', dest='description_file',
4188 help='A text file containing a CL description in which '
4189 '$directory will be replaced by each CL\'s directory.')
4190 parser.add_option('-c', '--comment', dest='comment_file',
4191 help='A text file containing a CL comment.')
4192 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004193 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004194 help='List the files and reviewers for each CL that would '
4195 'be created, but don\'t create branches or CLs.')
4196 parser.add_option('--cq-dry-run', action='store_true',
4197 help='If set, will do a cq dry run for each uploaded CL. '
4198 'Please be careful when doing this; more than ~10 CLs '
4199 'has the potential to overload our build '
4200 'infrastructure. Try to upload these not during high '
4201 'load times (usually 11-3 Mountain View time). Email '
4202 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004203 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4204 default=True,
4205 help='Sends your change to the CQ after an approval. Only '
4206 'works on repos that have the Auto-Submit label '
4207 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004208 options, _ = parser.parse_args(args)
4209
4210 if not options.description_file:
4211 parser.error('No --description flag specified.')
4212
4213 def WrappedCMDupload(args):
4214 return CMDupload(OptionParser(), args)
4215
Edward Lemur2c62b332020-03-12 22:12:33 +00004216 return split_cl.SplitCl(
4217 options.description_file, options.comment_file, Changelist,
4218 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4219 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004220
4221
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004222@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004223@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004224def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004225 """DEPRECATED: Used to commit the current changelist via git-svn."""
4226 message = ('git-cl no longer supports committing to SVN repositories via '
4227 'git-svn. You probably want to use `git cl land` instead.')
4228 print(message)
4229 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004230
4231
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004232@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004233@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004234def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004235 """Commits the current changelist via git.
4236
4237 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4238 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004239 """
4240 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4241 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004242 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004243 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004244 parser.add_option('--parallel', action='store_true',
4245 help='Run all tests specified by input_api.RunTests in all '
4246 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004247 parser.add_option('--resultdb', action='store_true',
4248 help='Run presubmit checks in the ResultSink environment '
4249 'and send results to the ResultDB database.')
4250 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004251 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004252
Edward Lemur934836a2019-09-09 20:16:54 +00004253 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004254
Robert Iannucci2e73d432018-03-14 01:10:47 -07004255 if not cl.GetIssue():
4256 DieWithError('You must upload the change first to Gerrit.\n'
4257 ' If you would rather have `git cl land` upload '
4258 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004259 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4260 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261
4262
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004263@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004264@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004265def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004266 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004267 parser.add_option('-b', dest='newbranch',
4268 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004269 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004270 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004271 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004272 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004273
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004274 group = optparse.OptionGroup(
4275 parser,
4276 'Options for continuing work on the current issue uploaded from a '
4277 'different clone (e.g. different machine). Must be used independently '
4278 'from the other options. No issue number should be specified, and the '
4279 'branch must have an issue number associated with it')
4280 group.add_option('--reapply', action='store_true', dest='reapply',
4281 help='Reset the branch and reapply the issue.\n'
4282 'CAUTION: This will undo any local changes in this '
4283 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004284
4285 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004286 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004287 parser.add_option_group(group)
4288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004289 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004290
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004291 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004292 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004293 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004294 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004295 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004296
Edward Lemur934836a2019-09-09 20:16:54 +00004297 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004298 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004299 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004300
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004301 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004302 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004303 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004304
4305 RunGit(['reset', '--hard', upstream])
4306 if options.pull:
4307 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004308
Edward Lemur678a6842019-10-03 22:25:05 +00004309 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4310 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004311
4312 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004313 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004314
Edward Lemurf38bc172019-09-03 21:02:13 +00004315 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004316 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004317 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004318
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004319 # We don't want uncommitted changes mixed up with the patch.
4320 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004321 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004322
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004323 if options.newbranch:
4324 if options.force:
4325 RunGit(['branch', '-D', options.newbranch],
4326 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004327 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004328
Edward Lemur678a6842019-10-03 22:25:05 +00004329 cl = Changelist(
4330 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004331
Edward Lemur678a6842019-10-03 22:25:05 +00004332 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004333 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004334
Edward Lemurf38bc172019-09-03 21:02:13 +00004335 return cl.CMDPatchWithParsedIssue(
4336 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004337
4338
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004339def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004340 """Fetches the tree status and returns either 'open', 'closed',
4341 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004342 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004343 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004344 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004345 if status.find('closed') != -1 or status == '0':
4346 return 'closed'
4347 elif status.find('open') != -1 or status == '1':
4348 return 'open'
4349 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004350 return 'unset'
4351
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004352
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004353def GetTreeStatusReason():
4354 """Fetches the tree status from a json url and returns the message
4355 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004356 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004357 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004358 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004359 status = json.loads(connection.read())
4360 connection.close()
4361 return status['message']
4362
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004363
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004364@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004365def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004366 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004367 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004368 status = GetTreeStatus()
4369 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004370 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004371 return 2
4372
vapiera7fbd5a2016-06-16 09:17:49 -07004373 print('The tree is %s' % status)
4374 print()
4375 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004376 if status != 'open':
4377 return 1
4378 return 0
4379
4380
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004381@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004382def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004383 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4384 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004385 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004386 '-b', '--bot', action='append',
4387 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4388 'times to specify multiple builders. ex: '
4389 '"-b win_rel -b win_layout". See '
4390 'the try server waterfall for the builders name and the tests '
4391 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004392 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004393 '-B', '--bucket', default='',
4394 help=('Buildbucket bucket to send the try requests.'))
4395 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004396 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004397 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004398 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004399 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004400 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004401 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004402 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004403 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004404 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004405 '--category', default='git_cl_try', help='Specify custom build category.')
4406 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004407 '--project',
4408 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004409 'in recipe to determine to which repository or directory to '
4410 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004411 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004412 '-p', '--property', dest='properties', action='append', default=[],
4413 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004414 'key2=value2 etc. The value will be treated as '
4415 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004416 'NOTE: using this may make your tryjob not usable for CQ, '
4417 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004418 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004419 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4420 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004421 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004422 parser.add_option(
4423 '-R', '--retry-failed', action='store_true', default=False,
4424 help='Retry failed jobs from the latest set of tryjobs. '
4425 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004426 parser.add_option(
4427 '-i', '--issue', type=int,
4428 help='Operate on this issue instead of the current branch\'s implicit '
4429 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004430 options, args = parser.parse_args(args)
4431
machenbach@chromium.org45453142015-09-15 08:45:22 +00004432 # Make sure that all properties are prop=value pairs.
4433 bad_params = [x for x in options.properties if '=' not in x]
4434 if bad_params:
4435 parser.error('Got properties with missing "=": %s' % bad_params)
4436
maruel@chromium.org15192402012-09-06 12:38:29 +00004437 if args:
4438 parser.error('Unknown arguments: %s' % args)
4439
Edward Lemur934836a2019-09-09 20:16:54 +00004440 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004441 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004442 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004443
Edward Lemurf38bc172019-09-03 21:02:13 +00004444 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004445 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004446
tandriie113dfd2016-10-11 10:20:12 -07004447 error_message = cl.CannotTriggerTryJobReason()
4448 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004449 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004450
Edward Lemur45768512020-03-02 19:03:14 +00004451 if options.bot:
4452 if options.retry_failed:
4453 parser.error('--bot is not compatible with --retry-failed.')
4454 if not options.bucket:
4455 parser.error('A bucket (e.g. "chromium/try") is required.')
4456
4457 triggered = [b for b in options.bot if 'triggered' in b]
4458 if triggered:
4459 parser.error(
4460 'Cannot schedule builds on triggered bots: %s.\n'
4461 'This type of bot requires an initial job from a parent (usually a '
4462 'builder). Schedule a job on the parent instead.\n' % triggered)
4463
4464 if options.bucket.startswith('.master'):
4465 parser.error('Buildbot masters are not supported.')
4466
4467 project, bucket = _parse_bucket(options.bucket)
4468 if project is None or bucket is None:
4469 parser.error('Invalid bucket: %s.' % options.bucket)
4470 jobs = sorted((project, bucket, bot) for bot in options.bot)
4471 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004472 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004473 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004474 if options.verbose:
4475 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004476 jobs = _filter_failed_for_retry(builds)
4477 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004478 print('There are no failed jobs in the latest set of jobs '
4479 '(patchset #%d), doing nothing.' % patchset)
4480 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004481 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004482 if num_builders > 10:
4483 confirm_or_exit('There are %d builders with failed builds.'
4484 % num_builders, action='continue')
4485 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004486 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004487 print('git cl try with no bots now defaults to CQ dry run.')
4488 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4489 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004490
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004491 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004492 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004493 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004494 except BuildbucketResponseException as ex:
4495 print('ERROR: %s' % ex)
4496 return 1
4497 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004498
4499
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004500@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004501def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004502 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004503 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004504 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004505 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004506 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004507 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004508 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004509 '--color', action='store_true', default=setup_color.IS_TTY,
4510 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004511 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004512 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4513 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004514 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004515 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004516 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004517 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004518 parser.add_option(
4519 '-i', '--issue', type=int,
4520 help='Operate on this issue instead of the current branch\'s implicit '
4521 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004522 options, args = parser.parse_args(args)
4523 if args:
4524 parser.error('Unrecognized args: %s' % ' '.join(args))
4525
Edward Lemur934836a2019-09-09 20:16:54 +00004526 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004527 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004528 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004529
tandrii221ab252016-10-06 08:12:04 -07004530 patchset = options.patchset
4531 if not patchset:
4532 patchset = cl.GetMostRecentPatchset()
4533 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004535 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004536 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004537 cl.GetIssue())
4538
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004539 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004540 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004541 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004542 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004543 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004544 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004545 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004546 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004547 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004548 return 0
4549
4550
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004551@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004552@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004554 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004555 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004556 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004557 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004558
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004560 if args:
4561 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004562 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004563 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004564 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004565 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004566
4567 # Clear configured merge-base, if there is one.
4568 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004569 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004570 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571 return 0
4572
4573
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004575def CMDweb(parser, args):
4576 """Opens the current CL in the web browser."""
4577 _, args = parser.parse_args(args)
4578 if args:
4579 parser.error('Unrecognized args: %s' % ' '.join(args))
4580
4581 issue_url = Changelist().GetIssueURL()
4582 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004583 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004584 return 1
4585
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004586 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004587 # allows us to hide the "Created new window in existing browser session."
4588 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004589 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004590 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004591 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004592 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004593 os.open(os.devnull, os.O_RDWR)
4594 try:
4595 webbrowser.open(issue_url)
4596 finally:
4597 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004598 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004599 return 0
4600
4601
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004602@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004603def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004604 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004605 parser.add_option('-d', '--dry-run', action='store_true',
4606 help='trigger in dry run mode')
4607 parser.add_option('-c', '--clear', action='store_true',
4608 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004609 parser.add_option(
4610 '-i', '--issue', type=int,
4611 help='Operate on this issue instead of the current branch\'s implicit '
4612 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004613 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004614 if args:
4615 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004616 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004617 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004618
Edward Lemur934836a2019-09-09 20:16:54 +00004619 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004620 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004621 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004622 elif options.dry_run:
4623 state = _CQState.DRY_RUN
4624 else:
4625 state = _CQState.COMMIT
4626 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004627 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004628 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004629 return 0
4630
4631
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004632@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004633def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004634 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004635 parser.add_option(
4636 '-i', '--issue', type=int,
4637 help='Operate on this issue instead of the current branch\'s implicit '
4638 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004639 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004640 if args:
4641 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004642 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004643 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004644 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004645 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004646 cl.CloseIssue()
4647 return 0
4648
4649
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004650@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004651def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004652 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004653 parser.add_option(
4654 '--stat',
4655 action='store_true',
4656 dest='stat',
4657 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004658 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004659 if args:
4660 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004661
Edward Lemur934836a2019-09-09 20:16:54 +00004662 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004663 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004664 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004665 if not issue:
4666 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004667
Aaron Gablea718c3e2017-08-28 17:47:28 -07004668 base = cl._GitGetBranchConfigValue('last-upload-hash')
4669 if not base:
4670 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4671 if not base:
4672 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4673 revision_info = detail['revisions'][detail['current_revision']]
4674 fetch_info = revision_info['fetch']['http']
4675 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4676 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004677
Aaron Gablea718c3e2017-08-28 17:47:28 -07004678 cmd = ['git', 'diff']
4679 if options.stat:
4680 cmd.append('--stat')
4681 cmd.append(base)
4682 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004683
4684 return 0
4685
4686
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004687@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004688def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004689 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004690 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004691 '--ignore-current',
4692 action='store_true',
4693 help='Ignore the CL\'s current reviewers and start from scratch.')
4694 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004695 '--ignore-self',
4696 action='store_true',
4697 help='Do not consider CL\'s author as an owners.')
4698 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004699 '--no-color',
4700 action='store_true',
4701 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004702 parser.add_option(
4703 '--batch',
4704 action='store_true',
4705 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004706 # TODO: Consider moving this to another command, since other
4707 # git-cl owners commands deal with owners for a given CL.
4708 parser.add_option(
4709 '--show-all',
4710 action='store_true',
4711 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004712 options, args = parser.parse_args(args)
4713
Edward Lemur934836a2019-09-09 20:16:54 +00004714 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004715 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004716
Yang Guo6e269a02019-06-26 11:17:02 +00004717 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004718 if len(args) == 0:
4719 print('No files specified for --show-all. Nothing to do.')
4720 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004721 for arg in args:
4722 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004723 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004724 database.load_data_needed_for([arg])
4725 print('Owners for %s:' % arg)
4726 for owner in sorted(database.all_possible_owners([arg], None)):
4727 print(' - %s' % owner)
4728 return 0
4729
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004730 if args:
4731 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004732 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004733 base_branch = args[0]
4734 else:
4735 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004736 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004737
Edward Lemur2c62b332020-03-12 22:12:33 +00004738 root = settings.GetRoot()
4739 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004740
4741 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004742 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004743 print('\n'.join(db.reviewers_for(affected_files, author)))
4744 return 0
4745
Edward Lemur2c62b332020-03-12 22:12:33 +00004746 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4747 original_owner_files = {
4748 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4749 for f in owner_files}
4750
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004751 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004752 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004753 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004754 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004755 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004756 fopen=open,
4757 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004758 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004759 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004760 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004761
4762
Aiden Bennerc08566e2018-10-03 17:52:42 +00004763def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004764 """Generates a diff command."""
4765 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004766 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4767
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004768 if allow_prefix:
4769 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4770 # case that diff.noprefix is set in the user's git config.
4771 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4772 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004773 diff_cmd += ['--no-prefix']
4774
4775 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004776
4777 if args:
4778 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004779 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004780 diff_cmd.append(arg)
4781 else:
4782 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004783
4784 return diff_cmd
4785
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004786
Jamie Madill5e96ad12020-01-13 16:08:35 +00004787def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4788 """Runs clang-format-diff and sets a return value if necessary."""
4789
4790 if not clang_diff_files:
4791 return 0
4792
4793 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4794 # formatted. This is used to block during the presubmit.
4795 return_value = 0
4796
4797 # Locate the clang-format binary in the checkout
4798 try:
4799 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4800 except clang_format.NotFoundError as e:
4801 DieWithError(e)
4802
4803 if opts.full or settings.GetFormatFullByDefault():
4804 cmd = [clang_format_tool]
4805 if not opts.dry_run and not opts.diff:
4806 cmd.append('-i')
4807 if opts.dry_run:
4808 for diff_file in clang_diff_files:
4809 with open(diff_file, 'r') as myfile:
4810 code = myfile.read().replace('\r\n', '\n')
4811 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4812 stdout = stdout.replace('\r\n', '\n')
4813 if opts.diff:
4814 sys.stdout.write(stdout)
4815 if code != stdout:
4816 return_value = 2
4817 else:
4818 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4819 if opts.diff:
4820 sys.stdout.write(stdout)
4821 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004822 try:
4823 script = clang_format.FindClangFormatScriptInChromiumTree(
4824 'clang-format-diff.py')
4825 except clang_format.NotFoundError as e:
4826 DieWithError(e)
4827
Edward Lesmes89624cd2020-04-06 17:51:56 +00004828 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004829 if not opts.dry_run and not opts.diff:
4830 cmd.append('-i')
4831
4832 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004833 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004834
Edward Lesmes89624cd2020-04-06 17:51:56 +00004835 env = os.environ.copy()
4836 env['PATH'] = (
4837 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4838 stdout = RunCommand(
4839 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004840 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004841 if opts.diff:
4842 sys.stdout.write(stdout)
4843 if opts.dry_run and len(stdout) > 0:
4844 return_value = 2
4845
4846 return return_value
4847
4848
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004849def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004850 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004851 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004852
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004853
enne@chromium.org555cfe42014-01-29 18:21:39 +00004854@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004855@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004856def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004857 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004858 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004859 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004860 parser.add_option('--full', action='store_true',
4861 help='Reformat the full content of all touched files')
4862 parser.add_option('--dry-run', action='store_true',
4863 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004864 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004865 '--no-clang-format',
4866 dest='clang_format',
4867 action='store_false',
4868 default=True,
4869 help='Disables formatting of various file types using clang-format.')
4870 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004871 '--python',
4872 action='store_true',
4873 default=None,
4874 help='Enables python formatting on all python files.')
4875 parser.add_option(
4876 '--no-python',
4877 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004878 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004879 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004880 'If neither --python or --no-python are set, python files that have a '
4881 '.style.yapf file in an ancestor directory will be formatted. '
4882 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004883 parser.add_option(
4884 '--js',
4885 action='store_true',
4886 help='Format javascript code with clang-format. '
4887 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004888 parser.add_option('--diff', action='store_true',
4889 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004890 parser.add_option('--presubmit', action='store_true',
4891 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004892 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004893
Garrett Beaty91a6f332020-01-06 16:57:24 +00004894 if opts.python is not None and opts.no_python:
4895 raise parser.error('Cannot set both --python and --no-python')
4896 if opts.no_python:
4897 opts.python = False
4898
Daniel Chengc55eecf2016-12-30 03:11:02 -08004899 # Normalize any remaining args against the current path, so paths relative to
4900 # the current directory are still resolved as expected.
4901 args = [os.path.join(os.getcwd(), arg) for arg in args]
4902
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004903 # git diff generates paths against the root of the repository. Change
4904 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004905 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004906 if rel_base_path:
4907 os.chdir(rel_base_path)
4908
digit@chromium.org29e47272013-05-17 17:01:46 +00004909 # Grab the merge-base commit, i.e. the upstream commit of the current
4910 # branch when it was created or the last time it was rebased. This is
4911 # to cover the case where the user may have called "git fetch origin",
4912 # moving the origin branch to a newer commit, but hasn't rebased yet.
4913 upstream_commit = None
4914 cl = Changelist()
4915 upstream_branch = cl.GetUpstreamBranch()
4916 if upstream_branch:
4917 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4918 upstream_commit = upstream_commit.strip()
4919
4920 if not upstream_commit:
4921 DieWithError('Could not find base commit for this branch. '
4922 'Are you in detached state?')
4923
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004924 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4925 diff_output = RunGit(changed_files_cmd)
4926 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004927 # Filter out files deleted by this CL
4928 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004929
Andreas Haas417d89c2020-02-06 10:24:27 +00004930 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004931 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004932
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004933 clang_diff_files = []
4934 if opts.clang_format:
4935 clang_diff_files = [
4936 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4937 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004938 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004939 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004940
Edward Lesmes50da7702020-03-30 19:23:43 +00004941 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004942
Jamie Madill5e96ad12020-01-13 16:08:35 +00004943 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4944 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004945
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004946 # Similar code to above, but using yapf on .py files rather than clang-format
4947 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004948 py_explicitly_disabled = opts.python is not None and not opts.python
4949 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004950 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4951 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004952
Aiden Bennerc08566e2018-10-03 17:52:42 +00004953 # Used for caching.
4954 yapf_configs = {}
4955 for f in python_diff_files:
4956 # Find the yapf style config for the current file, defaults to depot
4957 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004958 _FindYapfConfigFile(f, yapf_configs, top_dir)
4959
4960 # Turn on python formatting by default if a yapf config is specified.
4961 # This breaks in the case of this repo though since the specified
4962 # style file is also the global default.
4963 if opts.python is None:
4964 filtered_py_files = []
4965 for f in python_diff_files:
4966 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4967 filtered_py_files.append(f)
4968 else:
4969 filtered_py_files = python_diff_files
4970
4971 # Note: yapf still seems to fix indentation of the entire file
4972 # even if line ranges are specified.
4973 # See https://github.com/google/yapf/issues/499
4974 if not opts.full and filtered_py_files:
4975 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4976
Brian Sheedyb4307d52019-12-02 19:18:17 +00004977 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4978 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4979 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004980
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004981 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004982 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4983 # Default to pep8 if not .style.yapf is found.
4984 if not yapf_style:
4985 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004986
Peter Wend9399922020-06-17 17:33:49 +00004987 with open(f, 'r') as py_f:
4988 if 'python3' in py_f.readline():
4989 vpython_script = 'vpython3'
4990 else:
4991 vpython_script = 'vpython'
4992
4993 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004994
4995 has_formattable_lines = False
4996 if not opts.full:
4997 # Only run yapf over changed line ranges.
4998 for diff_start, diff_len in py_line_diffs[f]:
4999 diff_end = diff_start + diff_len - 1
5000 # Yapf errors out if diff_end < diff_start but this
5001 # is a valid line range diff for a removal.
5002 if diff_end >= diff_start:
5003 has_formattable_lines = True
5004 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5005 # If all line diffs were removals we have nothing to format.
5006 if not has_formattable_lines:
5007 continue
5008
5009 if opts.diff or opts.dry_run:
5010 cmd += ['--diff']
5011 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005012 stdout = RunCommand(cmd,
5013 error_ok=True,
5014 cwd=top_dir,
5015 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005016 if opts.diff:
5017 sys.stdout.write(stdout)
5018 elif len(stdout) > 0:
5019 return_value = 2
5020 else:
5021 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005022 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005023
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005024 # Format GN build files. Always run on full build files for canonical form.
5025 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005026 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005027 if opts.dry_run or opts.diff:
5028 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005029 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005030 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005031 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005032 cwd=top_dir)
5033 if opts.dry_run and gn_ret == 2:
5034 return_value = 2 # Not formatted.
5035 elif opts.diff and gn_ret == 2:
5036 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005037 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005038 elif gn_ret != 0:
5039 # For non-dry run cases (and non-2 return values for dry-run), a
5040 # nonzero error code indicates a failure, probably because the file
5041 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005042 DieWithError('gn format failed on ' + gn_diff_file +
5043 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005044
Ilya Shermane081cbe2017-08-15 17:51:04 -07005045 # Skip the metrics formatting from the global presubmit hook. These files have
5046 # a separate presubmit hook that issues an error if the files need formatting,
5047 # whereas the top-level presubmit script merely issues a warning. Formatting
5048 # these files is somewhat slow, so it's important not to duplicate the work.
5049 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005050 for diff_xml in GetDiffXMLs(diff_files):
5051 xml_dir = GetMetricsDir(diff_xml)
5052 if not xml_dir:
5053 continue
5054
Ilya Shermane081cbe2017-08-15 17:51:04 -07005055 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005056 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5057 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005058
5059 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5060 # command as histograms/pretty_print.py now needs a relative path argument
5061 # after splitting the histograms into multiple directories.
5062 # For example, in tools/metrics/ukm, pretty-print could be run using:
5063 # $ python pretty_print.py
5064 # But in tools/metrics/histogrmas, pretty-print should be run with an
5065 # additional relative path argument, like:
5066 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5067 # $ python pretty_print.py enums.xml
5068
5069 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5070 # version of histograms/pretty_print.py is released.
5071 filepath_required = os.path.exists(
5072 os.path.join(tool_dir, 'validate_prefix.py'))
5073
Weilun Shib92c4b72020-08-27 17:45:11 +00005074 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5075 or diff_xml.endswith('histogram_suffixes_list.xml')
5076 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005077 cmd.append(diff_xml)
5078
Ilya Shermane081cbe2017-08-15 17:51:04 -07005079 if opts.dry_run or opts.diff:
5080 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005081
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005082 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5083 # `shell` param and instead replace `'vpython'` with
5084 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005085 stdout = RunCommand(cmd,
5086 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005087 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005088 if opts.diff:
5089 sys.stdout.write(stdout)
5090 if opts.dry_run and stdout:
5091 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005092
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005093 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005094
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005095
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005096def GetDiffXMLs(diff_files):
5097 return [
5098 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5099 ]
5100
5101
5102def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005103 metrics_xml_dirs = [
5104 os.path.join('tools', 'metrics', 'actions'),
5105 os.path.join('tools', 'metrics', 'histograms'),
5106 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005107 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005108 os.path.join('tools', 'metrics', 'ukm'),
5109 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005110 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005111 if diff_xml.startswith(xml_dir):
5112 return xml_dir
5113 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005114
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005115
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005116@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005117@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005118def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005119 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005120 _, args = parser.parse_args(args)
5121
5122 if len(args) != 1:
5123 parser.print_help()
5124 return 1
5125
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005126 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005127 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005128 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005129
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005130 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005131
Edward Lemur52969c92020-02-06 18:15:28 +00005132 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005133 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005134 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005135
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005136 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005137 for key, issue in [x.split() for x in output.splitlines()]:
5138 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005139 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005140
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005141 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005142 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005143 return 1
5144 if len(branches) == 1:
5145 RunGit(['checkout', branches[0]])
5146 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005147 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005148 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005149 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005150 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005151 try:
5152 RunGit(['checkout', branches[int(which)]])
5153 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005154 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005155 return 1
5156
5157 return 0
5158
5159
maruel@chromium.org29404b52014-09-08 22:58:00 +00005160def CMDlol(parser, args):
5161 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005162 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005163 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5164 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5165 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005166 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005167 return 0
5168
5169
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005170class OptionParser(optparse.OptionParser):
5171 """Creates the option parse and add --verbose support."""
5172 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005173 optparse.OptionParser.__init__(
5174 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005175 self.add_option(
5176 '-v', '--verbose', action='count', default=0,
5177 help='Use 2 times for more debugging info')
5178
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005179 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005180 try:
5181 return self._parse_args(args)
5182 finally:
5183 # Regardless of success or failure of args parsing, we want to report
5184 # metrics, but only after logging has been initialized (if parsing
5185 # succeeded).
5186 global settings
5187 settings = Settings()
5188
5189 if not metrics.DISABLE_METRICS_COLLECTION:
5190 # GetViewVCUrl ultimately calls logging method.
5191 project_url = settings.GetViewVCUrl().strip('/+')
5192 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5193 metrics.collector.add('project_urls', [project_url])
5194
5195 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005196 # Create an optparse.Values object that will store only the actual passed
5197 # options, without the defaults.
5198 actual_options = optparse.Values()
5199 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5200 # Create an optparse.Values object with the default options.
5201 options = optparse.Values(self.get_default_values().__dict__)
5202 # Update it with the options passed by the user.
5203 options._update_careful(actual_options.__dict__)
5204 # Store the options passed by the user in an _actual_options attribute.
5205 # We store only the keys, and not the values, since the values can contain
5206 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005207 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005208
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005209 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005210 logging.basicConfig(
5211 level=levels[min(options.verbose, len(levels) - 1)],
5212 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5213 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005214
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005215 return options, args
5216
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005217
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005218def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005219 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005220 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005221 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005222 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005223
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005224 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005225 dispatcher = subcommand.CommandDispatcher(__name__)
5226 try:
5227 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005228 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005229 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005230 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005231 if e.code != 500:
5232 raise
5233 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005234 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005235 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005236 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005237
5238
5239if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005240 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5241 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005242 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005243 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005244 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005245 sys.exit(main(sys.argv[1:]))