blob: efcf429c20843750861e5ea3fed166b76b2fd51f [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
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000111DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
112DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
Edward Lesmes50da7702020-03-30 19:23:43 +0000121# The issue, patchset and codereview server are stored on git config for each
122# branch under branch.<branch-name>.<config-key>.
123ISSUE_CONFIG_KEY = 'gerritissue'
124PATCHSET_CONFIG_KEY = 'gerritpatchset'
125CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
126
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000127# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000128Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000129
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000130# Initialized in main()
131settings = None
132
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100133# Used by tests/git_cl_test.py to add extra logging.
134# Inside the weirdly failing test, add this:
135# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700136# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100137_IS_BEING_TESTED = False
138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000140_KNOWN_GERRIT_TO_SHORT_URLS = {
141 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
142 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
143}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000144assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
145 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000146
147
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000148class GitPushError(Exception):
149 pass
150
151
Christopher Lamf732cd52017-01-24 12:40:11 +1100152def DieWithError(message, change_desc=None):
153 if change_desc:
154 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000155 print('\n ** Content of CL description **\n' +
156 '='*72 + '\n' +
157 change_desc.description + '\n' +
158 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100159
vapiera7fbd5a2016-06-16 09:17:49 -0700160 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 sys.exit(1)
162
163
Christopher Lamf732cd52017-01-24 12:40:11 +1100164def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000165 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000166 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000167 with open(backup_path, 'w') as backup_file:
168 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100169
170
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000171def GetNoGitPagerEnv():
172 env = os.environ.copy()
173 # 'cat' is a magical git string that disables pagers on all platforms.
174 env['GIT_PAGER'] = 'cat'
175 return env
176
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000177
bsep@chromium.org627d9002016-04-29 00:00:52 +0000178def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000180 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
181 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000182 except subprocess2.CalledProcessError as e:
183 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000185 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
186 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
190def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000191 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000195def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700197 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000198 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700199 else:
200 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000201 try:
tandrii5d48c322016-08-18 16:19:37 -0700202 (out, _), code = subprocess2.communicate(['git'] + args,
203 env=GetNoGitPagerEnv(),
204 stdout=subprocess2.PIPE,
205 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000206 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700207 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900208 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000210
211
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000212def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000213 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000214 return RunGitWithCode(args, suppress_stderr=True)[1]
215
216
tandrii2a16b952016-10-19 07:09:44 -0700217def time_sleep(seconds):
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700220 return time.sleep(seconds)
221
222
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000223def time_time():
224 # Use this so that it can be mocked in tests without interfering with python
225 # system machinery.
226 return time.time()
227
228
Edward Lemur1b52d872019-05-09 21:12:12 +0000229def datetime_now():
230 # Use this so that it can be mocked in tests without interfering with python
231 # system machinery.
232 return datetime.datetime.now()
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000245 gclient_utils.AskForData(
246 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100247
248
249def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000250 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000251 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252 while True:
253 if 'yes'.startswith(result):
254 return True
255 if 'no'.startswith(result):
256 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000257 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100258
259
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000261 prop_list = getattr(options, 'properties', [])
262 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000263 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264 try:
265 properties[key] = json.loads(val)
266 except ValueError:
267 pass # If a value couldn't be evaluated, treat it as a string.
268 return properties
269
270
Edward Lemur4c707a22019-09-24 21:13:43 +0000271def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000272 """Calls a buildbucket v2 method and returns the parsed json response."""
273 headers = {
274 'Accept': 'application/json',
275 'Content-Type': 'application/json',
276 }
277 request = json.dumps(request)
278 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
279
280 logging.info('POST %s with %s' % (url, request))
281
282 attempts = 1
283 time_to_sleep = 1
284 while True:
285 response, content = http.request(url, 'POST', body=request, headers=headers)
286 if response.status == 200:
287 return json.loads(content[4:])
288 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
289 msg = '%s error when calling POST %s with %s: %s' % (
290 response.status, url, request, content)
291 raise BuildbucketResponseException(msg)
292 logging.debug(
293 '%s error when calling POST %s with %s. '
294 'Sleeping for %d seconds and retrying...' % (
295 response.status, url, request, time_to_sleep))
296 time.sleep(time_to_sleep)
297 time_to_sleep *= 2
298 attempts += 1
299
300 assert False, 'unreachable'
301
302
Edward Lemur6215c792019-10-03 21:59:05 +0000303def _parse_bucket(raw_bucket):
304 legacy = True
305 project = bucket = None
306 if '/' in raw_bucket:
307 legacy = False
308 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000309 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000310 elif raw_bucket.startswith('luci.'):
311 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000312 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000313 elif '.' in raw_bucket:
314 project = raw_bucket.split('.')[0]
315 bucket = raw_bucket
316 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000317 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000318 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
319 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000320
321
Quinten Yearsley777660f2020-03-04 23:37:06 +0000322def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000323 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700324
325 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000326 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000327 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700328 options: Command-line options.
329 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000331 for project, bucket, builder in jobs:
332 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 print('To see results here, run: git cl try-results')
334 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700335
Quinten Yearsley777660f2020-03-04 23:37:06 +0000336 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 if not requests:
338 return
339
Edward Lemur5b929a42019-10-21 17:57:39 +0000340 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 http.force_exception_to_status_code = True
342
343 batch_request = {'requests': requests}
344 batch_response = _call_buildbucket(
345 http, options.buildbucket_host, 'Batch', batch_request)
346
347 errors = [
348 ' ' + response['error']['message']
349 for response in batch_response.get('responses', [])
350 if 'error' in response
351 ]
352 if errors:
353 raise BuildbucketResponseException(
354 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
355
356
Quinten Yearsley777660f2020-03-04 23:37:06 +0000357def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000358 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000359 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000360 shared_properties = {
361 'category': options.ensure_value('category', 'git_cl_try')
362 }
363 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 shared_properties['clobber'] = True
365 shared_properties.update(_get_properties_from_options(options) or {})
366
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000367 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000368 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000369 shared_tags.append({'key': 'retry_failed',
370 'value': '1'})
371
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000372 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000373 for (project, bucket, builder) in jobs:
374 properties = shared_properties.copy()
375 if 'presubmit' in builder.lower():
376 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377
Edward Lemur45768512020-03-02 19:03:14 +0000378 requests.append({
379 'scheduleBuild': {
380 'requestId': str(uuid.uuid4()),
381 'builder': {
382 'project': getattr(options, 'project', None) or project,
383 'bucket': bucket,
384 'builder': builder,
385 },
386 'gerritChanges': gerrit_changes,
387 'properties': properties,
388 'tags': [
389 {'key': 'builder', 'value': builder},
390 ] + shared_tags,
391 }
392 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000393
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000394 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000395 requests[-1]['scheduleBuild']['gitilesCommit'] = {
396 'host': gerrit_changes[0]['host'],
397 'project': gerrit_changes[0]['project'],
398 'id': options.revision
399 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000400
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000401 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000402
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000403
Quinten Yearsley777660f2020-03-04 23:37:06 +0000404def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000405 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000406
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000407 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000408 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000409 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000410 request = {
411 'predicate': {
412 'gerritChanges': [changelist.GetGerritChange(patchset)],
413 },
414 'fields': ','.join('builds.*.' + field for field in fields),
415 }
tandrii221ab252016-10-06 08:12:04 -0700416
Edward Lemur5b929a42019-10-21 17:57:39 +0000417 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000418 if authenticator.has_cached_credentials():
419 http = authenticator.authorize(httplib2.Http())
420 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700421 print('Warning: Some results might be missing because %s' %
422 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000423 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000424 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 http.force_exception_to_status_code = True
426
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000427 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
428 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000429
Edward Lemur45768512020-03-02 19:03:14 +0000430
Edward Lemur5b929a42019-10-21 17:57:39 +0000431def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 """Fetches builds from the latest patchset that has builds (within
433 the last few patchsets).
434
435 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 changelist (Changelist): The CL to fetch builds for
437 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000438 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
439 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000440 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000441 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
442 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000443 """
444 assert buildbucket_host
445 assert changelist.GetIssue(), 'CL must be uploaded first'
446 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000447 if latest_patchset is None:
448 assert changelist.GetMostRecentPatchset()
449 ps = changelist.GetMostRecentPatchset()
450 else:
451 assert latest_patchset > 0, latest_patchset
452 ps = latest_patchset
453
Quinten Yearsley983111f2019-09-26 17:18:48 +0000454 min_ps = max(1, ps - 5)
455 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000456 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000457 if len(builds):
458 return builds, ps
459 ps -= 1
460 return [], 0
461
462
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000463def _filter_failed_for_retry(all_builds):
464 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000465
466 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000467 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 i.e. a list of buildbucket.v2.Builds which includes status and builder
469 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470
471 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000472 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000473 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000474 """
Edward Lemur45768512020-03-02 19:03:14 +0000475 grouped = {}
476 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000477 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000478 key = (builder['project'], builder['bucket'], builder['builder'])
479 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000480
Edward Lemur45768512020-03-02 19:03:14 +0000481 jobs = []
482 for (project, bucket, builder), builds in grouped.items():
483 if 'triggered' in builder:
484 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
485 'from a parent. Please schedule a manual job for the parent '
486 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000487 continue
488 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
489 # Don't retry if any are running.
490 continue
Edward Lemur45768512020-03-02 19:03:14 +0000491 # If builder had several builds, retry only if the last one failed.
492 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
493 # build, but in case of retrying failed jobs retrying a flaky one makes
494 # sense.
495 builds = sorted(builds, key=lambda b: b['createTime'])
496 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
497 continue
498 # Don't retry experimental build previously triggered by CQ.
499 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
500 for t in builds[-1]['tags']):
501 continue
502 jobs.append((project, bucket, builder))
503
504 # Sort the jobs to make testing easier.
505 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000506
507
Quinten Yearsley777660f2020-03-04 23:37:06 +0000508def _print_tryjobs(options, builds):
509 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000511 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 return
513
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000514 longest_builder = max(len(b['builder']['builder']) for b in builds)
515 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000517 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
518 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 builds_by_status = {}
521 for b in builds:
522 builds_by_status.setdefault(b['status'], []).append({
523 'id': b['id'],
524 'name': name_fmt.format(
525 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
526 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 sort_key = lambda b: (b['name'], b['id'])
529
530 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000532 if not builds:
533 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000536 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 else:
539 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
540
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000541 print(colorize(title))
542 for b in sorted(builds, key=sort_key):
543 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544
545 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000546 print_builds(
547 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
548 print_builds(
549 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
550 color=Fore.MAGENTA)
551 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
552 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
553 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000554 print_builds('Started:', builds_by_status.pop('STARTED', []),
555 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000556 print_builds(
557 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000559 print_builds(
560 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562
563
Aiden Bennerc08566e2018-10-03 17:52:42 +0000564def _ComputeDiffLineRanges(files, upstream_commit):
565 """Gets the changed line ranges for each file since upstream_commit.
566
567 Parses a git diff on provided files and returns a dict that maps a file name
568 to an ordered list of range tuples in the form (start_line, count).
569 Ranges are in the same format as a git diff.
570 """
571 # If files is empty then diff_output will be a full diff.
572 if len(files) == 0:
573 return {}
574
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000575 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000576 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000577 diff_output = RunGit(diff_cmd)
578
579 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
580 # 2 capture groups
581 # 0 == fname of diff file
582 # 1 == 'diff_start,diff_count' or 'diff_start'
583 # will match each of
584 # diff --git a/foo.foo b/foo.py
585 # @@ -12,2 +14,3 @@
586 # @@ -12,2 +17 @@
587 # running re.findall on the above string with pattern will give
588 # [('foo.py', ''), ('', '14,3'), ('', '17')]
589
590 curr_file = None
591 line_diffs = {}
592 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
593 if match[0] != '':
594 # Will match the second filename in diff --git a/a.py b/b.py.
595 curr_file = match[0]
596 line_diffs[curr_file] = []
597 else:
598 # Matches +14,3
599 if ',' in match[1]:
600 diff_start, diff_count = match[1].split(',')
601 else:
602 # Single line changes are of the form +12 instead of +12,1.
603 diff_start = match[1]
604 diff_count = 1
605
606 diff_start = int(diff_start)
607 diff_count = int(diff_count)
608
609 # If diff_count == 0 this is a removal we can ignore.
610 line_diffs[curr_file].append((diff_start, diff_count))
611
612 return line_diffs
613
614
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000615def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616 """Checks if a yapf file is in any parent directory of fpath until top_dir.
617
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000618 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000619 is found returns None. Uses yapf_config_cache as a cache for previously found
620 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 # Return result if we've already computed it.
624 if fpath in yapf_config_cache:
625 return yapf_config_cache[fpath]
626
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000627 parent_dir = os.path.dirname(fpath)
628 if os.path.isfile(fpath):
629 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000631 # Otherwise fpath is a directory
632 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
633 if os.path.isfile(yapf_file):
634 ret = yapf_file
635 elif fpath == top_dir or parent_dir == fpath:
636 # If we're at the top level directory, or if we're at root
637 # there is no provided style.
638 ret = None
639 else:
640 # Otherwise recurse on the current directory.
641 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000642 yapf_config_cache[fpath] = ret
643 return ret
644
645
Brian Sheedyb4307d52019-12-02 19:18:17 +0000646def _GetYapfIgnorePatterns(top_dir):
647 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000648
649 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
650 but this functionality appears to break when explicitly passing files to
651 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000652 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000653 the .yapfignore file should be in the directory that yapf is invoked from,
654 which we assume to be the top level directory in this case.
655
656 Args:
657 top_dir: The top level directory for the repository being formatted.
658
659 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000660 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000661 """
662 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000663 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000664 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000665 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000666
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 with open(yapfignore_file) as f:
668 for line in f.readlines():
669 stripped_line = line.strip()
670 # Comments and blank lines should be ignored.
671 if stripped_line.startswith('#') or stripped_line == '':
672 continue
673 ignore_patterns.add(stripped_line)
674 return ignore_patterns
675
676
677def _FilterYapfIgnoredFiles(filepaths, patterns):
678 """Filters out any filepaths that match any of the given patterns.
679
680 Args:
681 filepaths: An iterable of strings containing filepaths to filter.
682 patterns: An iterable of strings containing fnmatch patterns to filter on.
683
684 Returns:
685 A list of strings containing all the elements of |filepaths| that did not
686 match any of the patterns in |patterns|.
687 """
688 # Not inlined so that tests can use the same implementation.
689 return [f for f in filepaths
690 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000691
692
Aaron Gable13101a62018-02-09 13:20:41 -0800693def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000694 """Prints statistics about the change to the user."""
695 # --no-ext-diff is broken in some versions of Git, so try to work around
696 # this by overriding the environment (but there is still a problem if the
697 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000698 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000699 if 'GIT_EXTERNAL_DIFF' in env:
700 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000701
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000702 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800703 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000704 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705
706
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000707class BuildbucketResponseException(Exception):
708 pass
709
710
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711class Settings(object):
712 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000713 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000714 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000715 self.tree_status_url = None
716 self.viewvc_url = None
717 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000718 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000719 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000720 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000721 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000722 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000723
Edward Lemur26964072020-02-19 19:18:51 +0000724 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000725 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000726 if self.updated:
727 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000728
Edward Lemur26964072020-02-19 19:18:51 +0000729 # The only value that actually changes the behavior is
730 # autoupdate = "false". Everything else means "true".
731 autoupdate = (
732 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
733
734 cr_settings_file = FindCodereviewSettingsFile()
735 if autoupdate != 'false' and cr_settings_file:
736 LoadCodereviewSettingsFromFile(cr_settings_file)
737 cr_settings_file.close()
738
739 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000740
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000741 @staticmethod
742 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000743 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000746 if self.root is None:
747 self.root = os.path.abspath(self.GetRelativeRoot())
748 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750 def GetTreeStatusUrl(self, error_ok=False):
751 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000752 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
753 if self.tree_status_url is None and not error_ok:
754 DieWithError(
755 'You must configure your tree status URL by running '
756 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 return self.tree_status_url
758
759 def GetViewVCUrl(self):
760 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000761 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 return self.viewvc_url
763
rmistry@google.com90752582014-01-14 21:04:50 +0000764 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000765 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000766
rmistry@google.com5626a922015-02-26 14:03:30 +0000767 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000768 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000769 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000770 return run_post_upload_hook == "True"
771
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000772 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000773 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000774
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000776 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000777 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000778 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
779 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000780 # Default is squash now (http://crbug.com/611892#c23).
781 self.squash_gerrit_uploads = self._GetConfig(
782 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000783 return self.squash_gerrit_uploads
784
Edward Lesmes4de54132020-05-05 19:41:33 +0000785 def GetSquashGerritUploadsOverride(self):
786 """Return True or False if codereview.settings should be overridden.
787
788 Returns None if no override has been defined.
789 """
790 # See also http://crbug.com/611892#c23
791 result = self._GetConfig('gerrit.override-squash-uploads').lower()
792 if result == 'true':
793 return True
794 if result == 'false':
795 return False
796 return None
797
tandrii@chromium.org28253532016-04-14 13:46:56 +0000798 def GetGerritSkipEnsureAuthenticated(self):
799 """Return True if EnsureAuthenticated should not be done for Gerrit
800 uploads."""
801 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.gerrit_skip_ensure_authenticated = self._GetConfig(
803 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000804 return self.gerrit_skip_ensure_authenticated
805
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000806 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000807 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000808 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000809 # Git requires single quotes for paths with spaces. We need to replace
810 # them with double quotes for Windows to treat such paths as a single
811 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000813 return self.git_editor or None
814
thestig@chromium.org44202a22014-03-11 19:22:18 +0000815 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000816 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000817
818 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000819 return self._GetConfig(
820 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000821
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000822 def GetFormatFullByDefault(self):
823 if self.format_full_by_default is None:
824 result = (
825 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
826 error_ok=True).strip())
827 self.format_full_by_default = (result == 'true')
828 return self.format_full_by_default
829
Edward Lemur26964072020-02-19 19:18:51 +0000830 def _GetConfig(self, key, default=''):
831 self._LazyUpdateIfNeeded()
832 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833
834
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000835class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000836 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000837 NONE = 'none'
838 DRY_RUN = 'dry_run'
839 COMMIT = 'commit'
840
841 ALL_STATES = [NONE, DRY_RUN, COMMIT]
842
843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000844class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000845 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846 self.issue = issue
847 self.patchset = patchset
848 self.hostname = hostname
849
850 @property
851 def valid(self):
852 return self.issue is not None
853
854
Edward Lemurf38bc172019-09-03 21:02:13 +0000855def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000856 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
857 fail_result = _ParsedIssueNumberArgument()
858
Edward Lemur678a6842019-10-03 22:25:05 +0000859 if isinstance(arg, int):
860 return _ParsedIssueNumberArgument(issue=arg)
861 if not isinstance(arg, basestring):
862 return fail_result
863
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000865 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000866 if not arg.startswith('http'):
867 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700868
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000869 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000870 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
871 if url.startswith(short_url):
872 url = gerrit_url + url[len(short_url):]
873 break
874
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000875 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000876 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877 except ValueError:
878 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200879
Edward Lemur678a6842019-10-03 22:25:05 +0000880 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
881 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
882 # Short urls like https://domain/<issue_number> can be used, but don't allow
883 # specifying the patchset (you'd 404), but we allow that here.
884 if parsed_url.path == '/':
885 part = parsed_url.fragment
886 else:
887 part = parsed_url.path
888
889 match = re.match(
890 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
891 if not match:
892 return fail_result
893
894 issue = int(match.group('issue'))
895 patchset = match.group('patchset')
896 return _ParsedIssueNumberArgument(
897 issue=issue,
898 patchset=int(patchset) if patchset else None,
899 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000900
901
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000902def _create_description_from_log(args):
903 """Pulls out the commit log to use as a base for the CL description."""
904 log_args = []
905 if len(args) == 1 and not args[0].endswith('.'):
906 log_args = [args[0] + '..']
907 elif len(args) == 1 and args[0].endswith('...'):
908 log_args = [args[0][:-1]]
909 elif len(args) == 2:
910 log_args = [args[0] + '..' + args[1]]
911 else:
912 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000913 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000914
915
Aaron Gablea45ee112016-11-22 15:14:38 -0800916class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700917 def __init__(self, issue, url):
918 self.issue = issue
919 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800920 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700921
922 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800923 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700924 self.issue, self.url)
925
926
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100927_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000928 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100929 # TODO(tandrii): these two aren't known in Gerrit.
930 'approval', 'disapproval'])
931
932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000934 """Changelist works with one changelist in local branch.
935
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000936 Notes:
937 * Not safe for concurrent multi-{thread,process} use.
938 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700939 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000940 """
941
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000942 def __init__(self,
943 branchref=None,
944 issue=None,
945 codereview_host=None,
946 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000947 """Create a new ChangeList instance.
948
Edward Lemurf38bc172019-09-03 21:02:13 +0000949 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000950 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000952 global settings
953 if not settings:
954 # Happens when git_cl.py is used as a utility library.
955 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000956
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000957 self.branchref = branchref
958 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000959 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000960 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000961 else:
962 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000963 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000964 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000965 self.lookedup_issue = False
966 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000967 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000968 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000970 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800971 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000972 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000973 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000974
Edward Lemur125d60a2019-09-13 18:25:41 +0000975 # Lazily cached values.
976 self._gerrit_host = None # e.g. chromium-review.googlesource.com
977 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
978 # Map from change number (issue) to its detail cache.
979 self._detail_cache = {}
980
981 if codereview_host is not None:
982 assert not codereview_host.startswith('https://'), codereview_host
983 self._gerrit_host = codereview_host
984 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000985
986 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700987 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700989 The return value is a string suitable for passing to git cl with the --cc
990 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000991 """
992 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000993 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800994 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000995 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
996 return self.cc
997
Daniel Cheng7227d212017-11-17 08:12:37 -0800998 def ExtendCC(self, more_cc):
999 """Extends the list of users to cc on this CL based on the changed files."""
1000 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001001
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001002 def GetCommitDate(self):
1003 """Returns the commit date as provided in the constructor"""
1004 return self.commit_date
1005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001007 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001009 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001010 if not branchref:
1011 return None
1012 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001013 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 return self.branch
1015
1016 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001017 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.GetBranch() # Poke the lazy loader.
1019 return self.branchref
1020
Edward Lemur85153282020-02-14 22:06:29 +00001021 def _GitGetBranchConfigValue(self, key, default=None):
1022 return scm.GIT.GetBranchConfig(
1023 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001024
Edward Lemur85153282020-02-14 22:06:29 +00001025 def _GitSetBranchConfigValue(self, key, value):
1026 action = 'set %s to %r' % (key, value)
1027 if not value:
1028 action = 'unset %s' % key
1029 assert self.GetBranch(), 'a branch is needed to ' + action
1030 return scm.GIT.SetBranchConfig(
1031 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001032
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001033 @staticmethod
1034 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001035 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001036 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001038 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1039 settings.GetRoot(), branch)
1040 if not remote or not upstream_branch:
1041 DieWithError(
1042 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001043 'Verify this branch is set up to track another \n'
1044 '(via the --track argument to "git checkout -b ..."). \n'
1045 'or pass complete "git diff"-style arguments if supported, like\n'
1046 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047
1048 return remote, upstream_branch
1049
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001050 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001051 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001052 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001053 DieWithError('The upstream for the current branch (%s) does not exist '
1054 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001055 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001056 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001057
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001058 def GetUpstreamBranch(self):
1059 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001060 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001061 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001062 upstream_branch = upstream_branch.replace('refs/heads/',
1063 'refs/remotes/%s/' % remote)
1064 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1065 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066 self.upstream_branch = upstream_branch
1067 return self.upstream_branch
1068
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001069 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001070 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001071 remote, branch = None, self.GetBranch()
1072 seen_branches = set()
1073 while branch not in seen_branches:
1074 seen_branches.add(branch)
1075 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001076 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001077 if remote != '.' or branch.startswith('refs/remotes'):
1078 break
1079 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001080 remotes = RunGit(['remote'], error_ok=True).split()
1081 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001082 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001083 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001084 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001085 logging.warning('Could not determine which remote this change is '
1086 'associated with, so defaulting to "%s".' %
1087 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001088 else:
Gavin Make6a62332020-12-04 21:57:10 +00001089 logging.warning('Could not determine which remote this change is '
1090 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001091 branch = 'HEAD'
1092 if branch.startswith('refs/remotes'):
1093 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001094 elif branch.startswith('refs/branch-heads/'):
1095 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001096 else:
1097 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001098 return self._remote
1099
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100 def GetRemoteUrl(self):
1101 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1102
1103 Returns None if there is no remote.
1104 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001105 is_cached, value = self._cached_remote_url
1106 if is_cached:
1107 return value
1108
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001109 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001110 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001111
Edward Lemur298f2cf2019-02-22 21:40:39 +00001112 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001113 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001114 if host:
1115 self._cached_remote_url = (True, url)
1116 return url
1117
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001118 # If it cannot be parsed as an url, assume it is a local directory,
1119 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001120 logging.warning('"%s" doesn\'t appear to point to a git host. '
1121 'Interpreting it as a local directory.', url)
1122 if not os.path.isdir(url):
1123 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001124 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1125 'but it doesn\'t exist.',
1126 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001127 return None
1128
1129 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001130 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001131
Edward Lemur79d4f992019-11-11 23:49:02 +00001132 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001133 if not host:
1134 logging.error(
1135 'Remote "%(remote)s" for branch "%(branch)s" points to '
1136 '"%(cache_path)s", but it is misconfigured.\n'
1137 '"%(cache_path)s" must be a git repo and must have a remote named '
1138 '"%(remote)s" pointing to the git host.', {
1139 'remote': remote,
1140 'cache_path': cache_path,
1141 'branch': self.GetBranch()})
1142 return None
1143
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001144 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001145 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001147 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001148 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001149 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001150 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001151 if self.issue is not None:
1152 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001153 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 return self.issue
1155
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001156 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 issue = self.GetIssue()
1159 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001160 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001161 server = self.GetCodereviewServer()
1162 if short:
1163 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1164 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001165
Edward Lemur6c6827c2020-02-06 21:15:18 +00001166 def FetchDescription(self, pretty=False):
1167 assert self.GetIssue(), 'issue is required to query Gerrit'
1168
Edward Lemur9aa1a962020-02-25 00:58:38 +00001169 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001170 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1171 current_rev = data['current_revision']
1172 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001173
1174 if not pretty:
1175 return self.description
1176
1177 # Set width to 72 columns + 2 space indent.
1178 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1179 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1180 lines = self.description.splitlines()
1181 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001182
1183 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001184 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001185 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001186 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001187 if self.patchset is not None:
1188 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001189 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001190 return self.patchset
1191
Edward Lemur9aa1a962020-02-25 00:58:38 +00001192 def GetAuthor(self):
1193 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001195 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001196 """Set this branch's patchset. If patchset=0, clears the patchset."""
1197 assert self.GetBranch()
1198 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001199 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001200 else:
1201 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001202 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001204 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001205 """Set this branch's issue. If issue isn't given, clears the issue."""
1206 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001208 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001209 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001210 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001211 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001212 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001213 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001214 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 else:
tandrii5d48c322016-08-18 16:19:37 -07001216 # Reset all of these just to be clean.
1217 reset_suffixes = [
1218 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001219 ISSUE_CONFIG_KEY,
1220 PATCHSET_CONFIG_KEY,
1221 CODEREVIEW_SERVER_CONFIG_KEY,
1222 'gerritsquashhash',
1223 ]
tandrii5d48c322016-08-18 16:19:37 -07001224 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001225 try:
1226 self._GitSetBranchConfigValue(prop, None)
1227 except subprocess2.CalledProcessError:
1228 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001229 msg = RunGit(['log', '-1', '--format=%B']).strip()
1230 if msg and git_footers.get_footer_change_id(msg):
1231 print('WARNING: The change patched into this branch has a Change-Id. '
1232 'Removing it.')
1233 RunGit(['commit', '--amend', '-m',
1234 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001235 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001236 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001237 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001238
Edward Lemur2c62b332020-03-12 22:12:33 +00001239 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001240 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001241 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001242 except subprocess2.CalledProcessError:
1243 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001244 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001245 'This branch probably doesn\'t exist anymore. To reset the\n'
1246 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001247 ' git branch --set-upstream-to origin/main %s\n'
1248 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001249 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001250
dsansomee2d6fd92016-09-08 00:10:47 -07001251 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001252 assert self.GetIssue(), 'issue is required to update description'
1253
1254 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001255 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001256 if not force:
1257 confirm_or_exit(
1258 'The description cannot be modified while the issue has a pending '
1259 'unpublished edit. Either publish the edit in the Gerrit web UI '
1260 'or delete it.\n\n', action='delete the unpublished edit')
1261
1262 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001263 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001264 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001265 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001266 description, notify='NONE')
1267
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001268 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001269
Edward Lemur75526302020-02-27 22:31:05 +00001270 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001271 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001272 '--root', settings.GetRoot(),
1273 '--upstream', upstream,
1274 ]
1275
1276 args.extend(['--verbose'] * verbose)
1277
Edward Lemur99df04e2020-03-05 19:39:43 +00001278 author = self.GetAuthor()
1279 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001280 issue = self.GetIssue()
1281 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001282 if author:
1283 args.extend(['--author', author])
1284 if gerrit_url:
1285 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001286 if issue:
1287 args.extend(['--issue', str(issue)])
1288 if patchset:
1289 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001290
Edward Lemur75526302020-02-27 22:31:05 +00001291 return args
1292
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001293 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001294 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001295 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1296 args = self._GetCommonPresubmitArgs(verbose, upstream)
1297 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001298 if may_prompt:
1299 args.append('--may_prompt')
1300 if parallel:
1301 args.append('--parallel')
1302 if all_files:
1303 args.append('--all_files')
1304
1305 with gclient_utils.temporary_file() as description_file:
1306 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001307
1308 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001309 args.extend(['--json_output', json_output])
1310 args.extend(['--description_file', description_file])
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001311 args.extend(['--gerrit_project', self.GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001312
1313 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001314 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001315 if resultdb and realm:
1316 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1317 elif resultdb:
1318 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1319 # it is not required to pass the realm flag
1320 print('Note: ResultDB reporting will NOT be performed because --realm'
1321 ' was not specified. To enable ResultDB, please run the command'
1322 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001323
1324 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001325 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001326
Edward Lemur227d5102020-02-25 23:45:35 +00001327 metrics.collector.add_repeated('sub_commands', {
1328 'command': 'presubmit',
1329 'execution_time': time_time() - start,
1330 'exit_code': exit_code,
1331 })
1332
1333 if exit_code:
1334 sys.exit(exit_code)
1335
1336 json_results = gclient_utils.FileRead(json_output)
1337 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001338
Edward Lemur75526302020-02-27 22:31:05 +00001339 def RunPostUploadHook(self, verbose, upstream, description):
1340 args = self._GetCommonPresubmitArgs(verbose, upstream)
1341 args.append('--post_upload')
1342
1343 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001344 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001345 args.extend(['--description_file', description_file])
1346 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1347 p.wait()
1348
Edward Lemur5a644f82020-03-18 16:44:57 +00001349 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1350 # Get description message for upload.
1351 if self.GetIssue():
1352 description = self.FetchDescription()
1353 elif options.message:
1354 description = options.message
1355 else:
1356 description = _create_description_from_log(git_diff_args)
1357 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001358 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001359
1360 # Extract bug number from branch name.
1361 bug = options.bug
1362 fixed = options.fixed
1363 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1364 self.GetBranch())
1365 if not bug and not fixed and match:
1366 if match.group('type') == 'bug':
1367 bug = match.group('bugnum')
1368 else:
1369 fixed = match.group('bugnum')
1370
1371 change_description = ChangeDescription(description, bug, fixed)
1372
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001373 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1374 if options.add_owners_to:
1375 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
1376 client = owners_client.DepotToolsClient(
1377 root=settings.GetRoot(),
1378 branch=self.GetCommonAncestorWithUpstream())
1379 status = client.GetFilesApprovalStatus(
1380 files, [], options.tbrs + options.reviewers)
1381 missing_files = [
1382 f for f in files
1383 if status[f] == owners_client.OwnersClient.INSUFFICIENT_REVIEWERS
1384 ]
1385 owners = client.SuggestOwners(missing_files)
1386 if options.add_owners_to == 'TBR':
1387 assert isinstance(options.tbrs, list), options.tbrs
1388 options.tbrs.extend(owners)
1389 else:
1390 assert isinstance(options.reviewers, list), options.reviewers
1391 options.reviewers.extend(owners)
1392
Edward Lemur5a644f82020-03-18 16:44:57 +00001393 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001394 if options.reviewers or options.tbrs:
1395 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001396
1397 return change_description
1398
1399 def _GetTitleForUpload(self, options):
1400 # When not squashing, just return options.title.
1401 if not options.squash:
1402 return options.title
1403
1404 # On first upload, patchset title is always this string, while options.title
1405 # gets converted to first line of message.
1406 if not self.GetIssue():
1407 return 'Initial upload'
1408
1409 # When uploading subsequent patchsets, options.message is taken as the title
1410 # if options.title is not provided.
1411 if options.title:
1412 return options.title
1413 if options.message:
1414 return options.message.strip()
1415
1416 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001417 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001418 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001419 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001420 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1421 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001422
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001423 def CMDUpload(self, options, git_diff_args, orig_args):
1424 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001425 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001426 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001427 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001428 else:
1429 if self.GetBranch() is None:
1430 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1431
1432 # Default to diffing against common ancestor of upstream branch
1433 base_branch = self.GetCommonAncestorWithUpstream()
1434 git_diff_args = [base_branch, 'HEAD']
1435
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001436 # Fast best-effort checks to abort before running potentially expensive
1437 # hooks if uploading is likely to fail anyway. Passing these checks does
1438 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001439 self.EnsureAuthenticated(force=options.force)
1440 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001441
1442 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001443 watchlist = watchlists.Watchlists(settings.GetRoot())
1444 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001445 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001446 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001447
Edward Lemur5a644f82020-03-18 16:44:57 +00001448 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001449 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001450 hook_results = self.RunHook(
1451 committing=False,
1452 may_prompt=not options.force,
1453 verbose=options.verbose,
1454 parallel=options.parallel,
1455 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001456 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001457 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001458 resultdb=options.resultdb,
1459 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001460 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001461
Aaron Gable13101a62018-02-09 13:20:41 -08001462 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001463 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001464 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001465 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001466 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001467 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001468 # Run post upload hooks, if specified.
1469 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001470 self.RunPostUploadHook(
1471 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001472
1473 # Upload all dependencies if specified.
1474 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001475 print()
1476 print('--dependencies has been specified.')
1477 print('All dependent local branches will be re-uploaded.')
1478 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 # Remove the dependencies flag from args so that we do not end up in a
1480 # loop.
1481 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001482 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001483 return ret
1484
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001485 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001486 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001487
1488 Issue must have been already uploaded and known.
1489 """
1490 assert new_state in _CQState.ALL_STATES
1491 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001492 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001493 vote_map = {
1494 _CQState.NONE: 0,
1495 _CQState.DRY_RUN: 1,
1496 _CQState.COMMIT: 2,
1497 }
1498 labels = {'Commit-Queue': vote_map[new_state]}
1499 notify = False if new_state == _CQState.DRY_RUN else None
1500 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001501 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001502 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001503 return 0
1504 except KeyboardInterrupt:
1505 raise
1506 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001507 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001508 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001509 ' * Your project has no CQ,\n'
1510 ' * You don\'t have permission to change the CQ state,\n'
1511 ' * There\'s a bug in this code (see stack trace below).\n'
1512 'Consider specifying which bots to trigger manually or asking your '
1513 'project owners for permissions or contacting Chrome Infra at:\n'
1514 'https://www.chromium.org/infra\n\n' %
1515 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001516 # Still raise exception so that stack trace is printed.
1517 raise
1518
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001519 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001520 # Lazy load of configs.
1521 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001522 if self._gerrit_host and '.' not in self._gerrit_host:
1523 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1524 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001525 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001526 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001527 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001528 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001529 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1530 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531 return self._gerrit_host
1532
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001533 def _GetGitHost(self):
1534 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001535 remote_url = self.GetRemoteUrl()
1536 if not remote_url:
1537 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001538 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001539
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001540 def GetCodereviewServer(self):
1541 if not self._gerrit_server:
1542 # If we're on a branch then get the server potentially associated
1543 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001544 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001545 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001546 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001547 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001548 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001549 if not self._gerrit_server:
1550 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1551 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001552 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001553 parts[0] = parts[0] + '-review'
1554 self._gerrit_host = '.'.join(parts)
1555 self._gerrit_server = 'https://%s' % self._gerrit_host
1556 return self._gerrit_server
1557
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001558 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001559 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001560 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001561 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001562 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001563 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001564 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001565 if project.endswith('.git'):
1566 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001567 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1568 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1569 # gitiles/git-over-https protocol. E.g.,
1570 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1571 # as
1572 # https://chromium.googlesource.com/v8/v8
1573 if project.startswith('a/'):
1574 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001575 return project
1576
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001577 def _GerritChangeIdentifier(self):
1578 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1579
1580 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001581 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001582 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001583 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001584 if project:
1585 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1586 # Fall back on still unique, but less efficient change number.
1587 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001588
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001589 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001591 if settings.GetGerritSkipEnsureAuthenticated():
1592 # For projects with unusual authentication schemes.
1593 # See http://crbug.com/603378.
1594 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001595
1596 # Check presence of cookies only if using cookies-based auth method.
1597 cookie_auth = gerrit_util.Authenticator.get()
1598 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001599 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001600
Florian Mayerae510e82020-01-30 21:04:48 +00001601 remote_url = self.GetRemoteUrl()
1602 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001603 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001604 return
1605 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001606 logging.warning('Ignoring branch %(branch)s with non-https remote '
1607 '%(remote)s', {
1608 'branch': self.branch,
1609 'remote': self.GetRemoteUrl()
1610 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001611 return
1612
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001613 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614 self.GetCodereviewServer()
1615 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001616 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001617
1618 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1619 git_auth = cookie_auth.get_auth_header(git_host)
1620 if gerrit_auth and git_auth:
1621 if gerrit_auth == git_auth:
1622 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001623 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001624 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001625 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001626 ' %s\n'
1627 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001628 ' Consider running the following command:\n'
1629 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001630 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001631 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001632 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001633 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001634 cookie_auth.get_new_password_message(git_host)))
1635 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001636 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001637 return
1638 else:
1639 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001640 ([] if gerrit_auth else [self._gerrit_host]) +
1641 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001642 DieWithError('Credentials for the following hosts are required:\n'
1643 ' %s\n'
1644 'These are read from %s (or legacy %s)\n'
1645 '%s' % (
1646 '\n '.join(missing),
1647 cookie_auth.get_gitcookies_path(),
1648 cookie_auth.get_netrc_path(),
1649 cookie_auth.get_new_password_message(git_host)))
1650
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001651 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001652 if not self.GetIssue():
1653 return
1654
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001655 status = self._GetChangeDetail()['status']
1656 if status in ('MERGED', 'ABANDONED'):
1657 DieWithError('Change %s has been %s, new uploads are not allowed' %
1658 (self.GetIssueURL(),
1659 'submitted' if status == 'MERGED' else 'abandoned'))
1660
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001661 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1662 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1663 # Apparently this check is not very important? Otherwise get_auth_email
1664 # could have been added to other implementations of Authenticator.
1665 cookies_auth = gerrit_util.Authenticator.get()
1666 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001667 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001668
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001669 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001670 if self.GetIssueOwner() == cookies_user:
1671 return
1672 logging.debug('change %s owner is %s, cookies user is %s',
1673 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001674 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001675 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001676 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001677 if details['email'] == self.GetIssueOwner():
1678 return
1679 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001680 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001681 'as %s.\n'
1682 'Uploading may fail due to lack of permissions.' %
1683 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1684 confirm_or_exit(action='upload')
1685
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001686 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001687 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001688 or CQ status, assuming adherence to a common workflow.
1689
1690 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001691 * 'error' - error from review tool (including deleted issues)
1692 * 'unsent' - no reviewers added
1693 * 'waiting' - waiting for review
1694 * 'reply' - waiting for uploader to reply to review
1695 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001696 * 'dry-run' - dry-running in the CQ
1697 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001698 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001699 """
1700 if not self.GetIssue():
1701 return None
1702
1703 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001704 data = self._GetChangeDetail([
1705 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001706 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001707 return 'error'
1708
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001709 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001710 return 'closed'
1711
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001712 cq_label = data['labels'].get('Commit-Queue', {})
1713 max_cq_vote = 0
1714 for vote in cq_label.get('all', []):
1715 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1716 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001717 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001718 if max_cq_vote == 1:
1719 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001720
Aaron Gable9ab38c62017-04-06 14:36:33 -07001721 if data['labels'].get('Code-Review', {}).get('approved'):
1722 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001723
1724 if not data.get('reviewers', {}).get('REVIEWER', []):
1725 return 'unsent'
1726
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001727 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001728 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001729 while messages:
1730 m = messages.pop()
1731 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001732 # Ignore replies from CQ.
1733 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001734 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001735 # Most recent message was by owner.
1736 return 'waiting'
1737 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001738 # Some reply from non-owner.
1739 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001740
1741 # Somehow there are no messages even though there are reviewers.
1742 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001743
1744 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001745 if not self.GetIssue():
1746 return None
1747
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001748 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001749 patchset = data['revisions'][data['current_revision']]['_number']
1750 self.SetPatchset(patchset)
1751 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001752
Gavin Make61ccc52020-11-13 00:12:57 +00001753 def GetMostRecentDryRunPatchset(self):
1754 """Get patchsets equivalent to the most recent patchset and return
1755 the patchset with the latest dry run. If none have been dry run, return
1756 the latest patchset."""
1757 if not self.GetIssue():
1758 return None
1759
1760 data = self._GetChangeDetail(['ALL_REVISIONS'])
1761 patchset = data['revisions'][data['current_revision']]['_number']
1762 dry_run = set([int(m['_revision_number'])
1763 for m in data.get('messages', [])
1764 if m.get('tag', '').endswith('dry-run')])
1765
1766 for revision_info in sorted(data.get('revisions', {}).values(),
1767 key=lambda c: c['_number'], reverse=True):
1768 if revision_info['_number'] in dry_run:
1769 patchset = revision_info['_number']
1770 break
1771 if revision_info.get('kind', '') not in \
1772 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1773 break
1774 self.SetPatchset(patchset)
1775 return patchset
1776
Aaron Gable636b13f2017-07-14 10:42:48 -07001777 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001778 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001779 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001780 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001781
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001782 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001783 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001784 # CURRENT_REVISION is included to get the latest patchset so that
1785 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001786 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001787 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1788 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001789 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001790 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001791 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001792 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001793
1794 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001795 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001796 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001797 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001798 line_comments = file_comments.setdefault(path, [])
1799 line_comments.extend(
1800 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001801
1802 # Build dictionary of file comments for easy access and sorting later.
1803 # {author+date: {path: {patchset: {line: url+message}}}}
1804 comments = collections.defaultdict(
1805 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001806
1807 server = self.GetCodereviewServer()
1808 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1809 # /c/ is automatically added by short URL server.
1810 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1811 self.GetIssue())
1812 else:
1813 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1814
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001815 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001816 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001817 tag = comment.get('tag', '')
1818 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001819 continue
1820 key = (comment['author']['email'], comment['updated'])
1821 if comment.get('side', 'REVISION') == 'PARENT':
1822 patchset = 'Base'
1823 else:
1824 patchset = 'PS%d' % comment['patch_set']
1825 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001826 url = ('%s/%s/%s#%s%s' %
1827 (url_prefix, comment['patch_set'], path,
1828 'b' if comment.get('side') == 'PARENT' else '',
1829 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 comments[key][path][patchset][line] = (url, comment['message'])
1831
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001832 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001833 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001834 summary = self._BuildCommentSummary(msg, comments, readable)
1835 if summary:
1836 summaries.append(summary)
1837 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001838
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001839 @staticmethod
1840 def _BuildCommentSummary(msg, comments, readable):
1841 key = (msg['author']['email'], msg['date'])
1842 # Don't bother showing autogenerated messages that don't have associated
1843 # file or line comments. this will filter out most autogenerated
1844 # messages, but will keep robot comments like those from Tricium.
1845 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1846 if is_autogenerated and not comments.get(key):
1847 return None
1848 message = msg['message']
1849 # Gerrit spits out nanoseconds.
1850 assert len(msg['date'].split('.')[-1]) == 9
1851 date = datetime.datetime.strptime(msg['date'][:-3],
1852 '%Y-%m-%d %H:%M:%S.%f')
1853 if key in comments:
1854 message += '\n'
1855 for path, patchsets in sorted(comments.get(key, {}).items()):
1856 if readable:
1857 message += '\n%s' % path
1858 for patchset, lines in sorted(patchsets.items()):
1859 for line, (url, content) in sorted(lines.items()):
1860 if line:
1861 line_str = 'Line %d' % line
1862 path_str = '%s:%d:' % (path, line)
1863 else:
1864 line_str = 'File comment'
1865 path_str = '%s:0:' % path
1866 if readable:
1867 message += '\n %s, %s: %s' % (patchset, line_str, url)
1868 message += '\n %s\n' % content
1869 else:
1870 message += '\n%s ' % path_str
1871 message += '\n%s\n' % content
1872
1873 return _CommentSummary(
1874 date=date,
1875 message=message,
1876 sender=msg['author']['email'],
1877 autogenerated=is_autogenerated,
1878 # These could be inferred from the text messages and correlated with
1879 # Code-Review label maximum, however this is not reliable.
1880 # Leaving as is until the need arises.
1881 approval=False,
1882 disapproval=False,
1883 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001884
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001885 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001886 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001887 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001888
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001889 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001890 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001891 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001892 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001893
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001894 def _GetChangeDetail(self, options=None):
1895 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001896 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001897 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001898
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001899 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001900 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001901 options.append('CURRENT_COMMIT')
1902
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001903 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001904 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001905 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001906
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001907 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1908 # Assumption: data fetched before with extra options is suitable
1909 # for return for a smaller set of options.
1910 # For example, if we cached data for
1911 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1912 # and request is for options=[CURRENT_REVISION],
1913 # THEN we can return prior cached data.
1914 if options_set.issubset(cached_options_set):
1915 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001916
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001917 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001918 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001919 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001920 except gerrit_util.GerritError as e:
1921 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001922 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001923 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001924
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001925 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001926 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001927
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001928 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001929 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001930 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001931 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001932 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001933 except gerrit_util.GerritError as e:
1934 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001935 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001936 raise
agable32978d92016-11-01 12:55:02 -07001937 return data
1938
Karen Qian40c19422019-03-13 21:28:29 +00001939 def _IsCqConfigured(self):
1940 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001941 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001942
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001943 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001944 if git_common.is_dirty_git_tree('land'):
1945 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001946
tandriid60367b2016-06-22 05:25:12 -07001947 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001948 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001949 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001950 'which can test and land changes for you. '
1951 'Are you sure you wish to bypass it?\n',
1952 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001953 differs = True
tandriic4344b52016-08-29 06:04:54 -07001954 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001955 # Note: git diff outputs nothing if there is no diff.
1956 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001957 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001958 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001959 if detail['current_revision'] == last_upload:
1960 differs = False
1961 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001962 print('WARNING: Local branch contents differ from latest uploaded '
1963 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001964 if differs:
1965 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001966 confirm_or_exit(
1967 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1968 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001969 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001970 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001971 upstream = self.GetCommonAncestorWithUpstream()
1972 if self.GetIssue():
1973 description = self.FetchDescription()
1974 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001975 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001976 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001977 committing=True,
1978 may_prompt=not force,
1979 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001980 parallel=parallel,
1981 upstream=upstream,
1982 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001983 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001984 resultdb=resultdb,
1985 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001986
1987 self.SubmitIssue(wait_for_merge=True)
1988 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001989 links = self._GetChangeCommit().get('web_links', [])
1990 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001991 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001992 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001993 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001994 return 0
1995
Edward Lemurf38bc172019-09-03 21:02:13 +00001996 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 assert parsed_issue_arg.valid
1998
Edward Lemur125d60a2019-09-13 18:25:41 +00001999 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000
2001 if parsed_issue_arg.hostname:
2002 self._gerrit_host = parsed_issue_arg.hostname
2003 self._gerrit_server = 'https://%s' % self._gerrit_host
2004
tandriic2405f52016-10-10 08:13:15 -07002005 try:
2006 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002007 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002008 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002009
2010 if not parsed_issue_arg.patchset:
2011 # Use current revision by default.
2012 revision_info = detail['revisions'][detail['current_revision']]
2013 patchset = int(revision_info['_number'])
2014 else:
2015 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002016 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002017 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2018 break
2019 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002020 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002021 (parsed_issue_arg.patchset, self.GetIssue()))
2022
Edward Lemur125d60a2019-09-13 18:25:41 +00002023 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002024 if remote_url.endswith('.git'):
2025 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002026 remote_url = remote_url.rstrip('/')
2027
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002028 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002029 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002030
2031 if remote_url != fetch_info['url']:
2032 DieWithError('Trying to patch a change from %s but this repo appears '
2033 'to be %s.' % (fetch_info['url'], remote_url))
2034
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002035 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002036
Aaron Gable62619a32017-06-16 08:22:09 -07002037 if force:
2038 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2039 print('Checked out commit for change %i patchset %i locally' %
2040 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002041 elif nocommit:
2042 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2043 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002044 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002045 RunGit(['cherry-pick', 'FETCH_HEAD'])
2046 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002047 (parsed_issue_arg.issue, patchset))
2048 print('Note: this created a local commit which does not have '
2049 'the same hash as the one uploaded for review. This will make '
2050 'uploading changes based on top of this branch difficult.\n'
2051 'If you want to do that, use "git cl patch --force" instead.')
2052
Stefan Zagerd08043c2017-10-12 12:07:02 -07002053 if self.GetBranch():
2054 self.SetIssue(parsed_issue_arg.issue)
2055 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002056 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002057 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2058 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2059 else:
2060 print('WARNING: You are in detached HEAD state.\n'
2061 'The patch has been applied to your checkout, but you will not be '
2062 'able to upload a new patch set to the gerrit issue.\n'
2063 'Try using the \'-b\' option if you would like to work on a '
2064 'branch and/or upload a new patch set.')
2065
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066 return 0
2067
tandrii16e0b4e2016-06-07 10:34:28 -07002068 def _GerritCommitMsgHookCheck(self, offer_removal):
2069 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2070 if not os.path.exists(hook):
2071 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002072 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2073 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002074 data = gclient_utils.FileRead(hook)
2075 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2076 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002077 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002078 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002079 'and may interfere with it in subtle ways.\n'
2080 'We recommend you remove the commit-msg hook.')
2081 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002082 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002083 gclient_utils.rm_file_or_tree(hook)
2084 print('Gerrit commit-msg hook removed.')
2085 else:
2086 print('OK, will keep Gerrit commit-msg hook in place.')
2087
Edward Lemur1b52d872019-05-09 21:12:12 +00002088 def _CleanUpOldTraces(self):
2089 """Keep only the last |MAX_TRACES| traces."""
2090 try:
2091 traces = sorted([
2092 os.path.join(TRACES_DIR, f)
2093 for f in os.listdir(TRACES_DIR)
2094 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2095 and not f.startswith('tmp'))
2096 ])
2097 traces_to_delete = traces[:-MAX_TRACES]
2098 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002099 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002100 except OSError:
2101 print('WARNING: Failed to remove old git traces from\n'
2102 ' %s'
2103 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002104
Edward Lemur5737f022019-05-17 01:24:00 +00002105 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002106 """Zip and write the git push traces stored in traces_dir."""
2107 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002108 traces_zip = trace_name + '-traces'
2109 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002110 # Create a temporary dir to store git config and gitcookies in. It will be
2111 # compressed and stored next to the traces.
2112 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002113 git_info_zip = trace_name + '-git-info'
2114
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002115 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002116
Edward Lemur1b52d872019-05-09 21:12:12 +00002117 git_push_metadata['trace_name'] = trace_name
2118 gclient_utils.FileWrite(
2119 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2120
2121 # Keep only the first 6 characters of the git hashes on the packet
2122 # trace. This greatly decreases size after compression.
2123 packet_traces = os.path.join(traces_dir, 'trace-packet')
2124 if os.path.isfile(packet_traces):
2125 contents = gclient_utils.FileRead(packet_traces)
2126 gclient_utils.FileWrite(
2127 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2128 shutil.make_archive(traces_zip, 'zip', traces_dir)
2129
2130 # Collect and compress the git config and gitcookies.
2131 git_config = RunGit(['config', '-l'])
2132 gclient_utils.FileWrite(
2133 os.path.join(git_info_dir, 'git-config'),
2134 git_config)
2135
2136 cookie_auth = gerrit_util.Authenticator.get()
2137 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2138 gitcookies_path = cookie_auth.get_gitcookies_path()
2139 if os.path.isfile(gitcookies_path):
2140 gitcookies = gclient_utils.FileRead(gitcookies_path)
2141 gclient_utils.FileWrite(
2142 os.path.join(git_info_dir, 'gitcookies'),
2143 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2144 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2145
Edward Lemur1b52d872019-05-09 21:12:12 +00002146 gclient_utils.rmtree(git_info_dir)
2147
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002148 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002149 """Run git push and collect the traces resulting from the execution."""
2150 # Create a temporary directory to store traces in. Traces will be compressed
2151 # and stored in a 'traces' dir inside depot_tools.
2152 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002153 trace_name = os.path.join(
2154 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002155
2156 env = os.environ.copy()
2157 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2158 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002159 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002160 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2161 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2162 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2163
2164 try:
2165 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002166 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002167 before_push = time_time()
2168 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002169 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002170 env=env,
2171 print_stdout=True,
2172 # Flush after every line: useful for seeing progress when running as
2173 # recipe.
2174 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002175 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002176 except subprocess2.CalledProcessError as e:
2177 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002178 raise GitPushError(
2179 'Failed to create a change. Please examine output above for the '
2180 'reason of the failure.\n'
2181 'Hint: run command below to diagnose common Git/Gerrit '
2182 'credential problems:\n'
2183 ' git cl creds-check\n'
2184 '\n'
2185 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2186 'component including the files below.\n'
2187 'Review the files before upload, since they might contain sensitive '
2188 'information.\n'
2189 'Set the Restrict-View-Google label so that they are not publicly '
2190 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002191 finally:
2192 execution_time = time_time() - before_push
2193 metrics.collector.add_repeated('sub_commands', {
2194 'command': 'git push',
2195 'execution_time': execution_time,
2196 'exit_code': push_returncode,
2197 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2198 })
2199
Edward Lemur1b52d872019-05-09 21:12:12 +00002200 git_push_metadata['execution_time'] = execution_time
2201 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002202 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002203
Edward Lemur1b52d872019-05-09 21:12:12 +00002204 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002205 gclient_utils.rmtree(traces_dir)
2206
2207 return push_stdout
2208
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002209 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2210 change_desc):
2211 """Upload the current branch to Gerrit, retry if new remote HEAD is
2212 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002213 remote, remote_branch = self.GetRemoteBranch()
2214 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2215
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002216 try:
2217 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002218 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002219 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002220 # Repository might be in the middle of transition to main branch as
2221 # default, and uploads to old default might be blocked.
2222 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002223 DieWithError(str(e), change_desc)
2224
Josip Sokcevicb631a882021-01-06 18:18:10 +00002225 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2226 self.GetGerritProject())
2227 if project_head == branch:
2228 DieWithError(str(e), change_desc)
2229 branch = project_head
2230
2231 print("WARNING: Fetching remote state and retrying upload to default "
2232 "branch...")
2233 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002234 options.edit_description = False
2235 options.force = True
2236 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002237 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2238 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002239 except GitPushError as e:
2240 DieWithError(str(e), change_desc)
2241
2242 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002243 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002244 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002245 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002246 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002247 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002248 # User requested to change description
2249 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002250 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002251 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002252 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002253 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002254 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002255 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002256 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002257 if len(change_ids) == 1:
2258 change_id = change_ids[0]
2259 else:
2260 change_id = GenerateGerritChangeId(change_desc.description)
2261 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002262
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002263 if options.preserve_tryjobs:
2264 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002265
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002266 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002267 parent = self._ComputeParent(
2268 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002270 with gclient_utils.temporary_file() as desc_tempfile:
2271 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2272 ref_to_push = RunGit(
2273 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002274 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002275 if not git_footers.get_footer_change_id(change_desc.description):
2276 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002277 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002278 self._AddChangeIdToCommitMessage(
2279 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002280 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002281 # For no-squash mode, we assume the remote called "origin" is the one we
2282 # want. It is not worthwhile to support different workflows for
2283 # no-squash mode.
2284 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2286
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002287 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2289 ref_to_push)]).splitlines()
2290 if len(commits) > 1:
2291 print('WARNING: This will upload %d commits. Run the following command '
2292 'to see which commits will be uploaded: ' % len(commits))
2293 print('git log %s..%s' % (parent, ref_to_push))
2294 print('You can also use `git squash-branch` to squash these into a '
2295 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002296 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002298 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002299 cc = []
2300 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2301 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2302 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002303 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002304 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002305 if options.cc:
2306 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002307 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002308 if change_desc.get_cced():
2309 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002310 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002311 valid_accounts = set(reviewers + cc)
2312 # TODO(crbug/877717): relax this for all hosts.
2313 else:
2314 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002315 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002316 logging.info('accounts %s are recognized, %s invalid',
2317 sorted(valid_accounts),
2318 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002319
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002320 # Extra options that can be specified at push time. Doc:
2321 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002322 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002323
Aaron Gable844cf292017-06-28 11:32:59 -07002324 # By default, new changes are started in WIP mode, and subsequent patchsets
2325 # don't send email. At any time, passing --send-mail will mark the change
2326 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002327 if options.send_mail:
2328 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002329 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002330 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002331 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002332 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002333 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002334
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002335 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002336 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002337
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002338 # Set options.title in case user was prompted in _GetTitleForUpload and
2339 # _CMDUploadChange needs to be called again.
2340 options.title = self._GetTitleForUpload(options)
2341 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002342 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002343 refspec_opts.append(
2344 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002345
agablec6787972016-09-09 16:13:34 -07002346 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002347 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002348
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002349 for r in sorted(reviewers):
2350 if r in valid_accounts:
2351 refspec_opts.append('r=%s' % r)
2352 reviewers.remove(r)
2353 else:
2354 # TODO(tandrii): this should probably be a hard failure.
2355 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2356 % r)
2357 for c in sorted(cc):
2358 # refspec option will be rejected if cc doesn't correspond to an
2359 # account, even though REST call to add such arbitrary cc may succeed.
2360 if c in valid_accounts:
2361 refspec_opts.append('cc=%s' % c)
2362 cc.remove(c)
2363
rmistry9eadede2016-09-19 11:22:43 -07002364 if options.topic:
2365 # Documentation on Gerrit topics is here:
2366 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002367 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002368
Edward Lemur687ca902018-12-05 02:30:30 +00002369 if options.enable_auto_submit:
2370 refspec_opts.append('l=Auto-Submit+1')
2371 if options.use_commit_queue:
2372 refspec_opts.append('l=Commit-Queue+2')
2373 elif options.cq_dry_run:
2374 refspec_opts.append('l=Commit-Queue+1')
2375
2376 if change_desc.get_reviewers(tbr_only=True):
2377 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002378 self.GetGerritHost(),
2379 self.GetGerritProject())
Edward Lemur687ca902018-12-05 02:30:30 +00002380 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002381
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002382 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002383 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002384 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002385 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002386 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2387
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002388 refspec_suffix = ''
2389 if refspec_opts:
2390 refspec_suffix = '%' + ','.join(refspec_opts)
2391 assert ' ' not in refspec_suffix, (
2392 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2393 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2394
Edward Lemur1b52d872019-05-09 21:12:12 +00002395 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002396 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002397 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002398 'change_id': change_id,
2399 'description': change_desc.description,
2400 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002401 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2402 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403
2404 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002405 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 change_numbers = [m.group(1)
2407 for m in map(regex.match, push_stdout.splitlines())
2408 if m]
2409 if len(change_numbers) != 1:
2410 DieWithError(
2411 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002412 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002414 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002415
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002416 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002417 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002418 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002419 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002420 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002421 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002422 reviewers, cc,
2423 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002424
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 return 0
2426
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002427 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2428 change_desc):
2429 """Computes parent of the generated commit to be uploaded to Gerrit.
2430
2431 Returns revision or a ref name.
2432 """
2433 if custom_cl_base:
2434 # Try to avoid creating additional unintended CLs when uploading, unless
2435 # user wants to take this risk.
2436 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2437 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2438 local_ref_of_target_remote])
2439 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002440 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002441 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2442 'If you proceed with upload, more than 1 CL may be created by '
2443 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2444 'If you are certain that specified base `%s` has already been '
2445 'uploaded to Gerrit as another CL, you may proceed.\n' %
2446 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2447 if not force:
2448 confirm_or_exit(
2449 'Do you take responsibility for cleaning up potential mess '
2450 'resulting from proceeding with upload?',
2451 action='upload')
2452 return custom_cl_base
2453
Aaron Gablef97e33d2017-03-30 15:44:27 -07002454 if remote != '.':
2455 return self.GetCommonAncestorWithUpstream()
2456
2457 # If our upstream branch is local, we base our squashed commit on its
2458 # squashed version.
2459 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2460
Aaron Gablef97e33d2017-03-30 15:44:27 -07002461 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002462 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002463 if upstream_branch_name == 'main':
2464 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002465
2466 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002467 # TODO(tandrii): consider checking parent change in Gerrit and using its
2468 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2469 # the tree hash of the parent branch. The upside is less likely bogus
2470 # requests to reupload parent change just because it's uploadhash is
2471 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002472 parent = scm.GIT.GetBranchConfig(
2473 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002474 # Verify that the upstream branch has been uploaded too, otherwise
2475 # Gerrit will create additional CLs when uploading.
2476 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2477 RunGitSilent(['rev-parse', parent + ':'])):
2478 DieWithError(
2479 '\nUpload upstream branch %s first.\n'
2480 'It is likely that this branch has been rebased since its last '
2481 'upload, so you just need to upload it again.\n'
2482 '(If you uploaded it with --no-squash, then branch dependencies '
2483 'are not supported, and you should reupload with --squash.)'
2484 % upstream_branch_name,
2485 change_desc)
2486 return parent
2487
Edward Lemura12175c2020-03-09 16:58:26 +00002488 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002489 """Re-commits using the current message, assumes the commit hook is in
2490 place.
2491 """
Edward Lemura12175c2020-03-09 16:58:26 +00002492 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002493 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002494 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002495 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002496 return new_log_desc
2497 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002498 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002499
tandriie113dfd2016-10-11 10:20:12 -07002500 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002501 try:
2502 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002503 except GerritChangeNotExists:
2504 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002505
2506 if data['status'] in ('ABANDONED', 'MERGED'):
2507 return 'CL %s is closed' % self.GetIssue()
2508
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002509 def GetGerritChange(self, patchset=None):
2510 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002511 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002512 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002513 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002514 data = self._GetChangeDetail(['ALL_REVISIONS'])
2515
2516 assert host and issue and patchset, 'CL must be uploaded first'
2517
2518 has_patchset = any(
2519 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002520 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002521 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002522 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002523 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002524
tandrii8c5a3532016-11-04 07:52:02 -07002525 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002526 'host': host,
2527 'change': issue,
2528 'project': data['project'],
2529 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002530 }
tandriie113dfd2016-10-11 10:20:12 -07002531
tandriide281ae2016-10-12 06:02:30 -07002532 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002533 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002534
Edward Lemur707d70b2018-02-07 00:50:14 +01002535 def GetReviewers(self):
2536 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002537 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002538
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002539
Lei Zhang8a0efc12020-08-05 19:58:45 +00002540def _get_bug_line_values(default_project_prefix, bugs):
2541 """Given default_project_prefix and comma separated list of bugs, yields bug
2542 line values.
tandriif9aefb72016-07-01 09:06:51 -07002543
2544 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002545 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002546 * string, which is left as is.
2547
2548 This function may produce more than one line, because bugdroid expects one
2549 project per line.
2550
Lei Zhang8a0efc12020-08-05 19:58:45 +00002551 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002552 ['v8:123', 'chromium:789']
2553 """
2554 default_bugs = []
2555 others = []
2556 for bug in bugs.split(','):
2557 bug = bug.strip()
2558 if bug:
2559 try:
2560 default_bugs.append(int(bug))
2561 except ValueError:
2562 others.append(bug)
2563
2564 if default_bugs:
2565 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002566 if default_project_prefix:
2567 if not default_project_prefix.endswith(':'):
2568 default_project_prefix += ':'
2569 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002570 else:
2571 yield default_bugs
2572 for other in sorted(others):
2573 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2574 yield other
2575
2576
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002577class ChangeDescription(object):
2578 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002579 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002580 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002581 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002582 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002583 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002584 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2585 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002586 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002587 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002588
Dan Beamd8b04ca2019-10-10 21:23:26 +00002589 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002590 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002591 if bug:
2592 regexp = re.compile(self.BUG_LINE)
2593 prefix = settings.GetBugPrefix()
2594 if not any((regexp.match(line) for line in self._description_lines)):
2595 values = list(_get_bug_line_values(prefix, bug))
2596 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002597 if fixed:
2598 regexp = re.compile(self.FIXED_LINE)
2599 prefix = settings.GetBugPrefix()
2600 if not any((regexp.match(line) for line in self._description_lines)):
2601 values = list(_get_bug_line_values(prefix, fixed))
2602 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002603
agable@chromium.org42c20792013-09-12 17:34:49 +00002604 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002605 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002606 return '\n'.join(self._description_lines)
2607
2608 def set_description(self, desc):
2609 if isinstance(desc, basestring):
2610 lines = desc.splitlines()
2611 else:
2612 lines = [line.rstrip() for line in desc]
2613 while lines and not lines[0]:
2614 lines.pop(0)
2615 while lines and not lines[-1]:
2616 lines.pop(-1)
2617 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002618
Edward Lemur5a644f82020-03-18 16:44:57 +00002619 def ensure_change_id(self, change_id):
2620 description = self.description
2621 footer_change_ids = git_footers.get_footer_change_id(description)
2622 # Make sure that the Change-Id in the description matches the given one.
2623 if footer_change_ids != [change_id]:
2624 if footer_change_ids:
2625 # Remove any existing Change-Id footers since they don't match the
2626 # expected change_id footer.
2627 description = git_footers.remove_footer(description, 'Change-Id')
2628 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2629 'if you want to set a new one.')
2630 # Add the expected Change-Id footer.
2631 description = git_footers.add_footer_change_id(description, change_id)
2632 self.set_description(description)
2633
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002634 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002635 """Rewrites the R=/TBR= line(s) as a single line each.
2636
2637 Args:
2638 reviewers (list(str)) - list of additional emails to use for reviewers.
2639 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002640 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002641 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002642 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002643
2644 reviewers = set(reviewers)
2645 tbrs = set(tbrs)
2646 LOOKUP = {
2647 'TBR': tbrs,
2648 'R': reviewers,
2649 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002650
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002651 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002652 regexp = re.compile(self.R_LINE)
2653 matches = [regexp.match(line) for line in self._description_lines]
2654 new_desc = [l for i, l in enumerate(self._description_lines)
2655 if not matches[i]]
2656 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002657
agable@chromium.org42c20792013-09-12 17:34:49 +00002658 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002659
2660 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002661 for match in matches:
2662 if not match:
2663 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002664 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2665
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002666 # If any folks ended up in both groups, remove them from tbrs.
2667 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002668
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002669 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2670 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002671
2672 # Put the new lines in the description where the old first R= line was.
2673 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2674 if 0 <= line_loc < len(self._description_lines):
2675 if new_tbr_line:
2676 self._description_lines.insert(line_loc, new_tbr_line)
2677 if new_r_line:
2678 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002679 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002680 if new_r_line:
2681 self.append_footer(new_r_line)
2682 if new_tbr_line:
2683 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002684
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002685 def set_preserve_tryjobs(self):
2686 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2687 footers = git_footers.parse_footers(self.description)
2688 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2689 if v.lower() == 'true':
2690 return
2691 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2692
Anthony Polito8b955342019-09-24 19:01:36 +00002693 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002694 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002695 self.set_description([
2696 '# Enter a description of the change.',
2697 '# This will be displayed on the codereview site.',
2698 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002699 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002700 '--------------------',
2701 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002702 bug_regexp = re.compile(self.BUG_LINE)
2703 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002704 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002705 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002706
Dan Beamd8b04ca2019-10-10 21:23:26 +00002707 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002708 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002709
Bruce Dawsonfc487042020-10-27 19:11:37 +00002710 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002711 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002712 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002713 if not content:
2714 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002715 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002716
Bruce Dawson2377b012018-01-11 16:46:49 -08002717 # Strip off comments and default inserted "Bug:" line.
2718 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002719 (line.startswith('#') or
2720 line.rstrip() == "Bug:" or
2721 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002722 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002723 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002724 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002725
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002726 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002727 """Adds a footer line to the description.
2728
2729 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2730 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2731 that Gerrit footers are always at the end.
2732 """
2733 parsed_footer_line = git_footers.parse_footer(line)
2734 if parsed_footer_line:
2735 # Line is a gerrit footer in the form: Footer-Key: any value.
2736 # Thus, must be appended observing Gerrit footer rules.
2737 self.set_description(
2738 git_footers.add_footer(self.description,
2739 key=parsed_footer_line[0],
2740 value=parsed_footer_line[1]))
2741 return
2742
2743 if not self._description_lines:
2744 self._description_lines.append(line)
2745 return
2746
2747 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2748 if gerrit_footers:
2749 # git_footers.split_footers ensures that there is an empty line before
2750 # actual (gerrit) footers, if any. We have to keep it that way.
2751 assert top_lines and top_lines[-1] == ''
2752 top_lines, separator = top_lines[:-1], top_lines[-1:]
2753 else:
2754 separator = [] # No need for separator if there are no gerrit_footers.
2755
2756 prev_line = top_lines[-1] if top_lines else ''
2757 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2758 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2759 top_lines.append('')
2760 top_lines.append(line)
2761 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002762
tandrii99a72f22016-08-17 14:33:24 -07002763 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002764 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002765 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002766 reviewers = [match.group(2).strip()
2767 for match in matches
2768 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002770
bradnelsond975b302016-10-23 12:20:23 -07002771 def get_cced(self):
2772 """Retrieves the list of reviewers."""
2773 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2774 cced = [match.group(2).strip() for match in matches if match]
2775 return cleanup_list(cced)
2776
Nodir Turakulov23b82142017-11-16 11:04:25 -08002777 def get_hash_tags(self):
2778 """Extracts and sanitizes a list of Gerrit hashtags."""
2779 subject = (self._description_lines or ('',))[0]
2780 subject = re.sub(
2781 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2782
2783 tags = []
2784 start = 0
2785 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2786 while True:
2787 m = bracket_exp.match(subject, start)
2788 if not m:
2789 break
2790 tags.append(self.sanitize_hash_tag(m.group(1)))
2791 start = m.end()
2792
2793 if not tags:
2794 # Try "Tag: " prefix.
2795 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2796 if m:
2797 tags.append(self.sanitize_hash_tag(m.group(1)))
2798 return tags
2799
2800 @classmethod
2801 def sanitize_hash_tag(cls, tag):
2802 """Returns a sanitized Gerrit hash tag.
2803
2804 A sanitized hashtag can be used as a git push refspec parameter value.
2805 """
2806 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2807
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002809def FindCodereviewSettingsFile(filename='codereview.settings'):
2810 """Finds the given file starting in the cwd and going up.
2811
2812 Only looks up to the top of the repository unless an
2813 'inherit-review-settings-ok' file exists in the root of the repository.
2814 """
2815 inherit_ok_file = 'inherit-review-settings-ok'
2816 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002817 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002818 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2819 root = '/'
2820 while True:
2821 if filename in os.listdir(cwd):
2822 if os.path.isfile(os.path.join(cwd, filename)):
2823 return open(os.path.join(cwd, filename))
2824 if cwd == root:
2825 break
2826 cwd = os.path.dirname(cwd)
2827
2828
2829def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002830 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002831 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002832
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002833 def SetProperty(name, setting, unset_error_ok=False):
2834 fullname = 'rietveld.' + name
2835 if setting in keyvals:
2836 RunGit(['config', fullname, keyvals[setting]])
2837 else:
2838 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2839
tandrii48df5812016-10-17 03:55:37 -07002840 if not keyvals.get('GERRIT_HOST', False):
2841 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002842 # Only server setting is required. Other settings can be absent.
2843 # In that case, we ignore errors raised during option deletion attempt.
2844 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2845 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2846 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002847 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002848 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2849 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002850 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2851 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002852 SetProperty(
2853 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002854
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002855 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002856 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002857
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002858 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002859 RunGit(['config', 'gerrit.squash-uploads',
2860 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002861
tandrii@chromium.org28253532016-04-14 13:46:56 +00002862 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002863 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002864 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2865
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002866 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002867 # should be of the form
2868 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2869 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002870 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2871 keyvals['ORIGIN_URL_CONFIG']])
2872
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002873
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002874def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002875 """Downloads a network object to a local file, like urllib.urlretrieve.
2876
2877 This is necessary because urllib is broken for SSL connections via a proxy.
2878 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002879 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002880 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002881
2882
ukai@chromium.org712d6102013-11-27 00:52:58 +00002883def hasSheBang(fname):
2884 """Checks fname is a #! script."""
2885 with open(fname) as f:
2886 return f.read(2).startswith('#!')
2887
2888
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002889def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002890 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002891
2892 Args:
2893 force: True to update hooks. False to install hooks if not present.
2894 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002895 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002896 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2897 if not os.access(dst, os.X_OK):
2898 if os.path.exists(dst):
2899 if not force:
2900 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002901 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002902 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002903 if not hasSheBang(dst):
2904 DieWithError('Not a script: %s\n'
2905 'You need to download from\n%s\n'
2906 'into .git/hooks/commit-msg and '
2907 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002908 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2909 except Exception:
2910 if os.path.exists(dst):
2911 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002912 DieWithError('\nFailed to download hooks.\n'
2913 'You need to download from\n%s\n'
2914 'into .git/hooks/commit-msg and '
2915 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002916
2917
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002918class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002919 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002920
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002921 _GOOGLESOURCE = 'googlesource.com'
2922
2923 def __init__(self):
2924 # Cached list of [host, identity, source], where source is either
2925 # .gitcookies or .netrc.
2926 self._all_hosts = None
2927
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002928 def ensure_configured_gitcookies(self):
2929 """Runs checks and suggests fixes to make git use .gitcookies from default
2930 path."""
2931 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2932 configured_path = RunGitSilent(
2933 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002934 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002935 if configured_path:
2936 self._ensure_default_gitcookies_path(configured_path, default)
2937 else:
2938 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002939
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002940 @staticmethod
2941 def _ensure_default_gitcookies_path(configured_path, default_path):
2942 assert configured_path
2943 if configured_path == default_path:
2944 print('git is already configured to use your .gitcookies from %s' %
2945 configured_path)
2946 return
2947
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002948 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002949 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2950 (configured_path, default_path))
2951
2952 if not os.path.exists(configured_path):
2953 print('However, your configured .gitcookies file is missing.')
2954 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2955 action='reconfigure')
2956 RunGit(['config', '--global', 'http.cookiefile', default_path])
2957 return
2958
2959 if os.path.exists(default_path):
2960 print('WARNING: default .gitcookies file already exists %s' %
2961 default_path)
2962 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2963 default_path)
2964
2965 confirm_or_exit('Move existing .gitcookies to default location?',
2966 action='move')
2967 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002968 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002969 print('Moved and reconfigured git to use .gitcookies from %s' %
2970 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002971
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002972 @staticmethod
2973 def _configure_gitcookies_path(default_path):
2974 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2975 if os.path.exists(netrc_path):
2976 print('You seem to be using outdated .netrc for git credentials: %s' %
2977 netrc_path)
2978 print('This tool will guide you through setting up recommended '
2979 '.gitcookies store for git credentials.\n'
2980 '\n'
2981 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2982 ' git config --global --unset http.cookiefile\n'
2983 ' mv %s %s.backup\n\n' % (default_path, default_path))
2984 confirm_or_exit(action='setup .gitcookies')
2985 RunGit(['config', '--global', 'http.cookiefile', default_path])
2986 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002987
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002988 def get_hosts_with_creds(self, include_netrc=False):
2989 if self._all_hosts is None:
2990 a = gerrit_util.CookiesAuthenticator()
2991 self._all_hosts = [
2992 (h, u, s)
2993 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002994 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2995 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002996 )
2997 if h.endswith(self._GOOGLESOURCE)
2998 ]
2999
3000 if include_netrc:
3001 return self._all_hosts
3002 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3003
3004 def print_current_creds(self, include_netrc=False):
3005 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3006 if not hosts:
3007 print('No Git/Gerrit credentials found')
3008 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003009 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003010 header = [('Host', 'User', 'Which file'),
3011 ['=' * l for l in lengths]]
3012 for row in (header + hosts):
3013 print('\t'.join((('%%+%ds' % l) % s)
3014 for l, s in zip(lengths, row)))
3015
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003016 @staticmethod
3017 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003018 """Parses identity "git-<username>.domain" into <username> and domain."""
3019 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003020 # distinguishable from sub-domains. But we do know typical domains:
3021 if identity.endswith('.chromium.org'):
3022 domain = 'chromium.org'
3023 username = identity[:-len('.chromium.org')]
3024 else:
3025 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003026 if username.startswith('git-'):
3027 username = username[len('git-'):]
3028 return username, domain
3029
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003030 def _canonical_git_googlesource_host(self, host):
3031 """Normalizes Gerrit hosts (with '-review') to Git host."""
3032 assert host.endswith(self._GOOGLESOURCE)
3033 # Prefix doesn't include '.' at the end.
3034 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3035 if prefix.endswith('-review'):
3036 prefix = prefix[:-len('-review')]
3037 return prefix + '.' + self._GOOGLESOURCE
3038
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003039 def _canonical_gerrit_googlesource_host(self, host):
3040 git_host = self._canonical_git_googlesource_host(host)
3041 prefix = git_host.split('.', 1)[0]
3042 return prefix + '-review.' + self._GOOGLESOURCE
3043
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003044 def _get_counterpart_host(self, host):
3045 assert host.endswith(self._GOOGLESOURCE)
3046 git = self._canonical_git_googlesource_host(host)
3047 gerrit = self._canonical_gerrit_googlesource_host(git)
3048 return git if gerrit == host else gerrit
3049
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003050 def has_generic_host(self):
3051 """Returns whether generic .googlesource.com has been configured.
3052
3053 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3054 """
3055 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3056 if host == '.' + self._GOOGLESOURCE:
3057 return True
3058 return False
3059
3060 def _get_git_gerrit_identity_pairs(self):
3061 """Returns map from canonic host to pair of identities (Git, Gerrit).
3062
3063 One of identities might be None, meaning not configured.
3064 """
3065 host_to_identity_pairs = {}
3066 for host, identity, _ in self.get_hosts_with_creds():
3067 canonical = self._canonical_git_googlesource_host(host)
3068 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3069 idx = 0 if canonical == host else 1
3070 pair[idx] = identity
3071 return host_to_identity_pairs
3072
3073 def get_partially_configured_hosts(self):
3074 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003075 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003076 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003077 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003078
3079 def get_conflicting_hosts(self):
3080 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003081 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003082 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003083 if None not in (i1, i2) and i1 != i2)
3084
3085 def get_duplicated_hosts(self):
3086 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003087 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003088
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003089
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003090 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003091 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003092 hosts = sorted(hosts)
3093 assert hosts
3094 if extra_column_func is None:
3095 extras = [''] * len(hosts)
3096 else:
3097 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003098 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3099 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003100 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003101 lines.append(tmpl % he)
3102 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003103
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003104 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003105 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003106 yield ('.googlesource.com wildcard record detected',
3107 ['Chrome Infrastructure team recommends to list full host names '
3108 'explicitly.'],
3109 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003110
3111 dups = self.get_duplicated_hosts()
3112 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003113 yield ('The following hosts were defined twice',
3114 self._format_hosts(dups),
3115 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003116
3117 partial = self.get_partially_configured_hosts()
3118 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003119 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3120 'These hosts are missing',
3121 self._format_hosts(partial, lambda host: 'but %s defined' %
3122 self._get_counterpart_host(host)),
3123 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003124
3125 conflicting = self.get_conflicting_hosts()
3126 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003127 yield ('The following Git hosts have differing credentials from their '
3128 'Gerrit counterparts',
3129 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3130 tuple(self._get_git_gerrit_identity_pairs()[host])),
3131 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003132
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003133 def find_and_report_problems(self):
3134 """Returns True if there was at least one problem, else False."""
3135 found = False
3136 bad_hosts = set()
3137 for title, sublines, hosts in self._find_problems():
3138 if not found:
3139 found = True
3140 print('\n\n.gitcookies problem report:\n')
3141 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003142 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003143 if sublines:
3144 print()
3145 print(' %s' % '\n '.join(sublines))
3146 print()
3147
3148 if bad_hosts:
3149 assert found
3150 print(' You can manually remove corresponding lines in your %s file and '
3151 'visit the following URLs with correct account to generate '
3152 'correct credential lines:\n' %
3153 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3154 print(' %s' % '\n '.join(sorted(set(
3155 gerrit_util.CookiesAuthenticator().get_new_password_url(
3156 self._canonical_git_googlesource_host(host))
3157 for host in bad_hosts
3158 ))))
3159 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003160
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003161
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003162@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003163def CMDcreds_check(parser, args):
3164 """Checks credentials and suggests changes."""
3165 _, _ = parser.parse_args(args)
3166
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003167 # Code below checks .gitcookies. Abort if using something else.
3168 authn = gerrit_util.Authenticator.get()
3169 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003170 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003171 'This command is not designed for bot environment. It checks '
3172 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003173 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3174 if isinstance(authn, gerrit_util.GceAuthenticator):
3175 message += (
3176 '\n'
3177 'If you need to run this on GCE or a cloudtop instance, '
3178 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3179 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003180
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003181 checker = _GitCookiesChecker()
3182 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003183
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003184 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003185 checker.print_current_creds(include_netrc=True)
3186
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003187 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003188 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003189 return 0
3190 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003191
3192
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003193@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003194def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003195 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003196 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003197 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003198 _, args = parser.parse_args(args)
3199 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003200 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003201 return RunGit(['config', 'branch.%s.base-url' % branch],
3202 error_ok=False).strip()
3203 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003204 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003205 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3206 error_ok=False).strip()
3207
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003208
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003209def color_for_status(status):
3210 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003211 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003212 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003213 'unsent': BOLD + Fore.YELLOW,
3214 'waiting': BOLD + Fore.RED,
3215 'reply': BOLD + Fore.YELLOW,
3216 'not lgtm': BOLD + Fore.RED,
3217 'lgtm': BOLD + Fore.GREEN,
3218 'commit': BOLD + Fore.MAGENTA,
3219 'closed': BOLD + Fore.CYAN,
3220 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003221 }.get(status, Fore.WHITE)
3222
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003223
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003224def get_cl_statuses(changes, fine_grained, max_processes=None):
3225 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003226
3227 If fine_grained is true, this will fetch CL statuses from the server.
3228 Otherwise, simply indicate if there's a matching url for the given branches.
3229
3230 If max_processes is specified, it is used as the maximum number of processes
3231 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3232 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003233
3234 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003235 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003236 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003237 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003238
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003239 if not fine_grained:
3240 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003241 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003242 for cl in changes:
3243 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003244 return
3245
3246 # First, sort out authentication issues.
3247 logging.debug('ensuring credentials exist')
3248 for cl in changes:
3249 cl.EnsureAuthenticated(force=False, refresh=True)
3250
3251 def fetch(cl):
3252 try:
3253 return (cl, cl.GetStatus())
3254 except:
3255 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003256 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003257 raise
3258
3259 threads_count = len(changes)
3260 if max_processes:
3261 threads_count = max(1, min(threads_count, max_processes))
3262 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3263
Edward Lemur61bf4172020-02-24 23:22:37 +00003264 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003265 fetched_cls = set()
3266 try:
3267 it = pool.imap_unordered(fetch, changes).__iter__()
3268 while True:
3269 try:
3270 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003271 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003272 break
3273 fetched_cls.add(cl)
3274 yield cl, status
3275 finally:
3276 pool.close()
3277
3278 # Add any branches that failed to fetch.
3279 for cl in set(changes) - fetched_cls:
3280 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003281
rmistry@google.com2dd99862015-06-22 12:22:18 +00003282
Jose Lopes3863fc52020-04-07 17:00:25 +00003283def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003284 """Uploads CLs of local branches that are dependents of the current branch.
3285
3286 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003287
3288 test1 -> test2.1 -> test3.1
3289 -> test3.2
3290 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003291
3292 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3293 run on the dependent branches in this order:
3294 test2.1, test3.1, test3.2, test2.2, test3.3
3295
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003296 Note: This function does not rebase your local dependent branches. Use it
3297 when you make a change to the parent branch that will not conflict
3298 with its dependent branches, and you would like their dependencies
3299 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003300 """
3301 if git_common.is_dirty_git_tree('upload-branch-deps'):
3302 return 1
3303
3304 root_branch = cl.GetBranch()
3305 if root_branch is None:
3306 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3307 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003308 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003309 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3310 'patchset dependencies without an uploaded CL.')
3311
3312 branches = RunGit(['for-each-ref',
3313 '--format=%(refname:short) %(upstream:short)',
3314 'refs/heads'])
3315 if not branches:
3316 print('No local branches found.')
3317 return 0
3318
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003319 # Create a dictionary of all local branches to the branches that are
3320 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003321 tracked_to_dependents = collections.defaultdict(list)
3322 for b in branches.splitlines():
3323 tokens = b.split()
3324 if len(tokens) == 2:
3325 branch_name, tracked = tokens
3326 tracked_to_dependents[tracked].append(branch_name)
3327
vapiera7fbd5a2016-06-16 09:17:49 -07003328 print()
3329 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003330 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003331
rmistry@google.com2dd99862015-06-22 12:22:18 +00003332 def traverse_dependents_preorder(branch, padding=''):
3333 dependents_to_process = tracked_to_dependents.get(branch, [])
3334 padding += ' '
3335 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003336 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003337 dependents.append(dependent)
3338 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003339
rmistry@google.com2dd99862015-06-22 12:22:18 +00003340 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003341 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003342
3343 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003344 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003345 return 0
3346
Jose Lopes3863fc52020-04-07 17:00:25 +00003347 if not force:
3348 confirm_or_exit('This command will checkout all dependent branches and run '
3349 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003350
rmistry@google.com2dd99862015-06-22 12:22:18 +00003351 # Record all dependents that failed to upload.
3352 failures = {}
3353 # Go through all dependents, checkout the branch and upload.
3354 try:
3355 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003356 print()
3357 print('--------------------------------------')
3358 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003359 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003360 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003361 try:
3362 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003363 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003364 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003365 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003366 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003367 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003368 finally:
3369 # Swap back to the original root branch.
3370 RunGit(['checkout', '-q', root_branch])
3371
vapiera7fbd5a2016-06-16 09:17:49 -07003372 print()
3373 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003374 for dependent_branch in dependents:
3375 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003376 print(' %s : %s' % (dependent_branch, upload_status))
3377 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003378
3379 return 0
3380
3381
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003382def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003383 """Given a proposed tag name, returns a tag name that is guaranteed to be
3384 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3385 or 'foo-3', and so on."""
3386
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003387 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003388 for suffix_num in itertools.count(1):
3389 if suffix_num == 1:
3390 to_check = proposed_tag
3391 else:
3392 to_check = '%s-%d' % (proposed_tag, suffix_num)
3393
3394 if to_check not in existing_tags:
3395 return to_check
3396
3397
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003398@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003399def CMDarchive(parser, args):
3400 """Archives and deletes branches associated with closed changelists."""
3401 parser.add_option(
3402 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003403 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003404 parser.add_option(
3405 '-f', '--force', action='store_true',
3406 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003407 parser.add_option(
3408 '-d', '--dry-run', action='store_true',
3409 help='Skip the branch tagging and removal steps.')
3410 parser.add_option(
3411 '-t', '--notags', action='store_true',
3412 help='Do not tag archived branches. '
3413 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003414 parser.add_option(
3415 '-p',
3416 '--pattern',
3417 default='git-cl-archived-{issue}-{branch}',
3418 help='Format string for archive tags. '
3419 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003420
kmarshall3bff56b2016-06-06 18:31:47 -07003421 options, args = parser.parse_args(args)
3422 if args:
3423 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003424
3425 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3426 if not branches:
3427 return 0
3428
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003429 tags = RunGit(['for-each-ref', '--format=%(refname)',
3430 'refs/tags']).splitlines() or []
3431 tags = [t.split('/')[-1] for t in tags]
3432
vapiera7fbd5a2016-06-16 09:17:49 -07003433 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003434 changes = [Changelist(branchref=b)
3435 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003436 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3437 statuses = get_cl_statuses(changes,
3438 fine_grained=True,
3439 max_processes=options.maxjobs)
3440 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003441 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3442 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003443 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003444 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003445 proposal.sort()
3446
3447 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003448 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003449 return 0
3450
Edward Lemur85153282020-02-14 22:06:29 +00003451 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003452
vapiera7fbd5a2016-06-16 09:17:49 -07003453 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003454 if options.notags:
3455 for next_item in proposal:
3456 print(' ' + next_item[0])
3457 else:
3458 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3459 for next_item in proposal:
3460 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003461
kmarshall9249e012016-08-23 12:02:16 -07003462 # Quit now on precondition failure or if instructed by the user, either
3463 # via an interactive prompt or by command line flags.
3464 if options.dry_run:
3465 print('\nNo changes were made (dry run).\n')
3466 return 0
3467 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003468 print('You are currently on a branch \'%s\' which is associated with a '
3469 'closed codereview issue, so archive cannot proceed. Please '
3470 'checkout another branch and run this command again.' %
3471 current_branch)
3472 return 1
kmarshall9249e012016-08-23 12:02:16 -07003473 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003474 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003475 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003476 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003477 return 1
3478
3479 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003480 if not options.notags:
3481 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003482
3483 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3484 # Clean up the tag if we failed to delete the branch.
3485 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003486
vapiera7fbd5a2016-06-16 09:17:49 -07003487 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003488
3489 return 0
3490
3491
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003492@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003493def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003494 """Show status of changelists.
3495
3496 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003497 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003498 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003499 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003500 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003501 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003502 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003503 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003504
3505 Also see 'git cl comments'.
3506 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003507 parser.add_option(
3508 '--no-branch-color',
3509 action='store_true',
3510 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003511 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003512 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003513 parser.add_option('-f', '--fast', action='store_true',
3514 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003515 parser.add_option(
3516 '-j', '--maxjobs', action='store', type=int,
3517 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003518 parser.add_option(
3519 '-i', '--issue', type=int,
3520 help='Operate on this issue instead of the current branch\'s implicit '
3521 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003522 parser.add_option('-d',
3523 '--date-order',
3524 action='store_true',
3525 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003526 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003527 if args:
3528 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003529
iannuccie53c9352016-08-17 14:40:40 -07003530 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003531 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003532
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003533 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003534 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003535 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003536 if cl.GetIssue():
3537 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003538 elif options.field == 'id':
3539 issueid = cl.GetIssue()
3540 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003541 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003542 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003543 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003544 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003545 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003546 elif options.field == 'status':
3547 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003548 elif options.field == 'url':
3549 url = cl.GetIssueURL()
3550 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003551 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003552 return 0
3553
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003554 branches = RunGit([
3555 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3556 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003557 if not branches:
3558 print('No local branch found.')
3559 return 0
3560
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003561 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003562 Changelist(branchref=b, commit_date=ct)
3563 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3564 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003565 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003566 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003567 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003568 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003569
Edward Lemur85153282020-02-14 22:06:29 +00003570 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003571
3572 def FormatBranchName(branch, colorize=False):
3573 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3574 an asterisk when it is the current branch."""
3575
3576 asterisk = ""
3577 color = Fore.RESET
3578 if branch == current_branch:
3579 asterisk = "* "
3580 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003581 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003582
3583 if colorize:
3584 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003585 return asterisk + branch_name
3586
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003587 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003588
3589 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003590 if options.date_order:
3591 sorted_changes = sorted(changes,
3592 key=lambda c: c.GetCommitDate(),
3593 reverse=True)
3594 else:
3595 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3596 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003597 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003598 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003599 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003600 branch_statuses[c.GetBranch()] = status
3601 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003602 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003603 if url and (not status or status == 'error'):
3604 # The issue probably doesn't exist anymore.
3605 url += ' (broken)'
3606
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003607 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003608 # Turn off bold as well as colors.
3609 END = '\033[0m'
3610 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003611 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003612 color = ''
3613 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003614 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003615
Alan Cuttera3be9a52019-03-04 18:50:33 +00003616 branch_display = FormatBranchName(branch)
3617 padding = ' ' * (alignment - len(branch_display))
3618 if not options.no_branch_color:
3619 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003620
Alan Cuttera3be9a52019-03-04 18:50:33 +00003621 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3622 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003623
vapiera7fbd5a2016-06-16 09:17:49 -07003624 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003625 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003626 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003627 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003628 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003629 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003631 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003632 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003633 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003634 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003635 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003636 return 0
3637
3638
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003639def colorize_CMDstatus_doc():
3640 """To be called once in main() to add colors to git cl status help."""
3641 colors = [i for i in dir(Fore) if i[0].isupper()]
3642
3643 def colorize_line(line):
3644 for color in colors:
3645 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003646 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003647 indent = len(line) - len(line.lstrip(' ')) + 1
3648 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3649 return line
3650
3651 lines = CMDstatus.__doc__.splitlines()
3652 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3653
3654
phajdan.jre328cf92016-08-22 04:12:17 -07003655def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003656 if path == '-':
3657 json.dump(contents, sys.stdout)
3658 else:
3659 with open(path, 'w') as f:
3660 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003661
3662
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003663@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003664@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003665def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003666 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003667
3668 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003669 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003670 parser.add_option('-r', '--reverse', action='store_true',
3671 help='Lookup the branch(es) for the specified issues. If '
3672 'no issues are specified, all branches with mapped '
3673 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003674 parser.add_option('--json',
3675 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003676 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003677
dnj@chromium.org406c4402015-03-03 17:22:28 +00003678 if options.reverse:
3679 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003680 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003681 # Reverse issue lookup.
3682 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003683
3684 git_config = {}
3685 for config in RunGit(['config', '--get-regexp',
3686 r'branch\..*issue']).splitlines():
3687 name, _space, val = config.partition(' ')
3688 git_config[name] = val
3689
dnj@chromium.org406c4402015-03-03 17:22:28 +00003690 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003691 issue = git_config.get(
3692 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003693 if issue:
3694 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003695 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003696 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003697 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003698 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003699 try:
3700 issue_num = int(issue)
3701 except ValueError:
3702 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003703 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003704 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003705 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003706 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003707 if options.json:
3708 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003709 return 0
3710
3711 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003712 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003713 if not issue.valid:
3714 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3715 'or no argument to list it.\n'
3716 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003717 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003718 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003719 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003720 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003721 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3722 if options.json:
3723 write_json(options.json, {
3724 'issue': cl.GetIssue(),
3725 'issue_url': cl.GetIssueURL(),
3726 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003727 return 0
3728
3729
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003730@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003731def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003732 """Shows or posts review comments for any changelist."""
3733 parser.add_option('-a', '--add-comment', dest='comment',
3734 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003735 parser.add_option('-p', '--publish', action='store_true',
3736 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003737 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003738 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003739 parser.add_option('-m', '--machine-readable', dest='readable',
3740 action='store_false', default=True,
3741 help='output comments in a format compatible with '
3742 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003743 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003744 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003745 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003746
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003747 issue = None
3748 if options.issue:
3749 try:
3750 issue = int(options.issue)
3751 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003752 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003753
Edward Lemur934836a2019-09-09 20:16:54 +00003754 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003755
3756 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003757 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003758 return 0
3759
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003760 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3761 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003762 for comment in summary:
3763 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003764 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003765 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003766 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003767 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003768 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003769 elif comment.autogenerated:
3770 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003771 else:
3772 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003773 print('\n%s%s %s%s\n%s' % (
3774 color,
3775 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3776 comment.sender,
3777 Fore.RESET,
3778 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3779
smut@google.comc85ac942015-09-15 16:34:43 +00003780 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003781 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003782 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003783 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3784 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003785 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003786 return 0
3787
3788
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003789@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003790@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003791def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003792 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003793 parser.add_option('-d', '--display', action='store_true',
3794 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003795 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003796 help='New description to set for this issue (- for stdin, '
3797 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003798 parser.add_option('-f', '--force', action='store_true',
3799 help='Delete any unpublished Gerrit edits for this issue '
3800 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003801
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003802 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003803
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003804 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003805 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003806 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003807 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003808 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003809
Edward Lemur934836a2019-09-09 20:16:54 +00003810 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003811 if target_issue_arg:
3812 kwargs['issue'] = target_issue_arg.issue
3813 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003814
3815 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003816 if not cl.GetIssue():
3817 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003818
Edward Lemur678a6842019-10-03 22:25:05 +00003819 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003820 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003821
Edward Lemur6c6827c2020-02-06 21:15:18 +00003822 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003823
smut@google.com34fb6b12015-07-13 20:03:26 +00003824 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003825 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003826 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003827
3828 if options.new_description:
3829 text = options.new_description
3830 if text == '-':
3831 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003832 elif text == '+':
3833 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003834 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003835
3836 description.set_description(text)
3837 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003838 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003839 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003840 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003841 return 0
3842
3843
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003844@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003845def CMDlint(parser, args):
3846 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003847 parser.add_option('--filter', action='append', metavar='-x,+y',
3848 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003849 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003850
3851 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003852 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003853 try:
3854 import cpplint
3855 import cpplint_chromium
3856 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003857 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003858 return 1
3859
3860 # Change the current working directory before calling lint so that it
3861 # shows the correct base.
3862 previous_cwd = os.getcwd()
3863 os.chdir(settings.GetRoot())
3864 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003865 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003866 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003867 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003868 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003869 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003870
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003871 # Process cpplint arguments, if any.
3872 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3873 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003874 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003875
Lei Zhang379d1ad2020-07-15 19:40:06 +00003876 include_regex = re.compile(settings.GetLintRegex())
3877 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003878 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3879 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003880 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003882 continue
3883
3884 if ignore_regex.match(filename):
3885 print('Ignoring file %s' % filename)
3886 continue
3887
3888 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3889 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003890 finally:
3891 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003893 if cpplint._cpplint_state.error_count != 0:
3894 return 1
3895 return 0
3896
3897
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003898@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003899def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003900 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003901 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003902 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003903 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003904 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003905 parser.add_option('--all', action='store_true',
3906 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003907 parser.add_option('--parallel', action='store_true',
3908 help='Run all tests specified by input_api.RunTests in all '
3909 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003910 parser.add_option('--resultdb', action='store_true',
3911 help='Run presubmit checks in the ResultSink environment '
3912 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003913 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003914 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003915
sbc@chromium.org71437c02015-04-09 19:29:40 +00003916 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003917 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003918 return 1
3919
Edward Lemur934836a2019-09-09 20:16:54 +00003920 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003921 if args:
3922 base_branch = args[0]
3923 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003924 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003925 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003926
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003927 if cl.GetIssue():
3928 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003929 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003930 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003931
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003932 cl.RunHook(
3933 committing=not options.upload,
3934 may_prompt=False,
3935 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003936 parallel=options.parallel,
3937 upstream=base_branch,
3938 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003939 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003940 resultdb=options.resultdb,
3941 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003942 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003943
3944
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003945def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003946 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003947
3948 Works the same way as
3949 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3950 but can be called on demand on all platforms.
3951
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003952 The basic idea is to generate git hash of a state of the tree, original
3953 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003954 """
3955 lines = []
3956 tree_hash = RunGitSilent(['write-tree'])
3957 lines.append('tree %s' % tree_hash.strip())
3958 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3959 if code == 0:
3960 lines.append('parent %s' % parent.strip())
3961 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3962 lines.append('author %s' % author.strip())
3963 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3964 lines.append('committer %s' % committer.strip())
3965 lines.append('')
3966 # Note: Gerrit's commit-hook actually cleans message of some lines and
3967 # whitespace. This code is not doing this, but it clearly won't decrease
3968 # entropy.
3969 lines.append(message)
3970 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003971 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003972 return 'I%s' % change_hash.strip()
3973
3974
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003975def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003976 """Computes the remote branch ref to use for the CL.
3977
3978 Args:
3979 remote (str): The git remote for the CL.
3980 remote_branch (str): The git remote branch for the CL.
3981 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003982 """
3983 if not (remote and remote_branch):
3984 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003985
wittman@chromium.org455dc922015-01-26 20:15:50 +00003986 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003987 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003988 # refs, which are then translated into the remote full symbolic refs
3989 # below.
3990 if '/' not in target_branch:
3991 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3992 else:
3993 prefix_replacements = (
3994 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3995 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3996 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3997 )
3998 match = None
3999 for regex, replacement in prefix_replacements:
4000 match = re.search(regex, target_branch)
4001 if match:
4002 remote_branch = target_branch.replace(match.group(0), replacement)
4003 break
4004 if not match:
4005 # This is a branch path but not one we recognize; use as-is.
4006 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004007 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4008 # Handle the refs that need to land in different refs.
4009 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004010
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004011 # Migration to new default branch, only if available on remote.
4012 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4013 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4014 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4015 stderr=subprocess2.PIPE):
4016 # TODO(crbug.com/ID): Print location to local git migration script.
4017 print("WARNING: Using new branch name %s instead of %s" % (
4018 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4019 remote_branch = DEFAULT_NEW_BRANCH
4020
wittman@chromium.org455dc922015-01-26 20:15:50 +00004021 # Create the true path to the remote branch.
4022 # Does the following translation:
4023 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004024 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004025 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4026 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4027 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4028 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4029 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4030 'refs/heads/')
4031 elif remote_branch.startswith('refs/remotes/branch-heads'):
4032 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004033
wittman@chromium.org455dc922015-01-26 20:15:50 +00004034 return remote_branch
4035
4036
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004037def cleanup_list(l):
4038 """Fixes a list so that comma separated items are put as individual items.
4039
4040 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4041 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4042 """
4043 items = sum((i.split(',') for i in l), [])
4044 stripped_items = (i.strip() for i in items)
4045 return sorted(filter(None, stripped_items))
4046
4047
Aaron Gable4db38df2017-11-03 14:59:07 -07004048@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004049@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004050def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004051 """Uploads the current changelist to codereview.
4052
4053 Can skip dependency patchset uploads for a branch by running:
4054 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004055 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004056 git config --unset branch.branch_name.skip-deps-uploads
4057 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004058
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004059 If the name of the checked out branch starts with "bug-" or "fix-" followed
4060 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004061 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004062
4063 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004064 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004065 [git-cl] add support for hashtags
4066 Foo bar: implement foo
4067 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004068 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004069 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4070 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004071 parser.add_option('--bypass-watchlists', action='store_true',
4072 dest='bypass_watchlists',
4073 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004074 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004075 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004076 parser.add_option('--message', '-m', dest='message',
4077 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004078 parser.add_option('-b', '--bug',
4079 help='pre-populate the bug number(s) for this issue. '
4080 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004081 parser.add_option('--message-file', dest='message_file',
4082 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004083 parser.add_option('--title', '-t', dest='title',
4084 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004085 parser.add_option('-T', '--skip-title', action='store_true',
4086 dest='skip_title',
4087 help='Use the most recent commit message as the title of '
4088 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004089 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004090 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004091 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004092 parser.add_option('--tbrs',
4093 action='append', default=[],
4094 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004095 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004096 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004097 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004098 parser.add_option('--hashtag', dest='hashtags',
4099 action='append', default=[],
4100 help=('Gerrit hashtag for new CL; '
4101 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004102 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004103 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004104 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004105 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004106 metavar='TARGET',
4107 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004108 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004109 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004110 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004111 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004112 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004113 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004114 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004115 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4116 const='TBR', help='add a set of OWNERS to TBR')
4117 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4118 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004119 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004120 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004121 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004122 'implies --send-mail')
4123 parser.add_option('-d', '--cq-dry-run',
4124 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004125 help='Send the patchset to do a CQ dry run right after '
4126 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004127 parser.add_option('--preserve-tryjobs', action='store_true',
4128 help='instruct the CQ to let tryjobs running even after '
4129 'new patchsets are uploaded instead of canceling '
4130 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004131 parser.add_option('--dependencies', action='store_true',
4132 help='Uploads CLs of all the local branches that depend on '
4133 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004134 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4135 help='Sends your change to the CQ after an approval. Only '
4136 'works on repos that have the Auto-Submit label '
4137 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004138 parser.add_option('--parallel', action='store_true',
4139 help='Run all tests specified by input_api.RunTests in all '
4140 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004141 parser.add_option('--no-autocc', action='store_true',
4142 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004143 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004144 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004145 parser.add_option('-R', '--retry-failed', action='store_true',
4146 help='Retry failed tryjobs from old patchset immediately '
4147 'after uploading new patchset. Cannot be used with '
4148 '--use-commit-queue or --cq-dry-run.')
4149 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4150 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004151 parser.add_option('--fixed', '-x',
4152 help='List of bugs that will be commented on and marked '
4153 'fixed (pre-populates "Fixed:" tag). Same format as '
4154 '-b option / "Bug:" tag. If fixing several issues, '
4155 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004156 parser.add_option('--edit-description', action='store_true', default=False,
4157 help='Modify description before upload. Cannot be used '
4158 'with --force. It is a noop when --no-squash is set '
4159 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004160 parser.add_option('--git-completion-helper', action="store_true",
4161 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004162 parser.add_option('--resultdb', action='store_true',
4163 help='Run presubmit checks in the ResultSink environment '
4164 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004165 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004166
rmistry@google.com2dd99862015-06-22 12:22:18 +00004167 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004168 (options, args) = parser.parse_args(args)
4169
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004170 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004171 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4172 if opt.help != optparse.SUPPRESS_HELP))
4173 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004174
sbc@chromium.org71437c02015-04-09 19:29:40 +00004175 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004176 return 1
4177
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004178 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004179 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004180 options.cc = cleanup_list(options.cc)
4181
Josipe827b0f2020-01-30 00:07:20 +00004182 if options.edit_description and options.force:
4183 parser.error('Only one of --force and --edit-description allowed')
4184
tandriib80458a2016-06-23 12:20:07 -07004185 if options.message_file:
4186 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004187 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004188 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004189
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004190 if ([options.cq_dry_run,
4191 options.use_commit_queue,
4192 options.retry_failed].count(True) > 1):
4193 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4194 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004195
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004196 if options.skip_title and options.title:
4197 parser.error('Only one of --title and --skip-title allowed.')
4198
Aaron Gableedbc4132017-09-11 13:22:28 -07004199 if options.use_commit_queue:
4200 options.send_mail = True
4201
Edward Lesmes0dd54822020-03-26 18:24:25 +00004202 if options.squash is None:
4203 # Load default for user, repo, squash=true, in this order.
4204 options.squash = settings.GetSquashGerritUploads()
4205
Edward Lemur934836a2019-09-09 20:16:54 +00004206 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004207 # Warm change details cache now to avoid RPCs later, reducing latency for
4208 # developers.
4209 if cl.GetIssue():
4210 cl._GetChangeDetail(
4211 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4212
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004213 if options.retry_failed and not cl.GetIssue():
4214 print('No previous patchsets, so --retry-failed has no effect.')
4215 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004216
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004217 # cl.GetMostRecentPatchset uses cached information, and can return the last
4218 # patchset before upload. Calling it here makes it clear that it's the
4219 # last patchset before upload. Note that GetMostRecentPatchset will fail
4220 # if no CL has been uploaded yet.
4221 if options.retry_failed:
4222 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004223
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004224 ret = cl.CMDUpload(options, args, orig_args)
4225
4226 if options.retry_failed:
4227 if ret != 0:
4228 print('Upload failed, so --retry-failed has no effect.')
4229 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004230 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004231 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004232 jobs = _filter_failed_for_retry(builds)
4233 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004234 print('No failed tryjobs, so --retry-failed has no effect.')
4235 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004236 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004237
4238 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004239
4240
Francois Dorayd42c6812017-05-30 15:10:20 -04004241@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004242@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004243def CMDsplit(parser, args):
4244 """Splits a branch into smaller branches and uploads CLs.
4245
4246 Creates a branch and uploads a CL for each group of files modified in the
4247 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004248 comment, the string '$directory', is replaced with the directory containing
4249 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004250 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004251 parser.add_option('-d', '--description', dest='description_file',
4252 help='A text file containing a CL description in which '
4253 '$directory will be replaced by each CL\'s directory.')
4254 parser.add_option('-c', '--comment', dest='comment_file',
4255 help='A text file containing a CL comment.')
4256 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004257 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004258 help='List the files and reviewers for each CL that would '
4259 'be created, but don\'t create branches or CLs.')
4260 parser.add_option('--cq-dry-run', action='store_true',
4261 help='If set, will do a cq dry run for each uploaded CL. '
4262 'Please be careful when doing this; more than ~10 CLs '
4263 'has the potential to overload our build '
4264 'infrastructure. Try to upload these not during high '
4265 'load times (usually 11-3 Mountain View time). Email '
4266 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004267 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4268 default=True,
4269 help='Sends your change to the CQ after an approval. Only '
4270 'works on repos that have the Auto-Submit label '
4271 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004272 options, _ = parser.parse_args(args)
4273
4274 if not options.description_file:
4275 parser.error('No --description flag specified.')
4276
4277 def WrappedCMDupload(args):
4278 return CMDupload(OptionParser(), args)
4279
Edward Lemur2c62b332020-03-12 22:12:33 +00004280 return split_cl.SplitCl(
4281 options.description_file, options.comment_file, Changelist,
4282 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4283 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004284
4285
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004286@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004287@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004288def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004289 """DEPRECATED: Used to commit the current changelist via git-svn."""
4290 message = ('git-cl no longer supports committing to SVN repositories via '
4291 'git-svn. You probably want to use `git cl land` instead.')
4292 print(message)
4293 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004294
4295
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004296@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004297@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004298def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004299 """Commits the current changelist via git.
4300
4301 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4302 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004303 """
4304 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4305 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004306 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004307 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004308 parser.add_option('--parallel', action='store_true',
4309 help='Run all tests specified by input_api.RunTests in all '
4310 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004311 parser.add_option('--resultdb', action='store_true',
4312 help='Run presubmit checks in the ResultSink environment '
4313 'and send results to the ResultDB database.')
4314 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004315 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004316
Edward Lemur934836a2019-09-09 20:16:54 +00004317 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004318
Robert Iannucci2e73d432018-03-14 01:10:47 -07004319 if not cl.GetIssue():
4320 DieWithError('You must upload the change first to Gerrit.\n'
4321 ' If you would rather have `git cl land` upload '
4322 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004323 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4324 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004325
4326
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004327@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004328@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004329def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004330 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004331 parser.add_option('-b', dest='newbranch',
4332 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004333 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004334 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004335 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004336 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004337
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004338 group = optparse.OptionGroup(
4339 parser,
4340 'Options for continuing work on the current issue uploaded from a '
4341 'different clone (e.g. different machine). Must be used independently '
4342 'from the other options. No issue number should be specified, and the '
4343 'branch must have an issue number associated with it')
4344 group.add_option('--reapply', action='store_true', dest='reapply',
4345 help='Reset the branch and reapply the issue.\n'
4346 'CAUTION: This will undo any local changes in this '
4347 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004348
4349 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004350 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004351 parser.add_option_group(group)
4352
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004353 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004354
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004355 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004356 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004357 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004358 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004359 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004360
Edward Lemur934836a2019-09-09 20:16:54 +00004361 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004362 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004363 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004364
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004365 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004366 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004367 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004368
4369 RunGit(['reset', '--hard', upstream])
4370 if options.pull:
4371 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004372
Edward Lemur678a6842019-10-03 22:25:05 +00004373 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4374 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004375
4376 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004377 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004378
Edward Lemurf38bc172019-09-03 21:02:13 +00004379 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004380 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004381 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004382
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004383 # We don't want uncommitted changes mixed up with the patch.
4384 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004385 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004386
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004387 if options.newbranch:
4388 if options.force:
4389 RunGit(['branch', '-D', options.newbranch],
4390 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004391 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004392
Edward Lemur678a6842019-10-03 22:25:05 +00004393 cl = Changelist(
4394 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004395
Edward Lemur678a6842019-10-03 22:25:05 +00004396 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004397 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004398
Edward Lemurf38bc172019-09-03 21:02:13 +00004399 return cl.CMDPatchWithParsedIssue(
4400 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004401
4402
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004403def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004404 """Fetches the tree status and returns either 'open', 'closed',
4405 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004406 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004407 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004408 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004409 if status.find('closed') != -1 or status == '0':
4410 return 'closed'
4411 elif status.find('open') != -1 or status == '1':
4412 return 'open'
4413 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004414 return 'unset'
4415
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004416
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004417def GetTreeStatusReason():
4418 """Fetches the tree status from a json url and returns the message
4419 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004420 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004421 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004422 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004423 status = json.loads(connection.read())
4424 connection.close()
4425 return status['message']
4426
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004427
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004428@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004429def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004430 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004431 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004432 status = GetTreeStatus()
4433 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435 return 2
4436
vapiera7fbd5a2016-06-16 09:17:49 -07004437 print('The tree is %s' % status)
4438 print()
4439 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004440 if status != 'open':
4441 return 1
4442 return 0
4443
4444
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004445@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004446def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004447 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4448 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004449 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004450 '-b', '--bot', action='append',
4451 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4452 'times to specify multiple builders. ex: '
4453 '"-b win_rel -b win_layout". See '
4454 'the try server waterfall for the builders name and the tests '
4455 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004456 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004457 '-B', '--bucket', default='',
4458 help=('Buildbucket bucket to send the try requests.'))
4459 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004460 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004461 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004462 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004463 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004464 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004465 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004466 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004467 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004468 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004469 '--category', default='git_cl_try', help='Specify custom build category.')
4470 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004471 '--project',
4472 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004473 'in recipe to determine to which repository or directory to '
4474 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004475 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004476 '-p', '--property', dest='properties', action='append', default=[],
4477 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004478 'key2=value2 etc. The value will be treated as '
4479 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004480 'NOTE: using this may make your tryjob not usable for CQ, '
4481 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004482 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004483 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4484 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004485 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004486 parser.add_option(
4487 '-R', '--retry-failed', action='store_true', default=False,
4488 help='Retry failed jobs from the latest set of tryjobs. '
4489 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004490 parser.add_option(
4491 '-i', '--issue', type=int,
4492 help='Operate on this issue instead of the current branch\'s implicit '
4493 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004494 options, args = parser.parse_args(args)
4495
machenbach@chromium.org45453142015-09-15 08:45:22 +00004496 # Make sure that all properties are prop=value pairs.
4497 bad_params = [x for x in options.properties if '=' not in x]
4498 if bad_params:
4499 parser.error('Got properties with missing "=": %s' % bad_params)
4500
maruel@chromium.org15192402012-09-06 12:38:29 +00004501 if args:
4502 parser.error('Unknown arguments: %s' % args)
4503
Edward Lemur934836a2019-09-09 20:16:54 +00004504 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004505 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004506 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004507
Edward Lemurf38bc172019-09-03 21:02:13 +00004508 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004509 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004510
tandriie113dfd2016-10-11 10:20:12 -07004511 error_message = cl.CannotTriggerTryJobReason()
4512 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004513 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004514
Edward Lemur45768512020-03-02 19:03:14 +00004515 if options.bot:
4516 if options.retry_failed:
4517 parser.error('--bot is not compatible with --retry-failed.')
4518 if not options.bucket:
4519 parser.error('A bucket (e.g. "chromium/try") is required.')
4520
4521 triggered = [b for b in options.bot if 'triggered' in b]
4522 if triggered:
4523 parser.error(
4524 'Cannot schedule builds on triggered bots: %s.\n'
4525 'This type of bot requires an initial job from a parent (usually a '
4526 'builder). Schedule a job on the parent instead.\n' % triggered)
4527
4528 if options.bucket.startswith('.master'):
4529 parser.error('Buildbot masters are not supported.')
4530
4531 project, bucket = _parse_bucket(options.bucket)
4532 if project is None or bucket is None:
4533 parser.error('Invalid bucket: %s.' % options.bucket)
4534 jobs = sorted((project, bucket, bot) for bot in options.bot)
4535 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004536 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004537 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004538 if options.verbose:
4539 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004540 jobs = _filter_failed_for_retry(builds)
4541 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004542 print('There are no failed jobs in the latest set of jobs '
4543 '(patchset #%d), doing nothing.' % patchset)
4544 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004545 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004546 if num_builders > 10:
4547 confirm_or_exit('There are %d builders with failed builds.'
4548 % num_builders, action='continue')
4549 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004550 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004551 print('git cl try with no bots now defaults to CQ dry run.')
4552 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4553 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004554
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004555 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004556 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004557 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004558 except BuildbucketResponseException as ex:
4559 print('ERROR: %s' % ex)
4560 return 1
4561 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004562
4563
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004564@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004565def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004566 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004567 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004568 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004569 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004570 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004571 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004572 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004573 '--color', action='store_true', default=setup_color.IS_TTY,
4574 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004575 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004576 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4577 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004578 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004579 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004580 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004581 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004582 parser.add_option(
4583 '-i', '--issue', type=int,
4584 help='Operate on this issue instead of the current branch\'s implicit '
4585 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004586 options, args = parser.parse_args(args)
4587 if args:
4588 parser.error('Unrecognized args: %s' % ' '.join(args))
4589
Edward Lemur934836a2019-09-09 20:16:54 +00004590 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004591 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004592 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004593
tandrii221ab252016-10-06 08:12:04 -07004594 patchset = options.patchset
4595 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004596 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004597 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004598 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004599 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004600 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004601 cl.GetIssue())
4602
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004603 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004604 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004605 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004606 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004607 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004608 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004609 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004610 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004611 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004612 return 0
4613
4614
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004615@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004616@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004617def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004618 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004619 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004620 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004621 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004622
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004624 if args:
4625 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004626 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004627 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004628 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004629 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004630
4631 # Clear configured merge-base, if there is one.
4632 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004633 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004634 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004635 return 0
4636
4637
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004638@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004639def CMDweb(parser, args):
4640 """Opens the current CL in the web browser."""
4641 _, args = parser.parse_args(args)
4642 if args:
4643 parser.error('Unrecognized args: %s' % ' '.join(args))
4644
4645 issue_url = Changelist().GetIssueURL()
4646 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004647 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004648 return 1
4649
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004650 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004651 # allows us to hide the "Created new window in existing browser session."
4652 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004653 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004654 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004655 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004656 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004657 os.open(os.devnull, os.O_RDWR)
4658 try:
4659 webbrowser.open(issue_url)
4660 finally:
4661 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004662 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004663 return 0
4664
4665
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004666@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004667def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004668 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004669 parser.add_option('-d', '--dry-run', action='store_true',
4670 help='trigger in dry run mode')
4671 parser.add_option('-c', '--clear', action='store_true',
4672 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004673 parser.add_option(
4674 '-i', '--issue', type=int,
4675 help='Operate on this issue instead of the current branch\'s implicit '
4676 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004677 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004678 if args:
4679 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004680 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004681 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004682
Edward Lemur934836a2019-09-09 20:16:54 +00004683 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004684 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004685 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004686 elif options.dry_run:
4687 state = _CQState.DRY_RUN
4688 else:
4689 state = _CQState.COMMIT
4690 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004691 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004692 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004693 return 0
4694
4695
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004696@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004697def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004698 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004699 parser.add_option(
4700 '-i', '--issue', type=int,
4701 help='Operate on this issue instead of the current branch\'s implicit '
4702 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004703 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004704 if args:
4705 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004706 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004707 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004708 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004709 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004710 cl.CloseIssue()
4711 return 0
4712
4713
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004714@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004715def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004716 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004717 parser.add_option(
4718 '--stat',
4719 action='store_true',
4720 dest='stat',
4721 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004722 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004723 if args:
4724 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004725
Edward Lemur934836a2019-09-09 20:16:54 +00004726 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004727 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004728 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004729 if not issue:
4730 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004731
Aaron Gablea718c3e2017-08-28 17:47:28 -07004732 base = cl._GitGetBranchConfigValue('last-upload-hash')
4733 if not base:
4734 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4735 if not base:
4736 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4737 revision_info = detail['revisions'][detail['current_revision']]
4738 fetch_info = revision_info['fetch']['http']
4739 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4740 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004741
Aaron Gablea718c3e2017-08-28 17:47:28 -07004742 cmd = ['git', 'diff']
4743 if options.stat:
4744 cmd.append('--stat')
4745 cmd.append(base)
4746 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004747
4748 return 0
4749
4750
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004751@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004752def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004753 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004754 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004755 '--ignore-current',
4756 action='store_true',
4757 help='Ignore the CL\'s current reviewers and start from scratch.')
4758 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004759 '--ignore-self',
4760 action='store_true',
4761 help='Do not consider CL\'s author as an owners.')
4762 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004763 '--no-color',
4764 action='store_true',
4765 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004766 parser.add_option(
4767 '--batch',
4768 action='store_true',
4769 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004770 # TODO: Consider moving this to another command, since other
4771 # git-cl owners commands deal with owners for a given CL.
4772 parser.add_option(
4773 '--show-all',
4774 action='store_true',
4775 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004776 options, args = parser.parse_args(args)
4777
Edward Lemur934836a2019-09-09 20:16:54 +00004778 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004779 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004780
Yang Guo6e269a02019-06-26 11:17:02 +00004781 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004782 if len(args) == 0:
4783 print('No files specified for --show-all. Nothing to do.')
4784 return 0
Edward Lesmeseeca9c62020-11-20 00:00:17 +00004785 client = owners_client.DepotToolsClient(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00004786 root=settings.GetRoot(),
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004787 branch=cl.GetCommonAncestorWithUpstream())
4788 owners_by_path = client.BatchListOwners(args)
4789 for path in args:
4790 print('Owners for %s:' % path)
4791 print('\n'.join(
4792 ' - %s' % owner
4793 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004794 return 0
4795
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004796 if args:
4797 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004798 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004799 base_branch = args[0]
4800 else:
4801 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004802 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004803
Edward Lemur2c62b332020-03-12 22:12:33 +00004804 root = settings.GetRoot()
4805 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004806
4807 if options.batch:
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004808 client = owners_client.DepotToolsClient(root, base_branch)
4809 print('\n'.join(client.SuggestOwners(affected_files)))
Dirk Prankebf980882017-09-02 15:08:00 -07004810 return 0
4811
Edward Lemur2c62b332020-03-12 22:12:33 +00004812 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4813 original_owner_files = {
4814 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4815 for f in owner_files}
4816
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004817 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004818 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004819 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004820 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004821 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004822 fopen=open,
4823 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004824 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004825 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004826 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004827
4828
Aiden Bennerc08566e2018-10-03 17:52:42 +00004829def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004830 """Generates a diff command."""
4831 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004832 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4833
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004834 if allow_prefix:
4835 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4836 # case that diff.noprefix is set in the user's git config.
4837 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4838 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004839 diff_cmd += ['--no-prefix']
4840
4841 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004842
4843 if args:
4844 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004845 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004846 diff_cmd.append(arg)
4847 else:
4848 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004849
4850 return diff_cmd
4851
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004852
Jamie Madill5e96ad12020-01-13 16:08:35 +00004853def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4854 """Runs clang-format-diff and sets a return value if necessary."""
4855
4856 if not clang_diff_files:
4857 return 0
4858
4859 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4860 # formatted. This is used to block during the presubmit.
4861 return_value = 0
4862
4863 # Locate the clang-format binary in the checkout
4864 try:
4865 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4866 except clang_format.NotFoundError as e:
4867 DieWithError(e)
4868
4869 if opts.full or settings.GetFormatFullByDefault():
4870 cmd = [clang_format_tool]
4871 if not opts.dry_run and not opts.diff:
4872 cmd.append('-i')
4873 if opts.dry_run:
4874 for diff_file in clang_diff_files:
4875 with open(diff_file, 'r') as myfile:
4876 code = myfile.read().replace('\r\n', '\n')
4877 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4878 stdout = stdout.replace('\r\n', '\n')
4879 if opts.diff:
4880 sys.stdout.write(stdout)
4881 if code != stdout:
4882 return_value = 2
4883 else:
4884 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4885 if opts.diff:
4886 sys.stdout.write(stdout)
4887 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004888 try:
4889 script = clang_format.FindClangFormatScriptInChromiumTree(
4890 'clang-format-diff.py')
4891 except clang_format.NotFoundError as e:
4892 DieWithError(e)
4893
Edward Lesmes89624cd2020-04-06 17:51:56 +00004894 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004895 if not opts.dry_run and not opts.diff:
4896 cmd.append('-i')
4897
4898 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004899 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004900
Edward Lesmes89624cd2020-04-06 17:51:56 +00004901 env = os.environ.copy()
4902 env['PATH'] = (
4903 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4904 stdout = RunCommand(
4905 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004906 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004907 if opts.diff:
4908 sys.stdout.write(stdout)
4909 if opts.dry_run and len(stdout) > 0:
4910 return_value = 2
4911
4912 return return_value
4913
4914
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004915def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004916 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004917 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004918
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004919
enne@chromium.org555cfe42014-01-29 18:21:39 +00004920@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004921@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004922def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004923 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004924 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004925 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004926 parser.add_option('--full', action='store_true',
4927 help='Reformat the full content of all touched files')
4928 parser.add_option('--dry-run', action='store_true',
4929 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004930 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004931 '--no-clang-format',
4932 dest='clang_format',
4933 action='store_false',
4934 default=True,
4935 help='Disables formatting of various file types using clang-format.')
4936 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004937 '--python',
4938 action='store_true',
4939 default=None,
4940 help='Enables python formatting on all python files.')
4941 parser.add_option(
4942 '--no-python',
4943 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004944 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004945 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004946 'If neither --python or --no-python are set, python files that have a '
4947 '.style.yapf file in an ancestor directory will be formatted. '
4948 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004949 parser.add_option(
4950 '--js',
4951 action='store_true',
4952 help='Format javascript code with clang-format. '
4953 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004954 parser.add_option('--diff', action='store_true',
4955 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004956 parser.add_option('--presubmit', action='store_true',
4957 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004958 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004959
Garrett Beaty91a6f332020-01-06 16:57:24 +00004960 if opts.python is not None and opts.no_python:
4961 raise parser.error('Cannot set both --python and --no-python')
4962 if opts.no_python:
4963 opts.python = False
4964
Daniel Chengc55eecf2016-12-30 03:11:02 -08004965 # Normalize any remaining args against the current path, so paths relative to
4966 # the current directory are still resolved as expected.
4967 args = [os.path.join(os.getcwd(), arg) for arg in args]
4968
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004969 # git diff generates paths against the root of the repository. Change
4970 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004971 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004972 if rel_base_path:
4973 os.chdir(rel_base_path)
4974
digit@chromium.org29e47272013-05-17 17:01:46 +00004975 # Grab the merge-base commit, i.e. the upstream commit of the current
4976 # branch when it was created or the last time it was rebased. This is
4977 # to cover the case where the user may have called "git fetch origin",
4978 # moving the origin branch to a newer commit, but hasn't rebased yet.
4979 upstream_commit = None
4980 cl = Changelist()
4981 upstream_branch = cl.GetUpstreamBranch()
4982 if upstream_branch:
4983 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4984 upstream_commit = upstream_commit.strip()
4985
4986 if not upstream_commit:
4987 DieWithError('Could not find base commit for this branch. '
4988 'Are you in detached state?')
4989
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004990 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4991 diff_output = RunGit(changed_files_cmd)
4992 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004993 # Filter out files deleted by this CL
4994 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004995
Andreas Haas417d89c2020-02-06 10:24:27 +00004996 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004997 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004998
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004999 clang_diff_files = []
5000 if opts.clang_format:
5001 clang_diff_files = [
5002 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5003 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005004 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005005 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005006
Edward Lesmes50da7702020-03-30 19:23:43 +00005007 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005008
Jamie Madill5e96ad12020-01-13 16:08:35 +00005009 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5010 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005011
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005012 # Similar code to above, but using yapf on .py files rather than clang-format
5013 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005014 py_explicitly_disabled = opts.python is not None and not opts.python
5015 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005016 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5017 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005018
Aiden Bennerc08566e2018-10-03 17:52:42 +00005019 # Used for caching.
5020 yapf_configs = {}
5021 for f in python_diff_files:
5022 # Find the yapf style config for the current file, defaults to depot
5023 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005024 _FindYapfConfigFile(f, yapf_configs, top_dir)
5025
5026 # Turn on python formatting by default if a yapf config is specified.
5027 # This breaks in the case of this repo though since the specified
5028 # style file is also the global default.
5029 if opts.python is None:
5030 filtered_py_files = []
5031 for f in python_diff_files:
5032 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5033 filtered_py_files.append(f)
5034 else:
5035 filtered_py_files = python_diff_files
5036
5037 # Note: yapf still seems to fix indentation of the entire file
5038 # even if line ranges are specified.
5039 # See https://github.com/google/yapf/issues/499
5040 if not opts.full and filtered_py_files:
5041 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5042
Brian Sheedyb4307d52019-12-02 19:18:17 +00005043 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5044 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5045 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005046
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005047 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005048 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5049 # Default to pep8 if not .style.yapf is found.
5050 if not yapf_style:
5051 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005052
Peter Wend9399922020-06-17 17:33:49 +00005053 with open(f, 'r') as py_f:
5054 if 'python3' in py_f.readline():
5055 vpython_script = 'vpython3'
5056 else:
5057 vpython_script = 'vpython'
5058
5059 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005060
5061 has_formattable_lines = False
5062 if not opts.full:
5063 # Only run yapf over changed line ranges.
5064 for diff_start, diff_len in py_line_diffs[f]:
5065 diff_end = diff_start + diff_len - 1
5066 # Yapf errors out if diff_end < diff_start but this
5067 # is a valid line range diff for a removal.
5068 if diff_end >= diff_start:
5069 has_formattable_lines = True
5070 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5071 # If all line diffs were removals we have nothing to format.
5072 if not has_formattable_lines:
5073 continue
5074
5075 if opts.diff or opts.dry_run:
5076 cmd += ['--diff']
5077 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005078 stdout = RunCommand(cmd,
5079 error_ok=True,
5080 cwd=top_dir,
5081 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005082 if opts.diff:
5083 sys.stdout.write(stdout)
5084 elif len(stdout) > 0:
5085 return_value = 2
5086 else:
5087 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005088 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005089
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005090 # Format GN build files. Always run on full build files for canonical form.
5091 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005092 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005093 if opts.dry_run or opts.diff:
5094 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005095 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005096 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005097 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005098 cwd=top_dir)
5099 if opts.dry_run and gn_ret == 2:
5100 return_value = 2 # Not formatted.
5101 elif opts.diff and gn_ret == 2:
5102 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005103 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005104 elif gn_ret != 0:
5105 # For non-dry run cases (and non-2 return values for dry-run), a
5106 # nonzero error code indicates a failure, probably because the file
5107 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005108 DieWithError('gn format failed on ' + gn_diff_file +
5109 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005110
Ilya Shermane081cbe2017-08-15 17:51:04 -07005111 # Skip the metrics formatting from the global presubmit hook. These files have
5112 # a separate presubmit hook that issues an error if the files need formatting,
5113 # whereas the top-level presubmit script merely issues a warning. Formatting
5114 # these files is somewhat slow, so it's important not to duplicate the work.
5115 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005116 for diff_xml in GetDiffXMLs(diff_files):
5117 xml_dir = GetMetricsDir(diff_xml)
5118 if not xml_dir:
5119 continue
5120
Ilya Shermane081cbe2017-08-15 17:51:04 -07005121 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005122 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5123 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005124
5125 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5126 # command as histograms/pretty_print.py now needs a relative path argument
5127 # after splitting the histograms into multiple directories.
5128 # For example, in tools/metrics/ukm, pretty-print could be run using:
5129 # $ python pretty_print.py
5130 # But in tools/metrics/histogrmas, pretty-print should be run with an
5131 # additional relative path argument, like:
5132 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5133 # $ python pretty_print.py enums.xml
5134
5135 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5136 # version of histograms/pretty_print.py is released.
5137 filepath_required = os.path.exists(
5138 os.path.join(tool_dir, 'validate_prefix.py'))
5139
Weilun Shib92c4b72020-08-27 17:45:11 +00005140 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5141 or diff_xml.endswith('histogram_suffixes_list.xml')
5142 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005143 cmd.append(diff_xml)
5144
Ilya Shermane081cbe2017-08-15 17:51:04 -07005145 if opts.dry_run or opts.diff:
5146 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005147
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005148 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5149 # `shell` param and instead replace `'vpython'` with
5150 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005151 stdout = RunCommand(cmd,
5152 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005153 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005154 if opts.diff:
5155 sys.stdout.write(stdout)
5156 if opts.dry_run and stdout:
5157 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005158
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005159 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005160
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005161
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005162def GetDiffXMLs(diff_files):
5163 return [
5164 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5165 ]
5166
5167
5168def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005169 metrics_xml_dirs = [
5170 os.path.join('tools', 'metrics', 'actions'),
5171 os.path.join('tools', 'metrics', 'histograms'),
5172 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005173 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005174 os.path.join('tools', 'metrics', 'ukm'),
5175 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005176 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005177 if diff_xml.startswith(xml_dir):
5178 return xml_dir
5179 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005180
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005181
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005182@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005183@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005184def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005185 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005186 _, args = parser.parse_args(args)
5187
5188 if len(args) != 1:
5189 parser.print_help()
5190 return 1
5191
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005192 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005193 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005194 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005195
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005196 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005197
Edward Lemur52969c92020-02-06 18:15:28 +00005198 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005199 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005200 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005201
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005202 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005203 for key, issue in [x.split() for x in output.splitlines()]:
5204 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005205 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005206
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005207 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005208 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005209 return 1
5210 if len(branches) == 1:
5211 RunGit(['checkout', branches[0]])
5212 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005213 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005214 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005215 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005216 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005217 try:
5218 RunGit(['checkout', branches[int(which)]])
5219 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005220 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005221 return 1
5222
5223 return 0
5224
5225
maruel@chromium.org29404b52014-09-08 22:58:00 +00005226def CMDlol(parser, args):
5227 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005228 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005229 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5230 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5231 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005232 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005233 return 0
5234
5235
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005236class OptionParser(optparse.OptionParser):
5237 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005238
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005239 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005240 optparse.OptionParser.__init__(
5241 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005242 self.add_option(
5243 '-v', '--verbose', action='count', default=0,
5244 help='Use 2 times for more debugging info')
5245
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005246 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005247 try:
5248 return self._parse_args(args)
5249 finally:
5250 # Regardless of success or failure of args parsing, we want to report
5251 # metrics, but only after logging has been initialized (if parsing
5252 # succeeded).
5253 global settings
5254 settings = Settings()
5255
5256 if not metrics.DISABLE_METRICS_COLLECTION:
5257 # GetViewVCUrl ultimately calls logging method.
5258 project_url = settings.GetViewVCUrl().strip('/+')
5259 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5260 metrics.collector.add('project_urls', [project_url])
5261
5262 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005263 # Create an optparse.Values object that will store only the actual passed
5264 # options, without the defaults.
5265 actual_options = optparse.Values()
5266 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5267 # Create an optparse.Values object with the default options.
5268 options = optparse.Values(self.get_default_values().__dict__)
5269 # Update it with the options passed by the user.
5270 options._update_careful(actual_options.__dict__)
5271 # Store the options passed by the user in an _actual_options attribute.
5272 # We store only the keys, and not the values, since the values can contain
5273 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005274 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005275
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005276 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005277 logging.basicConfig(
5278 level=levels[min(options.verbose, len(levels) - 1)],
5279 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5280 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005281
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005282 return options, args
5283
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005284
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005285def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005286 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005287 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005288 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005289 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005290
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005291 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005292 dispatcher = subcommand.CommandDispatcher(__name__)
5293 try:
5294 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005295 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005296 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005297 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005298 if e.code != 500:
5299 raise
5300 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005301 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005302 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005303 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005304
5305
5306if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005307 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5308 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005309 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005310 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005311 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005312 sys.exit(main(sys.argv[1:]))