blob: b9a3567fc3433a292c3cf84199663cec82b60638 [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000045import owners
Edward Lesmeseeca9c62020-11-20 00:00:17 +000046import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000048import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000112DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
113DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
114
thestig@chromium.org44202a22014-03-11 19:22:18 +0000115# Valid extensions for files we want to lint.
116DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
117DEFAULT_LINT_IGNORE_REGEX = r"$^"
118
Aiden Bennerc08566e2018-10-03 17:52:42 +0000119# File name for yapf style config files.
120YAPF_CONFIG_FILENAME = '.style.yapf'
121
Edward Lesmes50da7702020-03-30 19:23:43 +0000122# The issue, patchset and codereview server are stored on git config for each
123# branch under branch.<branch-name>.<config-key>.
124ISSUE_CONFIG_KEY = 'gerritissue'
125PATCHSET_CONFIG_KEY = 'gerritpatchset'
126CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
127
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000128# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000129Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131# Initialized in main()
132settings = None
133
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134# Used by tests/git_cl_test.py to add extra logging.
135# Inside the weirdly failing test, add this:
136# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700137# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100138_IS_BEING_TESTED = False
139
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000140
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000141_KNOWN_GERRIT_TO_SHORT_URLS = {
142 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
143 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
144}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000145assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
146 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000147
148
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000149class GitPushError(Exception):
150 pass
151
152
Christopher Lamf732cd52017-01-24 12:40:11 +1100153def DieWithError(message, change_desc=None):
154 if change_desc:
155 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000156 print('\n ** Content of CL description **\n' +
157 '='*72 + '\n' +
158 change_desc.description + '\n' +
159 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100160
vapiera7fbd5a2016-06-16 09:17:49 -0700161 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 sys.exit(1)
163
164
Christopher Lamf732cd52017-01-24 12:40:11 +1100165def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000166 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000167 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000168 with open(backup_path, 'w') as backup_file:
169 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100170
171
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000172def GetNoGitPagerEnv():
173 env = os.environ.copy()
174 # 'cat' is a magical git string that disables pagers on all platforms.
175 env['GIT_PAGER'] = 'cat'
176 return env
177
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000178
bsep@chromium.org627d9002016-04-29 00:00:52 +0000179def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000181 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
182 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000183 except subprocess2.CalledProcessError as e:
184 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000185 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000186 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
187 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000188 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000189
190
191def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000192 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000193 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000194
195
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000196def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000197 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700198 if suppress_stderr:
199 stderr = subprocess2.VOID
200 else:
201 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000202 try:
tandrii5d48c322016-08-18 16:19:37 -0700203 (out, _), code = subprocess2.communicate(['git'] + args,
204 env=GetNoGitPagerEnv(),
205 stdout=subprocess2.PIPE,
206 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000207 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700208 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900209 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000210 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000211
212
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000213def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000214 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000215 return RunGitWithCode(args, suppress_stderr=True)[1]
216
217
tandrii2a16b952016-10-19 07:09:44 -0700218def time_sleep(seconds):
219 # Use this so that it can be mocked in tests without interfering with python
220 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700221 return time.sleep(seconds)
222
223
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000224def time_time():
225 # Use this so that it can be mocked in tests without interfering with python
226 # system machinery.
227 return time.time()
228
229
Edward Lemur1b52d872019-05-09 21:12:12 +0000230def datetime_now():
231 # Use this so that it can be mocked in tests without interfering with python
232 # system machinery.
233 return datetime.datetime.now()
234
235
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100236def confirm_or_exit(prefix='', action='confirm'):
237 """Asks user to press enter to continue or press Ctrl+C to abort."""
238 if not prefix or prefix.endswith('\n'):
239 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100240 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100241 mid = ' Press'
242 elif prefix.endswith(' '):
243 mid = 'press'
244 else:
245 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000246 gclient_utils.AskForData(
247 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100248
249
250def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000251 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000252 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100253 while True:
254 if 'yes'.startswith(result):
255 return True
256 if 'no'.startswith(result):
257 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000258 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100259
260
machenbach@chromium.org45453142015-09-15 08:45:22 +0000261def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000262 prop_list = getattr(options, 'properties', [])
263 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000264 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000265 try:
266 properties[key] = json.loads(val)
267 except ValueError:
268 pass # If a value couldn't be evaluated, treat it as a string.
269 return properties
270
271
Edward Lemur4c707a22019-09-24 21:13:43 +0000272def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000273 """Calls a buildbucket v2 method and returns the parsed json response."""
274 headers = {
275 'Accept': 'application/json',
276 'Content-Type': 'application/json',
277 }
278 request = json.dumps(request)
279 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
280
281 logging.info('POST %s with %s' % (url, request))
282
283 attempts = 1
284 time_to_sleep = 1
285 while True:
286 response, content = http.request(url, 'POST', body=request, headers=headers)
287 if response.status == 200:
288 return json.loads(content[4:])
289 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
290 msg = '%s error when calling POST %s with %s: %s' % (
291 response.status, url, request, content)
292 raise BuildbucketResponseException(msg)
293 logging.debug(
294 '%s error when calling POST %s with %s. '
295 'Sleeping for %d seconds and retrying...' % (
296 response.status, url, request, time_to_sleep))
297 time.sleep(time_to_sleep)
298 time_to_sleep *= 2
299 attempts += 1
300
301 assert False, 'unreachable'
302
303
Edward Lemur6215c792019-10-03 21:59:05 +0000304def _parse_bucket(raw_bucket):
305 legacy = True
306 project = bucket = None
307 if '/' in raw_bucket:
308 legacy = False
309 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000310 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000311 elif raw_bucket.startswith('luci.'):
312 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000313 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000314 elif '.' in raw_bucket:
315 project = raw_bucket.split('.')[0]
316 bucket = raw_bucket
317 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000318 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000319 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
320 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000321
322
Quinten Yearsley777660f2020-03-04 23:37:06 +0000323def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000324 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700325
326 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000328 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700329 options: Command-line options.
330 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000331 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000332 for project, bucket, builder in jobs:
333 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 print('To see results here, run: git cl try-results')
335 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700336
Quinten Yearsley777660f2020-03-04 23:37:06 +0000337 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000338 if not requests:
339 return
340
Edward Lemur5b929a42019-10-21 17:57:39 +0000341 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000342 http.force_exception_to_status_code = True
343
344 batch_request = {'requests': requests}
345 batch_response = _call_buildbucket(
346 http, options.buildbucket_host, 'Batch', batch_request)
347
348 errors = [
349 ' ' + response['error']['message']
350 for response in batch_response.get('responses', [])
351 if 'error' in response
352 ]
353 if errors:
354 raise BuildbucketResponseException(
355 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
356
357
Quinten Yearsley777660f2020-03-04 23:37:06 +0000358def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000359 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000360 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000361 shared_properties = {
362 'category': options.ensure_value('category', 'git_cl_try')
363 }
364 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000365 shared_properties['clobber'] = True
366 shared_properties.update(_get_properties_from_options(options) or {})
367
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000368 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000369 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000370 shared_tags.append({'key': 'retry_failed',
371 'value': '1'})
372
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000374 for (project, bucket, builder) in jobs:
375 properties = shared_properties.copy()
376 if 'presubmit' in builder.lower():
377 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000378
Edward Lemur45768512020-03-02 19:03:14 +0000379 requests.append({
380 'scheduleBuild': {
381 'requestId': str(uuid.uuid4()),
382 'builder': {
383 'project': getattr(options, 'project', None) or project,
384 'bucket': bucket,
385 'builder': builder,
386 },
387 'gerritChanges': gerrit_changes,
388 'properties': properties,
389 'tags': [
390 {'key': 'builder', 'value': builder},
391 ] + shared_tags,
392 }
393 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000394
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000395 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000396 requests[-1]['scheduleBuild']['gitilesCommit'] = {
397 'host': gerrit_changes[0]['host'],
398 'project': gerrit_changes[0]['project'],
399 'id': options.revision
400 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000401
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000402 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000403
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000404
Quinten Yearsley777660f2020-03-04 23:37:06 +0000405def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000406 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000407
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000408 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000409 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000410 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000411 request = {
412 'predicate': {
413 'gerritChanges': [changelist.GetGerritChange(patchset)],
414 },
415 'fields': ','.join('builds.*.' + field for field in fields),
416 }
tandrii221ab252016-10-06 08:12:04 -0700417
Edward Lemur5b929a42019-10-21 17:57:39 +0000418 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000419 if authenticator.has_cached_credentials():
420 http = authenticator.authorize(httplib2.Http())
421 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700422 print('Warning: Some results might be missing because %s' %
423 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000424 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000426 http.force_exception_to_status_code = True
427
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000428 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
429 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000430
Edward Lemur45768512020-03-02 19:03:14 +0000431
Edward Lemur5b929a42019-10-21 17:57:39 +0000432def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000433 """Fetches builds from the latest patchset that has builds (within
434 the last few patchsets).
435
436 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000437 changelist (Changelist): The CL to fetch builds for
438 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000439 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
440 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000441 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000442 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
443 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000444 """
445 assert buildbucket_host
446 assert changelist.GetIssue(), 'CL must be uploaded first'
447 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000448 if latest_patchset is None:
449 assert changelist.GetMostRecentPatchset()
450 ps = changelist.GetMostRecentPatchset()
451 else:
452 assert latest_patchset > 0, latest_patchset
453 ps = latest_patchset
454
Quinten Yearsley983111f2019-09-26 17:18:48 +0000455 min_ps = max(1, ps - 5)
456 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000457 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000458 if len(builds):
459 return builds, ps
460 ps -= 1
461 return [], 0
462
463
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000464def _filter_failed_for_retry(all_builds):
465 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000466
467 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000468 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000469 i.e. a list of buildbucket.v2.Builds which includes status and builder
470 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000471
472 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000473 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000474 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000475 """
Edward Lemur45768512020-03-02 19:03:14 +0000476 grouped = {}
477 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000478 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000479 key = (builder['project'], builder['bucket'], builder['builder'])
480 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000481
Edward Lemur45768512020-03-02 19:03:14 +0000482 jobs = []
483 for (project, bucket, builder), builds in grouped.items():
484 if 'triggered' in builder:
485 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
486 'from a parent. Please schedule a manual job for the parent '
487 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000488 continue
489 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
490 # Don't retry if any are running.
491 continue
Edward Lemur45768512020-03-02 19:03:14 +0000492 # If builder had several builds, retry only if the last one failed.
493 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
494 # build, but in case of retrying failed jobs retrying a flaky one makes
495 # sense.
496 builds = sorted(builds, key=lambda b: b['createTime'])
497 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
498 continue
499 # Don't retry experimental build previously triggered by CQ.
500 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
501 for t in builds[-1]['tags']):
502 continue
503 jobs.append((project, bucket, builder))
504
505 # Sort the jobs to make testing easier.
506 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507
508
Quinten Yearsley777660f2020-03-04 23:37:06 +0000509def _print_tryjobs(options, builds):
510 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000511 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000512 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000513 return
514
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000515 longest_builder = max(len(b['builder']['builder']) for b in builds)
516 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000517 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000518 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
519 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000520
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 builds_by_status = {}
522 for b in builds:
523 builds_by_status.setdefault(b['status'], []).append({
524 'id': b['id'],
525 'name': name_fmt.format(
526 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
527 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000528
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000529 sort_key = lambda b: (b['name'], b['id'])
530
531 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000532 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 if not builds:
534 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000536 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000537 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000538 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000539 else:
540 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
541
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 print(colorize(title))
543 for b in sorted(builds, key=sort_key):
544 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545
546 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000547 print_builds(
548 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
549 print_builds(
550 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
551 color=Fore.MAGENTA)
552 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
553 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
554 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000555 print_builds('Started:', builds_by_status.pop('STARTED', []),
556 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000557 print_builds(
558 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000560 print_builds(
561 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000562 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563
564
Aiden Bennerc08566e2018-10-03 17:52:42 +0000565def _ComputeDiffLineRanges(files, upstream_commit):
566 """Gets the changed line ranges for each file since upstream_commit.
567
568 Parses a git diff on provided files and returns a dict that maps a file name
569 to an ordered list of range tuples in the form (start_line, count).
570 Ranges are in the same format as a git diff.
571 """
572 # If files is empty then diff_output will be a full diff.
573 if len(files) == 0:
574 return {}
575
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000576 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000577 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000578 diff_output = RunGit(diff_cmd)
579
580 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
581 # 2 capture groups
582 # 0 == fname of diff file
583 # 1 == 'diff_start,diff_count' or 'diff_start'
584 # will match each of
585 # diff --git a/foo.foo b/foo.py
586 # @@ -12,2 +14,3 @@
587 # @@ -12,2 +17 @@
588 # running re.findall on the above string with pattern will give
589 # [('foo.py', ''), ('', '14,3'), ('', '17')]
590
591 curr_file = None
592 line_diffs = {}
593 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
594 if match[0] != '':
595 # Will match the second filename in diff --git a/a.py b/b.py.
596 curr_file = match[0]
597 line_diffs[curr_file] = []
598 else:
599 # Matches +14,3
600 if ',' in match[1]:
601 diff_start, diff_count = match[1].split(',')
602 else:
603 # Single line changes are of the form +12 instead of +12,1.
604 diff_start = match[1]
605 diff_count = 1
606
607 diff_start = int(diff_start)
608 diff_count = int(diff_count)
609
610 # If diff_count == 0 this is a removal we can ignore.
611 line_diffs[curr_file].append((diff_start, diff_count))
612
613 return line_diffs
614
615
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000616def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000617 """Checks if a yapf file is in any parent directory of fpath until top_dir.
618
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000619 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000620 is found returns None. Uses yapf_config_cache as a cache for previously found
621 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000623 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000624 # Return result if we've already computed it.
625 if fpath in yapf_config_cache:
626 return yapf_config_cache[fpath]
627
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000628 parent_dir = os.path.dirname(fpath)
629 if os.path.isfile(fpath):
630 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000631 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000632 # Otherwise fpath is a directory
633 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
634 if os.path.isfile(yapf_file):
635 ret = yapf_file
636 elif fpath == top_dir or parent_dir == fpath:
637 # If we're at the top level directory, or if we're at root
638 # there is no provided style.
639 ret = None
640 else:
641 # Otherwise recurse on the current directory.
642 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000643 yapf_config_cache[fpath] = ret
644 return ret
645
646
Brian Sheedyb4307d52019-12-02 19:18:17 +0000647def _GetYapfIgnorePatterns(top_dir):
648 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000649
650 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
651 but this functionality appears to break when explicitly passing files to
652 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000653 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000654 the .yapfignore file should be in the directory that yapf is invoked from,
655 which we assume to be the top level directory in this case.
656
657 Args:
658 top_dir: The top level directory for the repository being formatted.
659
660 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000661 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000662 """
663 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000664 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000665 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000666 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000667
Brian Sheedyb4307d52019-12-02 19:18:17 +0000668 with open(yapfignore_file) as f:
669 for line in f.readlines():
670 stripped_line = line.strip()
671 # Comments and blank lines should be ignored.
672 if stripped_line.startswith('#') or stripped_line == '':
673 continue
674 ignore_patterns.add(stripped_line)
675 return ignore_patterns
676
677
678def _FilterYapfIgnoredFiles(filepaths, patterns):
679 """Filters out any filepaths that match any of the given patterns.
680
681 Args:
682 filepaths: An iterable of strings containing filepaths to filter.
683 patterns: An iterable of strings containing fnmatch patterns to filter on.
684
685 Returns:
686 A list of strings containing all the elements of |filepaths| that did not
687 match any of the patterns in |patterns|.
688 """
689 # Not inlined so that tests can use the same implementation.
690 return [f for f in filepaths
691 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000692
693
Aaron Gable13101a62018-02-09 13:20:41 -0800694def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000695 """Prints statistics about the change to the user."""
696 # --no-ext-diff is broken in some versions of Git, so try to work around
697 # this by overriding the environment (but there is still a problem if the
698 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000699 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 if 'GIT_EXTERNAL_DIFF' in env:
701 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000702
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000703 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800704 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000705 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000706
707
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000708class BuildbucketResponseException(Exception):
709 pass
710
711
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000712class Settings(object):
713 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000714 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000715 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716 self.tree_status_url = None
717 self.viewvc_url = None
718 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000719 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000720 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000721 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000722 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000723 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000724
Edward Lemur26964072020-02-19 19:18:51 +0000725 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000726 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000727 if self.updated:
728 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000729
Edward Lemur26964072020-02-19 19:18:51 +0000730 # The only value that actually changes the behavior is
731 # autoupdate = "false". Everything else means "true".
732 autoupdate = (
733 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
734
735 cr_settings_file = FindCodereviewSettingsFile()
736 if autoupdate != 'false' and cr_settings_file:
737 LoadCodereviewSettingsFromFile(cr_settings_file)
738 cr_settings_file.close()
739
740 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000742 @staticmethod
743 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000744 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000745
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 if self.root is None:
748 self.root = os.path.abspath(self.GetRelativeRoot())
749 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751 def GetTreeStatusUrl(self, error_ok=False):
752 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000753 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
754 if self.tree_status_url is None and not error_ok:
755 DieWithError(
756 'You must configure your tree status URL by running '
757 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 return self.tree_status_url
759
760 def GetViewVCUrl(self):
761 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000762 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 return self.viewvc_url
764
rmistry@google.com90752582014-01-14 21:04:50 +0000765 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000766 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000767
rmistry@google.com5626a922015-02-26 14:03:30 +0000768 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000769 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000770 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000771 return run_post_upload_hook == "True"
772
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000773 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000774 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000775
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000776 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000777 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000778 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000779 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
780 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000781 # Default is squash now (http://crbug.com/611892#c23).
782 self.squash_gerrit_uploads = self._GetConfig(
783 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000784 return self.squash_gerrit_uploads
785
Edward Lesmes4de54132020-05-05 19:41:33 +0000786 def GetSquashGerritUploadsOverride(self):
787 """Return True or False if codereview.settings should be overridden.
788
789 Returns None if no override has been defined.
790 """
791 # See also http://crbug.com/611892#c23
792 result = self._GetConfig('gerrit.override-squash-uploads').lower()
793 if result == 'true':
794 return True
795 if result == 'false':
796 return False
797 return None
798
tandrii@chromium.org28253532016-04-14 13:46:56 +0000799 def GetGerritSkipEnsureAuthenticated(self):
800 """Return True if EnsureAuthenticated should not be done for Gerrit
801 uploads."""
802 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000803 self.gerrit_skip_ensure_authenticated = self._GetConfig(
804 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000805 return self.gerrit_skip_ensure_authenticated
806
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000807 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000808 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000809 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000810 # Git requires single quotes for paths with spaces. We need to replace
811 # them with double quotes for Windows to treat such paths as a single
812 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000813 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000814 return self.git_editor or None
815
thestig@chromium.org44202a22014-03-11 19:22:18 +0000816 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000817 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000818
819 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000820 return self._GetConfig(
821 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000822
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000823 def GetFormatFullByDefault(self):
824 if self.format_full_by_default is None:
825 result = (
826 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
827 error_ok=True).strip())
828 self.format_full_by_default = (result == 'true')
829 return self.format_full_by_default
830
Edward Lemur26964072020-02-19 19:18:51 +0000831 def _GetConfig(self, key, default=''):
832 self._LazyUpdateIfNeeded()
833 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834
835
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000836class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000837 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000838 NONE = 'none'
839 DRY_RUN = 'dry_run'
840 COMMIT = 'commit'
841
842 ALL_STATES = [NONE, DRY_RUN, COMMIT]
843
844
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000845class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000846 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000847 self.issue = issue
848 self.patchset = patchset
849 self.hostname = hostname
850
851 @property
852 def valid(self):
853 return self.issue is not None
854
855
Edward Lemurf38bc172019-09-03 21:02:13 +0000856def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000857 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
858 fail_result = _ParsedIssueNumberArgument()
859
Edward Lemur678a6842019-10-03 22:25:05 +0000860 if isinstance(arg, int):
861 return _ParsedIssueNumberArgument(issue=arg)
862 if not isinstance(arg, basestring):
863 return fail_result
864
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000865 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000866 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000867 if not arg.startswith('http'):
868 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700869
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000870 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000871 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
872 if url.startswith(short_url):
873 url = gerrit_url + url[len(short_url):]
874 break
875
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000876 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000877 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000878 except ValueError:
879 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200880
Edward Lemur678a6842019-10-03 22:25:05 +0000881 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
882 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
883 # Short urls like https://domain/<issue_number> can be used, but don't allow
884 # specifying the patchset (you'd 404), but we allow that here.
885 if parsed_url.path == '/':
886 part = parsed_url.fragment
887 else:
888 part = parsed_url.path
889
890 match = re.match(
891 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
892 if not match:
893 return fail_result
894
895 issue = int(match.group('issue'))
896 patchset = match.group('patchset')
897 return _ParsedIssueNumberArgument(
898 issue=issue,
899 patchset=int(patchset) if patchset else None,
900 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000901
902
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000903def _create_description_from_log(args):
904 """Pulls out the commit log to use as a base for the CL description."""
905 log_args = []
906 if len(args) == 1 and not args[0].endswith('.'):
907 log_args = [args[0] + '..']
908 elif len(args) == 1 and args[0].endswith('...'):
909 log_args = [args[0][:-1]]
910 elif len(args) == 2:
911 log_args = [args[0] + '..' + args[1]]
912 else:
913 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000914 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000915
916
Aaron Gablea45ee112016-11-22 15:14:38 -0800917class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700918 def __init__(self, issue, url):
919 self.issue = issue
920 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800921 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700922
923 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800924 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700925 self.issue, self.url)
926
927
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100928_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000929 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100930 # TODO(tandrii): these two aren't known in Gerrit.
931 'approval', 'disapproval'])
932
933
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000934class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000935 """Changelist works with one changelist in local branch.
936
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000937 Notes:
938 * Not safe for concurrent multi-{thread,process} use.
939 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700940 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000941 """
942
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000943 def __init__(self,
944 branchref=None,
945 issue=None,
946 codereview_host=None,
947 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000948 """Create a new ChangeList instance.
949
Edward Lemurf38bc172019-09-03 21:02:13 +0000950 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000951 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000952 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000953 global settings
954 if not settings:
955 # Happens when git_cl.py is used as a utility library.
956 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000957
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000958 self.branchref = branchref
959 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000960 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000961 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000962 else:
963 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000964 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000965 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000966 self.lookedup_issue = False
967 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000968 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000969 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000970 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000971 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800972 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000973 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000974 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000975
Edward Lemur125d60a2019-09-13 18:25:41 +0000976 # Lazily cached values.
977 self._gerrit_host = None # e.g. chromium-review.googlesource.com
978 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
979 # Map from change number (issue) to its detail cache.
980 self._detail_cache = {}
981
982 if codereview_host is not None:
983 assert not codereview_host.startswith('https://'), codereview_host
984 self._gerrit_host = codereview_host
985 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000986
987 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700988 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000989
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700990 The return value is a string suitable for passing to git cl with the --cc
991 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000992 """
993 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000994 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800995 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000996 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
997 return self.cc
998
Daniel Cheng7227d212017-11-17 08:12:37 -0800999 def ExtendCC(self, more_cc):
1000 """Extends the list of users to cc on this CL based on the changed files."""
1001 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001002
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001003 def GetCommitDate(self):
1004 """Returns the commit date as provided in the constructor"""
1005 return self.commit_date
1006
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001007 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001008 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001010 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001011 if not branchref:
1012 return None
1013 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001014 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 return self.branch
1016
1017 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001018 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019 self.GetBranch() # Poke the lazy loader.
1020 return self.branchref
1021
Edward Lemur85153282020-02-14 22:06:29 +00001022 def _GitGetBranchConfigValue(self, key, default=None):
1023 return scm.GIT.GetBranchConfig(
1024 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001025
Edward Lemur85153282020-02-14 22:06:29 +00001026 def _GitSetBranchConfigValue(self, key, value):
1027 action = 'set %s to %r' % (key, value)
1028 if not value:
1029 action = 'unset %s' % key
1030 assert self.GetBranch(), 'a branch is needed to ' + action
1031 return scm.GIT.SetBranchConfig(
1032 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001033
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001034 @staticmethod
1035 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001036 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001037 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001039 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1040 settings.GetRoot(), branch)
1041 if not remote or not upstream_branch:
1042 DieWithError(
1043 'Unable to determine default branch to diff against.\n'
1044 'Either pass complete "git diff"-style arguments, like\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001045 ' git cl upload origin/main\n'
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001046 'or verify this branch is set up to track another \n'
1047 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048
1049 return remote, upstream_branch
1050
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001051 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001052 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001053 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001054 DieWithError('The upstream for the current branch (%s) does not exist '
1055 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001056 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001057 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 def GetUpstreamBranch(self):
1060 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001061 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001062 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001063 upstream_branch = upstream_branch.replace('refs/heads/',
1064 'refs/remotes/%s/' % remote)
1065 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1066 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001067 self.upstream_branch = upstream_branch
1068 return self.upstream_branch
1069
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001070 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001071 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001072 remote, branch = None, self.GetBranch()
1073 seen_branches = set()
1074 while branch not in seen_branches:
1075 seen_branches.add(branch)
1076 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001077 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001078 if remote != '.' or branch.startswith('refs/remotes'):
1079 break
1080 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001081 remotes = RunGit(['remote'], error_ok=True).split()
1082 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001083 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001084 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001085 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001086 logging.warn('Could not determine which remote this change is '
1087 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001088 else:
1089 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001090 '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
1373 # Set the reviewer list now so that presubmit checks can access it.
1374 if options.reviewers or options.tbrs or options.add_owners_to:
1375 change_description.update_reviewers(
1376 options.reviewers, options.tbrs, options.add_owners_to, files,
1377 self.GetAuthor())
1378
1379 return change_description
1380
1381 def _GetTitleForUpload(self, options):
1382 # When not squashing, just return options.title.
1383 if not options.squash:
1384 return options.title
1385
1386 # On first upload, patchset title is always this string, while options.title
1387 # gets converted to first line of message.
1388 if not self.GetIssue():
1389 return 'Initial upload'
1390
1391 # When uploading subsequent patchsets, options.message is taken as the title
1392 # if options.title is not provided.
1393 if options.title:
1394 return options.title
1395 if options.message:
1396 return options.message.strip()
1397
1398 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001399 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001400 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001401 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001402 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1403 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001404
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001405 def CMDUpload(self, options, git_diff_args, orig_args):
1406 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001407 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001408 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001409 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001410 else:
1411 if self.GetBranch() is None:
1412 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1413
1414 # Default to diffing against common ancestor of upstream branch
1415 base_branch = self.GetCommonAncestorWithUpstream()
1416 git_diff_args = [base_branch, 'HEAD']
1417
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001418 # Fast best-effort checks to abort before running potentially expensive
1419 # hooks if uploading is likely to fail anyway. Passing these checks does
1420 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001421 self.EnsureAuthenticated(force=options.force)
1422 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001423
1424 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001425 watchlist = watchlists.Watchlists(settings.GetRoot())
1426 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001427 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001428 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001429
Edward Lemur5a644f82020-03-18 16:44:57 +00001430 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001431 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001432 hook_results = self.RunHook(
1433 committing=False,
1434 may_prompt=not options.force,
1435 verbose=options.verbose,
1436 parallel=options.parallel,
1437 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001438 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001439 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001440 resultdb=options.resultdb,
1441 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001442 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001443
Aaron Gable13101a62018-02-09 13:20:41 -08001444 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001445 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001446 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001447 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001448 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001449 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001450 # Run post upload hooks, if specified.
1451 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001452 self.RunPostUploadHook(
1453 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001454
1455 # Upload all dependencies if specified.
1456 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001457 print()
1458 print('--dependencies has been specified.')
1459 print('All dependent local branches will be re-uploaded.')
1460 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001461 # Remove the dependencies flag from args so that we do not end up in a
1462 # loop.
1463 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001464 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001465 return ret
1466
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001467 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001468 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001469
1470 Issue must have been already uploaded and known.
1471 """
1472 assert new_state in _CQState.ALL_STATES
1473 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001474 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001475 vote_map = {
1476 _CQState.NONE: 0,
1477 _CQState.DRY_RUN: 1,
1478 _CQState.COMMIT: 2,
1479 }
1480 labels = {'Commit-Queue': vote_map[new_state]}
1481 notify = False if new_state == _CQState.DRY_RUN else None
1482 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001483 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001484 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001485 return 0
1486 except KeyboardInterrupt:
1487 raise
1488 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001489 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001490 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001491 ' * Your project has no CQ,\n'
1492 ' * You don\'t have permission to change the CQ state,\n'
1493 ' * There\'s a bug in this code (see stack trace below).\n'
1494 'Consider specifying which bots to trigger manually or asking your '
1495 'project owners for permissions or contacting Chrome Infra at:\n'
1496 'https://www.chromium.org/infra\n\n' %
1497 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001498 # Still raise exception so that stack trace is printed.
1499 raise
1500
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001501 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001502 # Lazy load of configs.
1503 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001504 if self._gerrit_host and '.' not in self._gerrit_host:
1505 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1506 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001507 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001508 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001509 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001510 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001511 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1512 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001513 return self._gerrit_host
1514
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001515 def _GetGitHost(self):
1516 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001517 remote_url = self.GetRemoteUrl()
1518 if not remote_url:
1519 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001520 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001521
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001522 def GetCodereviewServer(self):
1523 if not self._gerrit_server:
1524 # If we're on a branch then get the server potentially associated
1525 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001526 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001527 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001528 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001529 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001530 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531 if not self._gerrit_server:
1532 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1533 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001534 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535 parts[0] = parts[0] + '-review'
1536 self._gerrit_host = '.'.join(parts)
1537 self._gerrit_server = 'https://%s' % self._gerrit_host
1538 return self._gerrit_server
1539
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001540 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001541 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001542 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001543 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001544 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001545 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001546 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001547 if project.endswith('.git'):
1548 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001549 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1550 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1551 # gitiles/git-over-https protocol. E.g.,
1552 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1553 # as
1554 # https://chromium.googlesource.com/v8/v8
1555 if project.startswith('a/'):
1556 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001557 return project
1558
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001559 def _GerritChangeIdentifier(self):
1560 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1561
1562 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001563 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001564 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001565 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001566 if project:
1567 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1568 # Fall back on still unique, but less efficient change number.
1569 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001570
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001571 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001573 if settings.GetGerritSkipEnsureAuthenticated():
1574 # For projects with unusual authentication schemes.
1575 # See http://crbug.com/603378.
1576 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001577
1578 # Check presence of cookies only if using cookies-based auth method.
1579 cookie_auth = gerrit_util.Authenticator.get()
1580 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001581 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001582
Florian Mayerae510e82020-01-30 21:04:48 +00001583 remote_url = self.GetRemoteUrl()
1584 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001585 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001586 return
1587 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001588 logging.warning('Ignoring branch %(branch)s with non-https remote '
1589 '%(remote)s', {
1590 'branch': self.branch,
1591 'remote': self.GetRemoteUrl()
1592 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001593 return
1594
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001595 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001596 self.GetCodereviewServer()
1597 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001598 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001599
1600 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1601 git_auth = cookie_auth.get_auth_header(git_host)
1602 if gerrit_auth and git_auth:
1603 if gerrit_auth == git_auth:
1604 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001605 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001606 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001607 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001608 ' %s\n'
1609 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001610 ' Consider running the following command:\n'
1611 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001612 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001613 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001614 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001615 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001616 cookie_auth.get_new_password_message(git_host)))
1617 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001618 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619 return
1620 else:
1621 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001622 ([] if gerrit_auth else [self._gerrit_host]) +
1623 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001624 DieWithError('Credentials for the following hosts are required:\n'
1625 ' %s\n'
1626 'These are read from %s (or legacy %s)\n'
1627 '%s' % (
1628 '\n '.join(missing),
1629 cookie_auth.get_gitcookies_path(),
1630 cookie_auth.get_netrc_path(),
1631 cookie_auth.get_new_password_message(git_host)))
1632
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001633 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001634 if not self.GetIssue():
1635 return
1636
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001637 status = self._GetChangeDetail()['status']
1638 if status in ('MERGED', 'ABANDONED'):
1639 DieWithError('Change %s has been %s, new uploads are not allowed' %
1640 (self.GetIssueURL(),
1641 'submitted' if status == 'MERGED' else 'abandoned'))
1642
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001643 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1644 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1645 # Apparently this check is not very important? Otherwise get_auth_email
1646 # could have been added to other implementations of Authenticator.
1647 cookies_auth = gerrit_util.Authenticator.get()
1648 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001649 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001650
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001651 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001652 if self.GetIssueOwner() == cookies_user:
1653 return
1654 logging.debug('change %s owner is %s, cookies user is %s',
1655 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001656 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001657 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001658 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001659 if details['email'] == self.GetIssueOwner():
1660 return
1661 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001662 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001663 'as %s.\n'
1664 'Uploading may fail due to lack of permissions.' %
1665 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1666 confirm_or_exit(action='upload')
1667
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001668 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001669 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001670 or CQ status, assuming adherence to a common workflow.
1671
1672 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001673 * 'error' - error from review tool (including deleted issues)
1674 * 'unsent' - no reviewers added
1675 * 'waiting' - waiting for review
1676 * 'reply' - waiting for uploader to reply to review
1677 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001678 * 'dry-run' - dry-running in the CQ
1679 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001680 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001681 """
1682 if not self.GetIssue():
1683 return None
1684
1685 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001686 data = self._GetChangeDetail([
1687 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001688 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001689 return 'error'
1690
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001691 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001692 return 'closed'
1693
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001694 cq_label = data['labels'].get('Commit-Queue', {})
1695 max_cq_vote = 0
1696 for vote in cq_label.get('all', []):
1697 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1698 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001699 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001700 if max_cq_vote == 1:
1701 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001702
Aaron Gable9ab38c62017-04-06 14:36:33 -07001703 if data['labels'].get('Code-Review', {}).get('approved'):
1704 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001705
1706 if not data.get('reviewers', {}).get('REVIEWER', []):
1707 return 'unsent'
1708
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001709 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001710 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001711 while messages:
1712 m = messages.pop()
1713 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001714 # Ignore replies from CQ.
1715 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001716 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001717 # Most recent message was by owner.
1718 return 'waiting'
1719 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001720 # Some reply from non-owner.
1721 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001722
1723 # Somehow there are no messages even though there are reviewers.
1724 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001725
1726 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001727 if not self.GetIssue():
1728 return None
1729
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001730 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001731 patchset = data['revisions'][data['current_revision']]['_number']
1732 self.SetPatchset(patchset)
1733 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001734
Gavin Make61ccc52020-11-13 00:12:57 +00001735 def GetMostRecentDryRunPatchset(self):
1736 """Get patchsets equivalent to the most recent patchset and return
1737 the patchset with the latest dry run. If none have been dry run, return
1738 the latest patchset."""
1739 if not self.GetIssue():
1740 return None
1741
1742 data = self._GetChangeDetail(['ALL_REVISIONS'])
1743 patchset = data['revisions'][data['current_revision']]['_number']
1744 dry_run = set([int(m['_revision_number'])
1745 for m in data.get('messages', [])
1746 if m.get('tag', '').endswith('dry-run')])
1747
1748 for revision_info in sorted(data.get('revisions', {}).values(),
1749 key=lambda c: c['_number'], reverse=True):
1750 if revision_info['_number'] in dry_run:
1751 patchset = revision_info['_number']
1752 break
1753 if revision_info.get('kind', '') not in \
1754 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1755 break
1756 self.SetPatchset(patchset)
1757 return patchset
1758
Aaron Gable636b13f2017-07-14 10:42:48 -07001759 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001760 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001761 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001762 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001763
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001764 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001765 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001766 # CURRENT_REVISION is included to get the latest patchset so that
1767 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001768 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001769 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1770 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001771 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001772 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001773 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001774 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001775
1776 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001777 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001778 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001779 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001780 line_comments = file_comments.setdefault(path, [])
1781 line_comments.extend(
1782 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001783
1784 # Build dictionary of file comments for easy access and sorting later.
1785 # {author+date: {path: {patchset: {line: url+message}}}}
1786 comments = collections.defaultdict(
1787 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001788 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001789 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001790 tag = comment.get('tag', '')
1791 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001792 continue
1793 key = (comment['author']['email'], comment['updated'])
1794 if comment.get('side', 'REVISION') == 'PARENT':
1795 patchset = 'Base'
1796 else:
1797 patchset = 'PS%d' % comment['patch_set']
1798 line = comment.get('line', 0)
1799 url = ('https://%s/c/%s/%s/%s#%s%s' %
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001800 (self.GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001801 'b' if comment.get('side') == 'PARENT' else '',
1802 str(line) if line else ''))
1803 comments[key][path][patchset][line] = (url, comment['message'])
1804
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001805 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001806 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001807 summary = self._BuildCommentSummary(msg, comments, readable)
1808 if summary:
1809 summaries.append(summary)
1810 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001811
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001812 @staticmethod
1813 def _BuildCommentSummary(msg, comments, readable):
1814 key = (msg['author']['email'], msg['date'])
1815 # Don't bother showing autogenerated messages that don't have associated
1816 # file or line comments. this will filter out most autogenerated
1817 # messages, but will keep robot comments like those from Tricium.
1818 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1819 if is_autogenerated and not comments.get(key):
1820 return None
1821 message = msg['message']
1822 # Gerrit spits out nanoseconds.
1823 assert len(msg['date'].split('.')[-1]) == 9
1824 date = datetime.datetime.strptime(msg['date'][:-3],
1825 '%Y-%m-%d %H:%M:%S.%f')
1826 if key in comments:
1827 message += '\n'
1828 for path, patchsets in sorted(comments.get(key, {}).items()):
1829 if readable:
1830 message += '\n%s' % path
1831 for patchset, lines in sorted(patchsets.items()):
1832 for line, (url, content) in sorted(lines.items()):
1833 if line:
1834 line_str = 'Line %d' % line
1835 path_str = '%s:%d:' % (path, line)
1836 else:
1837 line_str = 'File comment'
1838 path_str = '%s:0:' % path
1839 if readable:
1840 message += '\n %s, %s: %s' % (patchset, line_str, url)
1841 message += '\n %s\n' % content
1842 else:
1843 message += '\n%s ' % path_str
1844 message += '\n%s\n' % content
1845
1846 return _CommentSummary(
1847 date=date,
1848 message=message,
1849 sender=msg['author']['email'],
1850 autogenerated=is_autogenerated,
1851 # These could be inferred from the text messages and correlated with
1852 # Code-Review label maximum, however this is not reliable.
1853 # Leaving as is until the need arises.
1854 approval=False,
1855 disapproval=False,
1856 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001857
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001858 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001859 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001860 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001861
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001862 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001863 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001864 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001865 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001866
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001867 def _GetChangeDetail(self, options=None):
1868 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001869 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001870 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001871
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001872 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001873 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001874 options.append('CURRENT_COMMIT')
1875
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001876 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001877 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001878 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001879
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001880 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1881 # Assumption: data fetched before with extra options is suitable
1882 # for return for a smaller set of options.
1883 # For example, if we cached data for
1884 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1885 # and request is for options=[CURRENT_REVISION],
1886 # THEN we can return prior cached data.
1887 if options_set.issubset(cached_options_set):
1888 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001889
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001890 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001891 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001892 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001893 except gerrit_util.GerritError as e:
1894 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001895 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001896 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001897
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001898 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001899 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001900
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001901 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001902 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001903 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001904 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001905 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001906 except gerrit_util.GerritError as e:
1907 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001908 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001909 raise
agable32978d92016-11-01 12:55:02 -07001910 return data
1911
Karen Qian40c19422019-03-13 21:28:29 +00001912 def _IsCqConfigured(self):
1913 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001914 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001915
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001916 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001917 if git_common.is_dirty_git_tree('land'):
1918 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001919
tandriid60367b2016-06-22 05:25:12 -07001920 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001921 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001922 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001923 'which can test and land changes for you. '
1924 'Are you sure you wish to bypass it?\n',
1925 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001926 differs = True
tandriic4344b52016-08-29 06:04:54 -07001927 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001928 # Note: git diff outputs nothing if there is no diff.
1929 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001930 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001931 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001932 if detail['current_revision'] == last_upload:
1933 differs = False
1934 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001935 print('WARNING: Local branch contents differ from latest uploaded '
1936 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001937 if differs:
1938 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001939 confirm_or_exit(
1940 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1941 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001942 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001943 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001944 upstream = self.GetCommonAncestorWithUpstream()
1945 if self.GetIssue():
1946 description = self.FetchDescription()
1947 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001948 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001949 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001950 committing=True,
1951 may_prompt=not force,
1952 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001953 parallel=parallel,
1954 upstream=upstream,
1955 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001956 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001957 resultdb=resultdb,
1958 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001959
1960 self.SubmitIssue(wait_for_merge=True)
1961 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001962 links = self._GetChangeCommit().get('web_links', [])
1963 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001964 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001965 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001966 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001967 return 0
1968
Edward Lemurf38bc172019-09-03 21:02:13 +00001969 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001970 assert parsed_issue_arg.valid
1971
Edward Lemur125d60a2019-09-13 18:25:41 +00001972 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001973
1974 if parsed_issue_arg.hostname:
1975 self._gerrit_host = parsed_issue_arg.hostname
1976 self._gerrit_server = 'https://%s' % self._gerrit_host
1977
tandriic2405f52016-10-10 08:13:15 -07001978 try:
1979 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001980 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001981 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001982
1983 if not parsed_issue_arg.patchset:
1984 # Use current revision by default.
1985 revision_info = detail['revisions'][detail['current_revision']]
1986 patchset = int(revision_info['_number'])
1987 else:
1988 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001989 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001990 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1991 break
1992 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001993 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001994 (parsed_issue_arg.patchset, self.GetIssue()))
1995
Edward Lemur125d60a2019-09-13 18:25:41 +00001996 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001997 if remote_url.endswith('.git'):
1998 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001999 remote_url = remote_url.rstrip('/')
2000
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002002 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002003
2004 if remote_url != fetch_info['url']:
2005 DieWithError('Trying to patch a change from %s but this repo appears '
2006 'to be %s.' % (fetch_info['url'], remote_url))
2007
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002008 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002009
Aaron Gable62619a32017-06-16 08:22:09 -07002010 if force:
2011 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2012 print('Checked out commit for change %i patchset %i locally' %
2013 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002014 elif nocommit:
2015 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2016 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002017 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002018 RunGit(['cherry-pick', 'FETCH_HEAD'])
2019 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002020 (parsed_issue_arg.issue, patchset))
2021 print('Note: this created a local commit which does not have '
2022 'the same hash as the one uploaded for review. This will make '
2023 'uploading changes based on top of this branch difficult.\n'
2024 'If you want to do that, use "git cl patch --force" instead.')
2025
Stefan Zagerd08043c2017-10-12 12:07:02 -07002026 if self.GetBranch():
2027 self.SetIssue(parsed_issue_arg.issue)
2028 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002029 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002030 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2031 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2032 else:
2033 print('WARNING: You are in detached HEAD state.\n'
2034 'The patch has been applied to your checkout, but you will not be '
2035 'able to upload a new patch set to the gerrit issue.\n'
2036 'Try using the \'-b\' option if you would like to work on a '
2037 'branch and/or upload a new patch set.')
2038
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039 return 0
2040
tandrii16e0b4e2016-06-07 10:34:28 -07002041 def _GerritCommitMsgHookCheck(self, offer_removal):
2042 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2043 if not os.path.exists(hook):
2044 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002045 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2046 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002047 data = gclient_utils.FileRead(hook)
2048 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2049 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002050 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002051 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002052 'and may interfere with it in subtle ways.\n'
2053 'We recommend you remove the commit-msg hook.')
2054 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002055 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002056 gclient_utils.rm_file_or_tree(hook)
2057 print('Gerrit commit-msg hook removed.')
2058 else:
2059 print('OK, will keep Gerrit commit-msg hook in place.')
2060
Edward Lemur1b52d872019-05-09 21:12:12 +00002061 def _CleanUpOldTraces(self):
2062 """Keep only the last |MAX_TRACES| traces."""
2063 try:
2064 traces = sorted([
2065 os.path.join(TRACES_DIR, f)
2066 for f in os.listdir(TRACES_DIR)
2067 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2068 and not f.startswith('tmp'))
2069 ])
2070 traces_to_delete = traces[:-MAX_TRACES]
2071 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002072 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002073 except OSError:
2074 print('WARNING: Failed to remove old git traces from\n'
2075 ' %s'
2076 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002077
Edward Lemur5737f022019-05-17 01:24:00 +00002078 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002079 """Zip and write the git push traces stored in traces_dir."""
2080 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002081 traces_zip = trace_name + '-traces'
2082 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002083 # Create a temporary dir to store git config and gitcookies in. It will be
2084 # compressed and stored next to the traces.
2085 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002086 git_info_zip = trace_name + '-git-info'
2087
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002088 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002089
Edward Lemur1b52d872019-05-09 21:12:12 +00002090 git_push_metadata['trace_name'] = trace_name
2091 gclient_utils.FileWrite(
2092 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2093
2094 # Keep only the first 6 characters of the git hashes on the packet
2095 # trace. This greatly decreases size after compression.
2096 packet_traces = os.path.join(traces_dir, 'trace-packet')
2097 if os.path.isfile(packet_traces):
2098 contents = gclient_utils.FileRead(packet_traces)
2099 gclient_utils.FileWrite(
2100 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2101 shutil.make_archive(traces_zip, 'zip', traces_dir)
2102
2103 # Collect and compress the git config and gitcookies.
2104 git_config = RunGit(['config', '-l'])
2105 gclient_utils.FileWrite(
2106 os.path.join(git_info_dir, 'git-config'),
2107 git_config)
2108
2109 cookie_auth = gerrit_util.Authenticator.get()
2110 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2111 gitcookies_path = cookie_auth.get_gitcookies_path()
2112 if os.path.isfile(gitcookies_path):
2113 gitcookies = gclient_utils.FileRead(gitcookies_path)
2114 gclient_utils.FileWrite(
2115 os.path.join(git_info_dir, 'gitcookies'),
2116 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2117 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2118
Edward Lemur1b52d872019-05-09 21:12:12 +00002119 gclient_utils.rmtree(git_info_dir)
2120
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002121 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002122 """Run git push and collect the traces resulting from the execution."""
2123 # Create a temporary directory to store traces in. Traces will be compressed
2124 # and stored in a 'traces' dir inside depot_tools.
2125 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002126 trace_name = os.path.join(
2127 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002128
2129 env = os.environ.copy()
2130 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2131 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002132 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002133 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2134 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2135 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2136
2137 try:
2138 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002139 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002140 before_push = time_time()
2141 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002142 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002143 env=env,
2144 print_stdout=True,
2145 # Flush after every line: useful for seeing progress when running as
2146 # recipe.
2147 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002148 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002149 except subprocess2.CalledProcessError as e:
2150 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002151 raise GitPushError(
2152 'Failed to create a change. Please examine output above for the '
2153 'reason of the failure.\n'
2154 'Hint: run command below to diagnose common Git/Gerrit '
2155 'credential problems:\n'
2156 ' git cl creds-check\n'
2157 '\n'
2158 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2159 'component including the files below.\n'
2160 'Review the files before upload, since they might contain sensitive '
2161 'information.\n'
2162 'Set the Restrict-View-Google label so that they are not publicly '
2163 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002164 finally:
2165 execution_time = time_time() - before_push
2166 metrics.collector.add_repeated('sub_commands', {
2167 'command': 'git push',
2168 'execution_time': execution_time,
2169 'exit_code': push_returncode,
2170 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2171 })
2172
Edward Lemur1b52d872019-05-09 21:12:12 +00002173 git_push_metadata['execution_time'] = execution_time
2174 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002175 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002176
Edward Lemur1b52d872019-05-09 21:12:12 +00002177 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002178 gclient_utils.rmtree(traces_dir)
2179
2180 return push_stdout
2181
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002182 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2183 change_desc):
2184 """Upload the current branch to Gerrit, retry if new remote HEAD is
2185 found. options and change_desc may be mutated."""
2186 try:
2187 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2188 change_desc)
2189 except GitPushError as e:
2190 remote, remote_branch = self.GetRemoteBranch()
2191 should_retry = remote_branch == DEFAULT_OLD_BRANCH and \
2192 gerrit_util.GetProjectHead(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002193 self._gerrit_host, self.GetGerritProject()) == 'refs/heads/main'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002194 if not should_retry:
2195 DieWithError(str(e), change_desc)
2196
2197 print("WARNING: Detected HEAD change in upstream, fetching remote state")
2198 RunGit(['fetch', remote])
2199 options.edit_description = False
2200 options.force = True
2201 try:
2202 self._CMDUploadChange(options, git_diff_args, custom_cl_base, change_desc)
2203 except GitPushError as e:
2204 DieWithError(str(e), change_desc)
2205
2206 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2207 change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002209 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002210 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002211
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002212 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002213 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002214 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002215 # User requested to change description
2216 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002217 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002219 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002220 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002221 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002222 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002223 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002224 if len(change_ids) == 1:
2225 change_id = change_ids[0]
2226 else:
2227 change_id = GenerateGerritChangeId(change_desc.description)
2228 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002229
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002230 if options.preserve_tryjobs:
2231 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002232
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002233 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002234 parent = self._ComputeParent(
2235 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002236 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002237 with gclient_utils.temporary_file() as desc_tempfile:
2238 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2239 ref_to_push = RunGit(
2240 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002241 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 if not git_footers.get_footer_change_id(change_desc.description):
2243 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002244 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002245 self._AddChangeIdToCommitMessage(
2246 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002247 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002248 # For no-squash mode, we assume the remote called "origin" is the one we
2249 # want. It is not worthwhile to support different workflows for
2250 # no-squash mode.
2251 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002252 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2253
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002254 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002255 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2256 ref_to_push)]).splitlines()
2257 if len(commits) > 1:
2258 print('WARNING: This will upload %d commits. Run the following command '
2259 'to see which commits will be uploaded: ' % len(commits))
2260 print('git log %s..%s' % (parent, ref_to_push))
2261 print('You can also use `git squash-branch` to squash these into a '
2262 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002263 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002265 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002266 cc = []
2267 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2268 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2269 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002270 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002271 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002272 if options.cc:
2273 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002274 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002275 if change_desc.get_cced():
2276 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002277 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002278 valid_accounts = set(reviewers + cc)
2279 # TODO(crbug/877717): relax this for all hosts.
2280 else:
2281 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002282 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002283 logging.info('accounts %s are recognized, %s invalid',
2284 sorted(valid_accounts),
2285 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002286
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002287 # Extra options that can be specified at push time. Doc:
2288 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002289 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002290
Aaron Gable844cf292017-06-28 11:32:59 -07002291 # By default, new changes are started in WIP mode, and subsequent patchsets
2292 # don't send email. At any time, passing --send-mail will mark the change
2293 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002294 if options.send_mail:
2295 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002296 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002297 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002298 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002299 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002300 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002301
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002302 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002303 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002304
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002305 # Set options.title in case user was prompted in _GetTitleForUpload and
2306 # _CMDUploadChange needs to be called again.
2307 options.title = self._GetTitleForUpload(options)
2308 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002309 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002310 refspec_opts.append(
2311 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002312
agablec6787972016-09-09 16:13:34 -07002313 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002314 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002315
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002316 for r in sorted(reviewers):
2317 if r in valid_accounts:
2318 refspec_opts.append('r=%s' % r)
2319 reviewers.remove(r)
2320 else:
2321 # TODO(tandrii): this should probably be a hard failure.
2322 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2323 % r)
2324 for c in sorted(cc):
2325 # refspec option will be rejected if cc doesn't correspond to an
2326 # account, even though REST call to add such arbitrary cc may succeed.
2327 if c in valid_accounts:
2328 refspec_opts.append('cc=%s' % c)
2329 cc.remove(c)
2330
rmistry9eadede2016-09-19 11:22:43 -07002331 if options.topic:
2332 # Documentation on Gerrit topics is here:
2333 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002334 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002335
Edward Lemur687ca902018-12-05 02:30:30 +00002336 if options.enable_auto_submit:
2337 refspec_opts.append('l=Auto-Submit+1')
2338 if options.use_commit_queue:
2339 refspec_opts.append('l=Commit-Queue+2')
2340 elif options.cq_dry_run:
2341 refspec_opts.append('l=Commit-Queue+1')
2342
2343 if change_desc.get_reviewers(tbr_only=True):
2344 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002345 self.GetGerritHost(),
2346 self.GetGerritProject())
Edward Lemur687ca902018-12-05 02:30:30 +00002347 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002348
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002349 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002350 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002351 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002352 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002353 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2354
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002355 refspec_suffix = ''
2356 if refspec_opts:
2357 refspec_suffix = '%' + ','.join(refspec_opts)
2358 assert ' ' not in refspec_suffix, (
2359 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2360 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2361
Edward Lemur1b52d872019-05-09 21:12:12 +00002362 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002363 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002364 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002365 'change_id': change_id,
2366 'description': change_desc.description,
2367 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002368 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2369 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370
2371 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002372 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 change_numbers = [m.group(1)
2374 for m in map(regex.match, push_stdout.splitlines())
2375 if m]
2376 if len(change_numbers) != 1:
2377 DieWithError(
2378 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002379 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002381 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002382
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002383 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002384 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002385 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002386 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002387 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002388 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002389 reviewers, cc,
2390 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002391
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002392 return 0
2393
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002394 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2395 change_desc):
2396 """Computes parent of the generated commit to be uploaded to Gerrit.
2397
2398 Returns revision or a ref name.
2399 """
2400 if custom_cl_base:
2401 # Try to avoid creating additional unintended CLs when uploading, unless
2402 # user wants to take this risk.
2403 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2404 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2405 local_ref_of_target_remote])
2406 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002407 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002408 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2409 'If you proceed with upload, more than 1 CL may be created by '
2410 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2411 'If you are certain that specified base `%s` has already been '
2412 'uploaded to Gerrit as another CL, you may proceed.\n' %
2413 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2414 if not force:
2415 confirm_or_exit(
2416 'Do you take responsibility for cleaning up potential mess '
2417 'resulting from proceeding with upload?',
2418 action='upload')
2419 return custom_cl_base
2420
Aaron Gablef97e33d2017-03-30 15:44:27 -07002421 if remote != '.':
2422 return self.GetCommonAncestorWithUpstream()
2423
2424 # If our upstream branch is local, we base our squashed commit on its
2425 # squashed version.
2426 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2427
Aaron Gablef97e33d2017-03-30 15:44:27 -07002428 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002429 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002430 if upstream_branch_name == 'main':
2431 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002432
2433 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002434 # TODO(tandrii): consider checking parent change in Gerrit and using its
2435 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2436 # the tree hash of the parent branch. The upside is less likely bogus
2437 # requests to reupload parent change just because it's uploadhash is
2438 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002439 parent = scm.GIT.GetBranchConfig(
2440 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002441 # Verify that the upstream branch has been uploaded too, otherwise
2442 # Gerrit will create additional CLs when uploading.
2443 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2444 RunGitSilent(['rev-parse', parent + ':'])):
2445 DieWithError(
2446 '\nUpload upstream branch %s first.\n'
2447 'It is likely that this branch has been rebased since its last '
2448 'upload, so you just need to upload it again.\n'
2449 '(If you uploaded it with --no-squash, then branch dependencies '
2450 'are not supported, and you should reupload with --squash.)'
2451 % upstream_branch_name,
2452 change_desc)
2453 return parent
2454
Edward Lemura12175c2020-03-09 16:58:26 +00002455 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002456 """Re-commits using the current message, assumes the commit hook is in
2457 place.
2458 """
Edward Lemura12175c2020-03-09 16:58:26 +00002459 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002460 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002461 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002462 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002463 return new_log_desc
2464 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002465 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466
tandriie113dfd2016-10-11 10:20:12 -07002467 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002468 try:
2469 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002470 except GerritChangeNotExists:
2471 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002472
2473 if data['status'] in ('ABANDONED', 'MERGED'):
2474 return 'CL %s is closed' % self.GetIssue()
2475
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002476 def GetGerritChange(self, patchset=None):
2477 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002478 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002479 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002480 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002481 data = self._GetChangeDetail(['ALL_REVISIONS'])
2482
2483 assert host and issue and patchset, 'CL must be uploaded first'
2484
2485 has_patchset = any(
2486 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002487 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002488 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002489 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002490 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002491
tandrii8c5a3532016-11-04 07:52:02 -07002492 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002493 'host': host,
2494 'change': issue,
2495 'project': data['project'],
2496 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002497 }
tandriie113dfd2016-10-11 10:20:12 -07002498
tandriide281ae2016-10-12 06:02:30 -07002499 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002500 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002501
Edward Lemur707d70b2018-02-07 00:50:14 +01002502 def GetReviewers(self):
2503 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002504 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002505
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002506
Lei Zhang8a0efc12020-08-05 19:58:45 +00002507def _get_bug_line_values(default_project_prefix, bugs):
2508 """Given default_project_prefix and comma separated list of bugs, yields bug
2509 line values.
tandriif9aefb72016-07-01 09:06:51 -07002510
2511 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002512 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002513 * string, which is left as is.
2514
2515 This function may produce more than one line, because bugdroid expects one
2516 project per line.
2517
Lei Zhang8a0efc12020-08-05 19:58:45 +00002518 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002519 ['v8:123', 'chromium:789']
2520 """
2521 default_bugs = []
2522 others = []
2523 for bug in bugs.split(','):
2524 bug = bug.strip()
2525 if bug:
2526 try:
2527 default_bugs.append(int(bug))
2528 except ValueError:
2529 others.append(bug)
2530
2531 if default_bugs:
2532 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002533 if default_project_prefix:
2534 if not default_project_prefix.endswith(':'):
2535 default_project_prefix += ':'
2536 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002537 else:
2538 yield default_bugs
2539 for other in sorted(others):
2540 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2541 yield other
2542
2543
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002544class ChangeDescription(object):
2545 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002546 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002547 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002548 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002549 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002550 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002551 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2552 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002553 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002554 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002555
Dan Beamd8b04ca2019-10-10 21:23:26 +00002556 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002557 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002558 if bug:
2559 regexp = re.compile(self.BUG_LINE)
2560 prefix = settings.GetBugPrefix()
2561 if not any((regexp.match(line) for line in self._description_lines)):
2562 values = list(_get_bug_line_values(prefix, bug))
2563 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002564 if fixed:
2565 regexp = re.compile(self.FIXED_LINE)
2566 prefix = settings.GetBugPrefix()
2567 if not any((regexp.match(line) for line in self._description_lines)):
2568 values = list(_get_bug_line_values(prefix, fixed))
2569 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002570
agable@chromium.org42c20792013-09-12 17:34:49 +00002571 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002572 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002573 return '\n'.join(self._description_lines)
2574
2575 def set_description(self, desc):
2576 if isinstance(desc, basestring):
2577 lines = desc.splitlines()
2578 else:
2579 lines = [line.rstrip() for line in desc]
2580 while lines and not lines[0]:
2581 lines.pop(0)
2582 while lines and not lines[-1]:
2583 lines.pop(-1)
2584 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002585
Edward Lemur5a644f82020-03-18 16:44:57 +00002586 def ensure_change_id(self, change_id):
2587 description = self.description
2588 footer_change_ids = git_footers.get_footer_change_id(description)
2589 # Make sure that the Change-Id in the description matches the given one.
2590 if footer_change_ids != [change_id]:
2591 if footer_change_ids:
2592 # Remove any existing Change-Id footers since they don't match the
2593 # expected change_id footer.
2594 description = git_footers.remove_footer(description, 'Change-Id')
2595 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2596 'if you want to set a new one.')
2597 # Add the expected Change-Id footer.
2598 description = git_footers.add_footer_change_id(description, change_id)
2599 self.set_description(description)
2600
Edward Lemur2c62b332020-03-12 22:12:33 +00002601 def update_reviewers(
2602 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002603 """Rewrites the R=/TBR= line(s) as a single line each.
2604
2605 Args:
2606 reviewers (list(str)) - list of additional emails to use for reviewers.
2607 tbrs (list(str)) - list of additional emails to use for TBRs.
2608 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2609 the change that are missing OWNER coverage. If this is not None, you
2610 must also pass a value for `change`.
2611 change (Change) - The Change that should be used for OWNERS lookups.
2612 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002613 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002614 assert isinstance(tbrs, list), tbrs
2615
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002616 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002617 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002618
2619 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002620 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002621
2622 reviewers = set(reviewers)
2623 tbrs = set(tbrs)
2624 LOOKUP = {
2625 'TBR': tbrs,
2626 'R': reviewers,
2627 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002628
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002629 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002630 regexp = re.compile(self.R_LINE)
2631 matches = [regexp.match(line) for line in self._description_lines]
2632 new_desc = [l for i, l in enumerate(self._description_lines)
2633 if not matches[i]]
2634 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002635
agable@chromium.org42c20792013-09-12 17:34:49 +00002636 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002637
2638 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002639 for match in matches:
2640 if not match:
2641 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002642 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2643
2644 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002645 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002646 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002647 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002648 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002649 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002650 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002651 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002652
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002653 # If any folks ended up in both groups, remove them from tbrs.
2654 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002655
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002656 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2657 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002658
2659 # Put the new lines in the description where the old first R= line was.
2660 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2661 if 0 <= line_loc < len(self._description_lines):
2662 if new_tbr_line:
2663 self._description_lines.insert(line_loc, new_tbr_line)
2664 if new_r_line:
2665 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002666 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002667 if new_r_line:
2668 self.append_footer(new_r_line)
2669 if new_tbr_line:
2670 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002671
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002672 def set_preserve_tryjobs(self):
2673 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2674 footers = git_footers.parse_footers(self.description)
2675 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2676 if v.lower() == 'true':
2677 return
2678 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2679
Anthony Polito8b955342019-09-24 19:01:36 +00002680 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002681 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002682 self.set_description([
2683 '# Enter a description of the change.',
2684 '# This will be displayed on the codereview site.',
2685 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002686 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002687 '--------------------',
2688 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002689 bug_regexp = re.compile(self.BUG_LINE)
2690 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002691 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002692 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002693
Dan Beamd8b04ca2019-10-10 21:23:26 +00002694 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002695 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002696
Bruce Dawsonfc487042020-10-27 19:11:37 +00002697 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002698 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002699 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002700 if not content:
2701 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002702 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002703
Bruce Dawson2377b012018-01-11 16:46:49 -08002704 # Strip off comments and default inserted "Bug:" line.
2705 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002706 (line.startswith('#') or
2707 line.rstrip() == "Bug:" or
2708 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002709 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002710 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002711 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002712
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002713 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002714 """Adds a footer line to the description.
2715
2716 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2717 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2718 that Gerrit footers are always at the end.
2719 """
2720 parsed_footer_line = git_footers.parse_footer(line)
2721 if parsed_footer_line:
2722 # Line is a gerrit footer in the form: Footer-Key: any value.
2723 # Thus, must be appended observing Gerrit footer rules.
2724 self.set_description(
2725 git_footers.add_footer(self.description,
2726 key=parsed_footer_line[0],
2727 value=parsed_footer_line[1]))
2728 return
2729
2730 if not self._description_lines:
2731 self._description_lines.append(line)
2732 return
2733
2734 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2735 if gerrit_footers:
2736 # git_footers.split_footers ensures that there is an empty line before
2737 # actual (gerrit) footers, if any. We have to keep it that way.
2738 assert top_lines and top_lines[-1] == ''
2739 top_lines, separator = top_lines[:-1], top_lines[-1:]
2740 else:
2741 separator = [] # No need for separator if there are no gerrit_footers.
2742
2743 prev_line = top_lines[-1] if top_lines else ''
2744 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2745 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2746 top_lines.append('')
2747 top_lines.append(line)
2748 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002749
tandrii99a72f22016-08-17 14:33:24 -07002750 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002751 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002752 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002753 reviewers = [match.group(2).strip()
2754 for match in matches
2755 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002756 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002757
bradnelsond975b302016-10-23 12:20:23 -07002758 def get_cced(self):
2759 """Retrieves the list of reviewers."""
2760 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2761 cced = [match.group(2).strip() for match in matches if match]
2762 return cleanup_list(cced)
2763
Nodir Turakulov23b82142017-11-16 11:04:25 -08002764 def get_hash_tags(self):
2765 """Extracts and sanitizes a list of Gerrit hashtags."""
2766 subject = (self._description_lines or ('',))[0]
2767 subject = re.sub(
2768 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2769
2770 tags = []
2771 start = 0
2772 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2773 while True:
2774 m = bracket_exp.match(subject, start)
2775 if not m:
2776 break
2777 tags.append(self.sanitize_hash_tag(m.group(1)))
2778 start = m.end()
2779
2780 if not tags:
2781 # Try "Tag: " prefix.
2782 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2783 if m:
2784 tags.append(self.sanitize_hash_tag(m.group(1)))
2785 return tags
2786
2787 @classmethod
2788 def sanitize_hash_tag(cls, tag):
2789 """Returns a sanitized Gerrit hash tag.
2790
2791 A sanitized hashtag can be used as a git push refspec parameter value.
2792 """
2793 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2794
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002796def FindCodereviewSettingsFile(filename='codereview.settings'):
2797 """Finds the given file starting in the cwd and going up.
2798
2799 Only looks up to the top of the repository unless an
2800 'inherit-review-settings-ok' file exists in the root of the repository.
2801 """
2802 inherit_ok_file = 'inherit-review-settings-ok'
2803 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002804 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002805 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2806 root = '/'
2807 while True:
2808 if filename in os.listdir(cwd):
2809 if os.path.isfile(os.path.join(cwd, filename)):
2810 return open(os.path.join(cwd, filename))
2811 if cwd == root:
2812 break
2813 cwd = os.path.dirname(cwd)
2814
2815
2816def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002817 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002818 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002819
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002820 def SetProperty(name, setting, unset_error_ok=False):
2821 fullname = 'rietveld.' + name
2822 if setting in keyvals:
2823 RunGit(['config', fullname, keyvals[setting]])
2824 else:
2825 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2826
tandrii48df5812016-10-17 03:55:37 -07002827 if not keyvals.get('GERRIT_HOST', False):
2828 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002829 # Only server setting is required. Other settings can be absent.
2830 # In that case, we ignore errors raised during option deletion attempt.
2831 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2832 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2833 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002834 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002835 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2836 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002837 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2838 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002839 SetProperty(
2840 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002841
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002842 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002843 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002844
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002845 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002846 RunGit(['config', 'gerrit.squash-uploads',
2847 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002848
tandrii@chromium.org28253532016-04-14 13:46:56 +00002849 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002850 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002851 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2852
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002853 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002854 # should be of the form
2855 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2856 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002857 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2858 keyvals['ORIGIN_URL_CONFIG']])
2859
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002860
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002861def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002862 """Downloads a network object to a local file, like urllib.urlretrieve.
2863
2864 This is necessary because urllib is broken for SSL connections via a proxy.
2865 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002866 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002867 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002868
2869
ukai@chromium.org712d6102013-11-27 00:52:58 +00002870def hasSheBang(fname):
2871 """Checks fname is a #! script."""
2872 with open(fname) as f:
2873 return f.read(2).startswith('#!')
2874
2875
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002876def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002877 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002878
2879 Args:
2880 force: True to update hooks. False to install hooks if not present.
2881 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002882 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002883 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2884 if not os.access(dst, os.X_OK):
2885 if os.path.exists(dst):
2886 if not force:
2887 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002888 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002889 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002890 if not hasSheBang(dst):
2891 DieWithError('Not a script: %s\n'
2892 'You need to download from\n%s\n'
2893 'into .git/hooks/commit-msg and '
2894 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002895 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2896 except Exception:
2897 if os.path.exists(dst):
2898 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002899 DieWithError('\nFailed to download hooks.\n'
2900 'You need to download from\n%s\n'
2901 'into .git/hooks/commit-msg and '
2902 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002903
2904
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002905class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002906 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002907
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002908 _GOOGLESOURCE = 'googlesource.com'
2909
2910 def __init__(self):
2911 # Cached list of [host, identity, source], where source is either
2912 # .gitcookies or .netrc.
2913 self._all_hosts = None
2914
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002915 def ensure_configured_gitcookies(self):
2916 """Runs checks and suggests fixes to make git use .gitcookies from default
2917 path."""
2918 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2919 configured_path = RunGitSilent(
2920 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002921 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002922 if configured_path:
2923 self._ensure_default_gitcookies_path(configured_path, default)
2924 else:
2925 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002926
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002927 @staticmethod
2928 def _ensure_default_gitcookies_path(configured_path, default_path):
2929 assert configured_path
2930 if configured_path == default_path:
2931 print('git is already configured to use your .gitcookies from %s' %
2932 configured_path)
2933 return
2934
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002935 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002936 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2937 (configured_path, default_path))
2938
2939 if not os.path.exists(configured_path):
2940 print('However, your configured .gitcookies file is missing.')
2941 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2942 action='reconfigure')
2943 RunGit(['config', '--global', 'http.cookiefile', default_path])
2944 return
2945
2946 if os.path.exists(default_path):
2947 print('WARNING: default .gitcookies file already exists %s' %
2948 default_path)
2949 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2950 default_path)
2951
2952 confirm_or_exit('Move existing .gitcookies to default location?',
2953 action='move')
2954 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002955 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002956 print('Moved and reconfigured git to use .gitcookies from %s' %
2957 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002958
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002959 @staticmethod
2960 def _configure_gitcookies_path(default_path):
2961 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2962 if os.path.exists(netrc_path):
2963 print('You seem to be using outdated .netrc for git credentials: %s' %
2964 netrc_path)
2965 print('This tool will guide you through setting up recommended '
2966 '.gitcookies store for git credentials.\n'
2967 '\n'
2968 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2969 ' git config --global --unset http.cookiefile\n'
2970 ' mv %s %s.backup\n\n' % (default_path, default_path))
2971 confirm_or_exit(action='setup .gitcookies')
2972 RunGit(['config', '--global', 'http.cookiefile', default_path])
2973 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002974
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002975 def get_hosts_with_creds(self, include_netrc=False):
2976 if self._all_hosts is None:
2977 a = gerrit_util.CookiesAuthenticator()
2978 self._all_hosts = [
2979 (h, u, s)
2980 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002981 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2982 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002983 )
2984 if h.endswith(self._GOOGLESOURCE)
2985 ]
2986
2987 if include_netrc:
2988 return self._all_hosts
2989 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2990
2991 def print_current_creds(self, include_netrc=False):
2992 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2993 if not hosts:
2994 print('No Git/Gerrit credentials found')
2995 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002996 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002997 header = [('Host', 'User', 'Which file'),
2998 ['=' * l for l in lengths]]
2999 for row in (header + hosts):
3000 print('\t'.join((('%%+%ds' % l) % s)
3001 for l, s in zip(lengths, row)))
3002
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003003 @staticmethod
3004 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003005 """Parses identity "git-<username>.domain" into <username> and domain."""
3006 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003007 # distinguishable from sub-domains. But we do know typical domains:
3008 if identity.endswith('.chromium.org'):
3009 domain = 'chromium.org'
3010 username = identity[:-len('.chromium.org')]
3011 else:
3012 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003013 if username.startswith('git-'):
3014 username = username[len('git-'):]
3015 return username, domain
3016
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003017 def _canonical_git_googlesource_host(self, host):
3018 """Normalizes Gerrit hosts (with '-review') to Git host."""
3019 assert host.endswith(self._GOOGLESOURCE)
3020 # Prefix doesn't include '.' at the end.
3021 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3022 if prefix.endswith('-review'):
3023 prefix = prefix[:-len('-review')]
3024 return prefix + '.' + self._GOOGLESOURCE
3025
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003026 def _canonical_gerrit_googlesource_host(self, host):
3027 git_host = self._canonical_git_googlesource_host(host)
3028 prefix = git_host.split('.', 1)[0]
3029 return prefix + '-review.' + self._GOOGLESOURCE
3030
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003031 def _get_counterpart_host(self, host):
3032 assert host.endswith(self._GOOGLESOURCE)
3033 git = self._canonical_git_googlesource_host(host)
3034 gerrit = self._canonical_gerrit_googlesource_host(git)
3035 return git if gerrit == host else gerrit
3036
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003037 def has_generic_host(self):
3038 """Returns whether generic .googlesource.com has been configured.
3039
3040 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3041 """
3042 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3043 if host == '.' + self._GOOGLESOURCE:
3044 return True
3045 return False
3046
3047 def _get_git_gerrit_identity_pairs(self):
3048 """Returns map from canonic host to pair of identities (Git, Gerrit).
3049
3050 One of identities might be None, meaning not configured.
3051 """
3052 host_to_identity_pairs = {}
3053 for host, identity, _ in self.get_hosts_with_creds():
3054 canonical = self._canonical_git_googlesource_host(host)
3055 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3056 idx = 0 if canonical == host else 1
3057 pair[idx] = identity
3058 return host_to_identity_pairs
3059
3060 def get_partially_configured_hosts(self):
3061 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003062 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003063 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003064 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003065
3066 def get_conflicting_hosts(self):
3067 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003068 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003069 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003070 if None not in (i1, i2) and i1 != i2)
3071
3072 def get_duplicated_hosts(self):
3073 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003074 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003075
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003076
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003077 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003078 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003079 hosts = sorted(hosts)
3080 assert hosts
3081 if extra_column_func is None:
3082 extras = [''] * len(hosts)
3083 else:
3084 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003085 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3086 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003087 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003088 lines.append(tmpl % he)
3089 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003090
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003091 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003092 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003093 yield ('.googlesource.com wildcard record detected',
3094 ['Chrome Infrastructure team recommends to list full host names '
3095 'explicitly.'],
3096 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003097
3098 dups = self.get_duplicated_hosts()
3099 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003100 yield ('The following hosts were defined twice',
3101 self._format_hosts(dups),
3102 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003103
3104 partial = self.get_partially_configured_hosts()
3105 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003106 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3107 'These hosts are missing',
3108 self._format_hosts(partial, lambda host: 'but %s defined' %
3109 self._get_counterpart_host(host)),
3110 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003111
3112 conflicting = self.get_conflicting_hosts()
3113 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003114 yield ('The following Git hosts have differing credentials from their '
3115 'Gerrit counterparts',
3116 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3117 tuple(self._get_git_gerrit_identity_pairs()[host])),
3118 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003119
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003120 def find_and_report_problems(self):
3121 """Returns True if there was at least one problem, else False."""
3122 found = False
3123 bad_hosts = set()
3124 for title, sublines, hosts in self._find_problems():
3125 if not found:
3126 found = True
3127 print('\n\n.gitcookies problem report:\n')
3128 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003129 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003130 if sublines:
3131 print()
3132 print(' %s' % '\n '.join(sublines))
3133 print()
3134
3135 if bad_hosts:
3136 assert found
3137 print(' You can manually remove corresponding lines in your %s file and '
3138 'visit the following URLs with correct account to generate '
3139 'correct credential lines:\n' %
3140 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3141 print(' %s' % '\n '.join(sorted(set(
3142 gerrit_util.CookiesAuthenticator().get_new_password_url(
3143 self._canonical_git_googlesource_host(host))
3144 for host in bad_hosts
3145 ))))
3146 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003147
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003148
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003149@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003150def CMDcreds_check(parser, args):
3151 """Checks credentials and suggests changes."""
3152 _, _ = parser.parse_args(args)
3153
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003154 # Code below checks .gitcookies. Abort if using something else.
3155 authn = gerrit_util.Authenticator.get()
3156 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003157 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003158 'This command is not designed for bot environment. It checks '
3159 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003160 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3161 if isinstance(authn, gerrit_util.GceAuthenticator):
3162 message += (
3163 '\n'
3164 'If you need to run this on GCE or a cloudtop instance, '
3165 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3166 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003167
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003168 checker = _GitCookiesChecker()
3169 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003170
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003171 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003172 checker.print_current_creds(include_netrc=True)
3173
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003174 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003175 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003176 return 0
3177 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003178
3179
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003180@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003181def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003182 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003183 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003184 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003185 _, args = parser.parse_args(args)
3186 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003187 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003188 return RunGit(['config', 'branch.%s.base-url' % branch],
3189 error_ok=False).strip()
3190 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003191 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003192 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3193 error_ok=False).strip()
3194
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003195
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003196def color_for_status(status):
3197 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003198 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003199 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003200 'unsent': BOLD + Fore.YELLOW,
3201 'waiting': BOLD + Fore.RED,
3202 'reply': BOLD + Fore.YELLOW,
3203 'not lgtm': BOLD + Fore.RED,
3204 'lgtm': BOLD + Fore.GREEN,
3205 'commit': BOLD + Fore.MAGENTA,
3206 'closed': BOLD + Fore.CYAN,
3207 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003208 }.get(status, Fore.WHITE)
3209
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003210
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003211def get_cl_statuses(changes, fine_grained, max_processes=None):
3212 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003213
3214 If fine_grained is true, this will fetch CL statuses from the server.
3215 Otherwise, simply indicate if there's a matching url for the given branches.
3216
3217 If max_processes is specified, it is used as the maximum number of processes
3218 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3219 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003220
3221 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003222 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003223 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003224 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003225
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003226 if not fine_grained:
3227 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003228 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003229 for cl in changes:
3230 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003231 return
3232
3233 # First, sort out authentication issues.
3234 logging.debug('ensuring credentials exist')
3235 for cl in changes:
3236 cl.EnsureAuthenticated(force=False, refresh=True)
3237
3238 def fetch(cl):
3239 try:
3240 return (cl, cl.GetStatus())
3241 except:
3242 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003243 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003244 raise
3245
3246 threads_count = len(changes)
3247 if max_processes:
3248 threads_count = max(1, min(threads_count, max_processes))
3249 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3250
Edward Lemur61bf4172020-02-24 23:22:37 +00003251 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003252 fetched_cls = set()
3253 try:
3254 it = pool.imap_unordered(fetch, changes).__iter__()
3255 while True:
3256 try:
3257 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003258 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003259 break
3260 fetched_cls.add(cl)
3261 yield cl, status
3262 finally:
3263 pool.close()
3264
3265 # Add any branches that failed to fetch.
3266 for cl in set(changes) - fetched_cls:
3267 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003268
rmistry@google.com2dd99862015-06-22 12:22:18 +00003269
Jose Lopes3863fc52020-04-07 17:00:25 +00003270def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003271 """Uploads CLs of local branches that are dependents of the current branch.
3272
3273 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003274
3275 test1 -> test2.1 -> test3.1
3276 -> test3.2
3277 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003278
3279 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3280 run on the dependent branches in this order:
3281 test2.1, test3.1, test3.2, test2.2, test3.3
3282
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003283 Note: This function does not rebase your local dependent branches. Use it
3284 when you make a change to the parent branch that will not conflict
3285 with its dependent branches, and you would like their dependencies
3286 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003287 """
3288 if git_common.is_dirty_git_tree('upload-branch-deps'):
3289 return 1
3290
3291 root_branch = cl.GetBranch()
3292 if root_branch is None:
3293 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3294 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003295 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003296 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3297 'patchset dependencies without an uploaded CL.')
3298
3299 branches = RunGit(['for-each-ref',
3300 '--format=%(refname:short) %(upstream:short)',
3301 'refs/heads'])
3302 if not branches:
3303 print('No local branches found.')
3304 return 0
3305
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003306 # Create a dictionary of all local branches to the branches that are
3307 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003308 tracked_to_dependents = collections.defaultdict(list)
3309 for b in branches.splitlines():
3310 tokens = b.split()
3311 if len(tokens) == 2:
3312 branch_name, tracked = tokens
3313 tracked_to_dependents[tracked].append(branch_name)
3314
vapiera7fbd5a2016-06-16 09:17:49 -07003315 print()
3316 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003317 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003318
rmistry@google.com2dd99862015-06-22 12:22:18 +00003319 def traverse_dependents_preorder(branch, padding=''):
3320 dependents_to_process = tracked_to_dependents.get(branch, [])
3321 padding += ' '
3322 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003323 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003324 dependents.append(dependent)
3325 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003326
rmistry@google.com2dd99862015-06-22 12:22:18 +00003327 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003328 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003329
3330 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003331 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003332 return 0
3333
Jose Lopes3863fc52020-04-07 17:00:25 +00003334 if not force:
3335 confirm_or_exit('This command will checkout all dependent branches and run '
3336 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003337
rmistry@google.com2dd99862015-06-22 12:22:18 +00003338 # Record all dependents that failed to upload.
3339 failures = {}
3340 # Go through all dependents, checkout the branch and upload.
3341 try:
3342 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003343 print()
3344 print('--------------------------------------')
3345 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003346 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003347 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003348 try:
3349 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003350 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003351 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003352 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003353 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003354 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003355 finally:
3356 # Swap back to the original root branch.
3357 RunGit(['checkout', '-q', root_branch])
3358
vapiera7fbd5a2016-06-16 09:17:49 -07003359 print()
3360 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003361 for dependent_branch in dependents:
3362 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003363 print(' %s : %s' % (dependent_branch, upload_status))
3364 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003365
3366 return 0
3367
3368
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003369def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003370 """Given a proposed tag name, returns a tag name that is guaranteed to be
3371 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3372 or 'foo-3', and so on."""
3373
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003374 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003375 for suffix_num in itertools.count(1):
3376 if suffix_num == 1:
3377 to_check = proposed_tag
3378 else:
3379 to_check = '%s-%d' % (proposed_tag, suffix_num)
3380
3381 if to_check not in existing_tags:
3382 return to_check
3383
3384
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003385@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003386def CMDarchive(parser, args):
3387 """Archives and deletes branches associated with closed changelists."""
3388 parser.add_option(
3389 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003390 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003391 parser.add_option(
3392 '-f', '--force', action='store_true',
3393 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003394 parser.add_option(
3395 '-d', '--dry-run', action='store_true',
3396 help='Skip the branch tagging and removal steps.')
3397 parser.add_option(
3398 '-t', '--notags', action='store_true',
3399 help='Do not tag archived branches. '
3400 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003401 parser.add_option(
3402 '-p',
3403 '--pattern',
3404 default='git-cl-archived-{issue}-{branch}',
3405 help='Format string for archive tags. '
3406 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003407
kmarshall3bff56b2016-06-06 18:31:47 -07003408 options, args = parser.parse_args(args)
3409 if args:
3410 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003411
3412 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3413 if not branches:
3414 return 0
3415
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003416 tags = RunGit(['for-each-ref', '--format=%(refname)',
3417 'refs/tags']).splitlines() or []
3418 tags = [t.split('/')[-1] for t in tags]
3419
vapiera7fbd5a2016-06-16 09:17:49 -07003420 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003421 changes = [Changelist(branchref=b)
3422 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003423 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3424 statuses = get_cl_statuses(changes,
3425 fine_grained=True,
3426 max_processes=options.maxjobs)
3427 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003428 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3429 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003430 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003431 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003432 proposal.sort()
3433
3434 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003435 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003436 return 0
3437
Edward Lemur85153282020-02-14 22:06:29 +00003438 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003439
vapiera7fbd5a2016-06-16 09:17:49 -07003440 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003441 if options.notags:
3442 for next_item in proposal:
3443 print(' ' + next_item[0])
3444 else:
3445 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3446 for next_item in proposal:
3447 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003448
kmarshall9249e012016-08-23 12:02:16 -07003449 # Quit now on precondition failure or if instructed by the user, either
3450 # via an interactive prompt or by command line flags.
3451 if options.dry_run:
3452 print('\nNo changes were made (dry run).\n')
3453 return 0
3454 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003455 print('You are currently on a branch \'%s\' which is associated with a '
3456 'closed codereview issue, so archive cannot proceed. Please '
3457 'checkout another branch and run this command again.' %
3458 current_branch)
3459 return 1
kmarshall9249e012016-08-23 12:02:16 -07003460 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003461 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003462 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003463 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003464 return 1
3465
3466 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003467 if not options.notags:
3468 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003469
3470 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3471 # Clean up the tag if we failed to delete the branch.
3472 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003473
vapiera7fbd5a2016-06-16 09:17:49 -07003474 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003475
3476 return 0
3477
3478
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003479@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003480def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003481 """Show status of changelists.
3482
3483 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003484 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003485 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003486 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003487 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003488 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003489 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003490 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003491
3492 Also see 'git cl comments'.
3493 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003494 parser.add_option(
3495 '--no-branch-color',
3496 action='store_true',
3497 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003498 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003499 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003500 parser.add_option('-f', '--fast', action='store_true',
3501 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003502 parser.add_option(
3503 '-j', '--maxjobs', action='store', type=int,
3504 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003505 parser.add_option(
3506 '-i', '--issue', type=int,
3507 help='Operate on this issue instead of the current branch\'s implicit '
3508 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003509 parser.add_option('-d',
3510 '--date-order',
3511 action='store_true',
3512 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003513 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003514 if args:
3515 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003516
iannuccie53c9352016-08-17 14:40:40 -07003517 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003518 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003519
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003520 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003521 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003522 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003523 if cl.GetIssue():
3524 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003525 elif options.field == 'id':
3526 issueid = cl.GetIssue()
3527 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003529 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003530 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003531 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003533 elif options.field == 'status':
3534 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003535 elif options.field == 'url':
3536 url = cl.GetIssueURL()
3537 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003539 return 0
3540
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003541 branches = RunGit([
3542 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3543 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003544 if not branches:
3545 print('No local branch found.')
3546 return 0
3547
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003548 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003549 Changelist(branchref=b, commit_date=ct)
3550 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3551 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003552 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003553 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003554 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003555 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003556
Edward Lemur85153282020-02-14 22:06:29 +00003557 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003558
3559 def FormatBranchName(branch, colorize=False):
3560 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3561 an asterisk when it is the current branch."""
3562
3563 asterisk = ""
3564 color = Fore.RESET
3565 if branch == current_branch:
3566 asterisk = "* "
3567 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003568 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003569
3570 if colorize:
3571 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003572 return asterisk + branch_name
3573
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003574 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003575
3576 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003577 if options.date_order:
3578 sorted_changes = sorted(changes,
3579 key=lambda c: c.GetCommitDate(),
3580 reverse=True)
3581 else:
3582 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3583 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003584 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003585 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003586 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003587 branch_statuses[c.GetBranch()] = status
3588 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003589 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003590 if url and (not status or status == 'error'):
3591 # The issue probably doesn't exist anymore.
3592 url += ' (broken)'
3593
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003594 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003595 # Turn off bold as well as colors.
3596 END = '\033[0m'
3597 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003598 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003599 color = ''
3600 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003601 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003602
Alan Cuttera3be9a52019-03-04 18:50:33 +00003603 branch_display = FormatBranchName(branch)
3604 padding = ' ' * (alignment - len(branch_display))
3605 if not options.no_branch_color:
3606 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003607
Alan Cuttera3be9a52019-03-04 18:50:33 +00003608 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3609 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003610
vapiera7fbd5a2016-06-16 09:17:49 -07003611 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003612 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003613 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003614 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003615 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003616 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003617 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003618 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003620 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003621 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003622 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003623 return 0
3624
3625
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003626def colorize_CMDstatus_doc():
3627 """To be called once in main() to add colors to git cl status help."""
3628 colors = [i for i in dir(Fore) if i[0].isupper()]
3629
3630 def colorize_line(line):
3631 for color in colors:
3632 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003633 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003634 indent = len(line) - len(line.lstrip(' ')) + 1
3635 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3636 return line
3637
3638 lines = CMDstatus.__doc__.splitlines()
3639 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3640
3641
phajdan.jre328cf92016-08-22 04:12:17 -07003642def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003643 if path == '-':
3644 json.dump(contents, sys.stdout)
3645 else:
3646 with open(path, 'w') as f:
3647 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003648
3649
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003650@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003651@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003652def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003653 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003654
3655 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003656 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003657 parser.add_option('-r', '--reverse', action='store_true',
3658 help='Lookup the branch(es) for the specified issues. If '
3659 'no issues are specified, all branches with mapped '
3660 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003661 parser.add_option('--json',
3662 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003663 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003664
dnj@chromium.org406c4402015-03-03 17:22:28 +00003665 if options.reverse:
3666 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003667 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003668 # Reverse issue lookup.
3669 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003670
3671 git_config = {}
3672 for config in RunGit(['config', '--get-regexp',
3673 r'branch\..*issue']).splitlines():
3674 name, _space, val = config.partition(' ')
3675 git_config[name] = val
3676
dnj@chromium.org406c4402015-03-03 17:22:28 +00003677 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003678 issue = git_config.get(
3679 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003680 if issue:
3681 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003682 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003683 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003684 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003685 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003686 try:
3687 issue_num = int(issue)
3688 except ValueError:
3689 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003690 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003691 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003692 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003693 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003694 if options.json:
3695 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003696 return 0
3697
3698 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003699 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003700 if not issue.valid:
3701 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3702 'or no argument to list it.\n'
3703 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003704 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003705 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003706 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003707 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003708 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3709 if options.json:
3710 write_json(options.json, {
3711 'issue': cl.GetIssue(),
3712 'issue_url': cl.GetIssueURL(),
3713 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003714 return 0
3715
3716
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003717@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003718def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003719 """Shows or posts review comments for any changelist."""
3720 parser.add_option('-a', '--add-comment', dest='comment',
3721 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003722 parser.add_option('-p', '--publish', action='store_true',
3723 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003724 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003725 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003726 parser.add_option('-m', '--machine-readable', dest='readable',
3727 action='store_false', default=True,
3728 help='output comments in a format compatible with '
3729 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003730 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003731 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003732 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003733
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003734 issue = None
3735 if options.issue:
3736 try:
3737 issue = int(options.issue)
3738 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003739 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003740
Edward Lemur934836a2019-09-09 20:16:54 +00003741 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003742
3743 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003744 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003745 return 0
3746
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003747 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3748 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003749 for comment in summary:
3750 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003751 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003752 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003753 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003754 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003755 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003756 elif comment.autogenerated:
3757 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003758 else:
3759 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003760 print('\n%s%s %s%s\n%s' % (
3761 color,
3762 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3763 comment.sender,
3764 Fore.RESET,
3765 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3766
smut@google.comc85ac942015-09-15 16:34:43 +00003767 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003768 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003769 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003770 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3771 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003772 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003773 return 0
3774
3775
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003776@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003777@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003778def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003779 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003780 parser.add_option('-d', '--display', action='store_true',
3781 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003782 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003783 help='New description to set for this issue (- for stdin, '
3784 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003785 parser.add_option('-f', '--force', action='store_true',
3786 help='Delete any unpublished Gerrit edits for this issue '
3787 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003788
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003789 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003790
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003791 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003792 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003793 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003794 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003795 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003796
Edward Lemur934836a2019-09-09 20:16:54 +00003797 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003798 if target_issue_arg:
3799 kwargs['issue'] = target_issue_arg.issue
3800 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003801
3802 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003803 if not cl.GetIssue():
3804 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003805
Edward Lemur678a6842019-10-03 22:25:05 +00003806 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003807 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003808
Edward Lemur6c6827c2020-02-06 21:15:18 +00003809 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003810
smut@google.com34fb6b12015-07-13 20:03:26 +00003811 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003812 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003813 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003814
3815 if options.new_description:
3816 text = options.new_description
3817 if text == '-':
3818 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003819 elif text == '+':
3820 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003821 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003822
3823 description.set_description(text)
3824 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003825 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003826 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003827 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003828 return 0
3829
3830
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003831@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003832def CMDlint(parser, args):
3833 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003834 parser.add_option('--filter', action='append', metavar='-x,+y',
3835 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003836 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003837
3838 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003839 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003840 try:
3841 import cpplint
3842 import cpplint_chromium
3843 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003845 return 1
3846
3847 # Change the current working directory before calling lint so that it
3848 # shows the correct base.
3849 previous_cwd = os.getcwd()
3850 os.chdir(settings.GetRoot())
3851 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003852 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003853 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003854 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003855 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003856 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003857
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003858 # Process cpplint arguments, if any.
3859 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3860 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003861 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003862
Lei Zhang379d1ad2020-07-15 19:40:06 +00003863 include_regex = re.compile(settings.GetLintRegex())
3864 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003865 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3866 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003867 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003868 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003869 continue
3870
3871 if ignore_regex.match(filename):
3872 print('Ignoring file %s' % filename)
3873 continue
3874
3875 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3876 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003877 finally:
3878 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003879 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003880 if cpplint._cpplint_state.error_count != 0:
3881 return 1
3882 return 0
3883
3884
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003885@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003886def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003887 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003888 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003889 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003890 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003891 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003892 parser.add_option('--all', action='store_true',
3893 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003894 parser.add_option('--parallel', action='store_true',
3895 help='Run all tests specified by input_api.RunTests in all '
3896 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003897 parser.add_option('--resultdb', action='store_true',
3898 help='Run presubmit checks in the ResultSink environment '
3899 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003900 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003901 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003902
sbc@chromium.org71437c02015-04-09 19:29:40 +00003903 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003905 return 1
3906
Edward Lemur934836a2019-09-09 20:16:54 +00003907 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003908 if args:
3909 base_branch = args[0]
3910 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003911 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003912 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003913
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003914 if cl.GetIssue():
3915 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003916 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003917 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003918
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003919 cl.RunHook(
3920 committing=not options.upload,
3921 may_prompt=False,
3922 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003923 parallel=options.parallel,
3924 upstream=base_branch,
3925 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003926 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003927 resultdb=options.resultdb,
3928 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003929 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930
3931
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003932def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003933 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003934
3935 Works the same way as
3936 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3937 but can be called on demand on all platforms.
3938
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003939 The basic idea is to generate git hash of a state of the tree, original
3940 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003941 """
3942 lines = []
3943 tree_hash = RunGitSilent(['write-tree'])
3944 lines.append('tree %s' % tree_hash.strip())
3945 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3946 if code == 0:
3947 lines.append('parent %s' % parent.strip())
3948 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3949 lines.append('author %s' % author.strip())
3950 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3951 lines.append('committer %s' % committer.strip())
3952 lines.append('')
3953 # Note: Gerrit's commit-hook actually cleans message of some lines and
3954 # whitespace. This code is not doing this, but it clearly won't decrease
3955 # entropy.
3956 lines.append(message)
3957 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003958 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003959 return 'I%s' % change_hash.strip()
3960
3961
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003962def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003963 """Computes the remote branch ref to use for the CL.
3964
3965 Args:
3966 remote (str): The git remote for the CL.
3967 remote_branch (str): The git remote branch for the CL.
3968 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003969 """
3970 if not (remote and remote_branch):
3971 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003972
wittman@chromium.org455dc922015-01-26 20:15:50 +00003973 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003974 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003975 # refs, which are then translated into the remote full symbolic refs
3976 # below.
3977 if '/' not in target_branch:
3978 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3979 else:
3980 prefix_replacements = (
3981 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3982 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3983 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3984 )
3985 match = None
3986 for regex, replacement in prefix_replacements:
3987 match = re.search(regex, target_branch)
3988 if match:
3989 remote_branch = target_branch.replace(match.group(0), replacement)
3990 break
3991 if not match:
3992 # This is a branch path but not one we recognize; use as-is.
3993 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003994 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3995 # Handle the refs that need to land in different refs.
3996 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003997
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003998 # Migration to new default branch, only if available on remote.
3999 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4000 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4001 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4002 stderr=subprocess2.PIPE):
4003 # TODO(crbug.com/ID): Print location to local git migration script.
4004 print("WARNING: Using new branch name %s instead of %s" % (
4005 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4006 remote_branch = DEFAULT_NEW_BRANCH
4007
wittman@chromium.org455dc922015-01-26 20:15:50 +00004008 # Create the true path to the remote branch.
4009 # Does the following translation:
4010 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004011 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004012 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4013 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4014 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4015 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4016 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4017 'refs/heads/')
4018 elif remote_branch.startswith('refs/remotes/branch-heads'):
4019 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004020
wittman@chromium.org455dc922015-01-26 20:15:50 +00004021 return remote_branch
4022
4023
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004024def cleanup_list(l):
4025 """Fixes a list so that comma separated items are put as individual items.
4026
4027 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4028 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4029 """
4030 items = sum((i.split(',') for i in l), [])
4031 stripped_items = (i.strip() for i in items)
4032 return sorted(filter(None, stripped_items))
4033
4034
Aaron Gable4db38df2017-11-03 14:59:07 -07004035@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004036@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004037def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004038 """Uploads the current changelist to codereview.
4039
4040 Can skip dependency patchset uploads for a branch by running:
4041 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004042 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004043 git config --unset branch.branch_name.skip-deps-uploads
4044 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004045
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004046 If the name of the checked out branch starts with "bug-" or "fix-" followed
4047 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004048 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004049
4050 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004051 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004052 [git-cl] add support for hashtags
4053 Foo bar: implement foo
4054 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004055 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004056 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4057 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004058 parser.add_option('--bypass-watchlists', action='store_true',
4059 dest='bypass_watchlists',
4060 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004061 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004062 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004063 parser.add_option('--message', '-m', dest='message',
4064 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004065 parser.add_option('-b', '--bug',
4066 help='pre-populate the bug number(s) for this issue. '
4067 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004068 parser.add_option('--message-file', dest='message_file',
4069 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004070 parser.add_option('--title', '-t', dest='title',
4071 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004072 parser.add_option('-T', '--skip-title', action='store_true',
4073 dest='skip_title',
4074 help='Use the most recent commit message as the title of '
4075 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004076 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004077 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004078 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004079 parser.add_option('--tbrs',
4080 action='append', default=[],
4081 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004082 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004083 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004084 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004085 parser.add_option('--hashtag', dest='hashtags',
4086 action='append', default=[],
4087 help=('Gerrit hashtag for new CL; '
4088 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004089 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004090 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004091 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004092 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004093 metavar='TARGET',
4094 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004095 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004096 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004097 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004098 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004099 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004100 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004101 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004102 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4103 const='TBR', help='add a set of OWNERS to TBR')
4104 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4105 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004106 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004107 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004108 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004109 'implies --send-mail')
4110 parser.add_option('-d', '--cq-dry-run',
4111 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004112 help='Send the patchset to do a CQ dry run right after '
4113 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004114 parser.add_option('--preserve-tryjobs', action='store_true',
4115 help='instruct the CQ to let tryjobs running even after '
4116 'new patchsets are uploaded instead of canceling '
4117 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004118 parser.add_option('--dependencies', action='store_true',
4119 help='Uploads CLs of all the local branches that depend on '
4120 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004121 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4122 help='Sends your change to the CQ after an approval. Only '
4123 'works on repos that have the Auto-Submit label '
4124 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004125 parser.add_option('--parallel', action='store_true',
4126 help='Run all tests specified by input_api.RunTests in all '
4127 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004128 parser.add_option('--no-autocc', action='store_true',
4129 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004130 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004131 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004132 parser.add_option('-R', '--retry-failed', action='store_true',
4133 help='Retry failed tryjobs from old patchset immediately '
4134 'after uploading new patchset. Cannot be used with '
4135 '--use-commit-queue or --cq-dry-run.')
4136 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4137 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004138 parser.add_option('--fixed', '-x',
4139 help='List of bugs that will be commented on and marked '
4140 'fixed (pre-populates "Fixed:" tag). Same format as '
4141 '-b option / "Bug:" tag. If fixing several issues, '
4142 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004143 parser.add_option('--edit-description', action='store_true', default=False,
4144 help='Modify description before upload. Cannot be used '
4145 'with --force. It is a noop when --no-squash is set '
4146 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004147 parser.add_option('--git-completion-helper', action="store_true",
4148 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004149 parser.add_option('--resultdb', action='store_true',
4150 help='Run presubmit checks in the ResultSink environment '
4151 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004152 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004153
rmistry@google.com2dd99862015-06-22 12:22:18 +00004154 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004155 (options, args) = parser.parse_args(args)
4156
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004157 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004158 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4159 if opt.help != optparse.SUPPRESS_HELP))
4160 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004161
sbc@chromium.org71437c02015-04-09 19:29:40 +00004162 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004163 return 1
4164
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004165 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004166 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004167 options.cc = cleanup_list(options.cc)
4168
Josipe827b0f2020-01-30 00:07:20 +00004169 if options.edit_description and options.force:
4170 parser.error('Only one of --force and --edit-description allowed')
4171
tandriib80458a2016-06-23 12:20:07 -07004172 if options.message_file:
4173 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004174 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004175 options.message = gclient_utils.FileRead(options.message_file)
4176 options.message_file = None
4177
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004178 if ([options.cq_dry_run,
4179 options.use_commit_queue,
4180 options.retry_failed].count(True) > 1):
4181 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4182 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004183
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004184 if options.skip_title and options.title:
4185 parser.error('Only one of --title and --skip-title allowed.')
4186
Aaron Gableedbc4132017-09-11 13:22:28 -07004187 if options.use_commit_queue:
4188 options.send_mail = True
4189
Edward Lesmes0dd54822020-03-26 18:24:25 +00004190 if options.squash is None:
4191 # Load default for user, repo, squash=true, in this order.
4192 options.squash = settings.GetSquashGerritUploads()
4193
Edward Lemur934836a2019-09-09 20:16:54 +00004194 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004195 # Warm change details cache now to avoid RPCs later, reducing latency for
4196 # developers.
4197 if cl.GetIssue():
4198 cl._GetChangeDetail(
4199 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4200
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004201 if options.retry_failed and not cl.GetIssue():
4202 print('No previous patchsets, so --retry-failed has no effect.')
4203 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004204
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004205 # cl.GetMostRecentPatchset uses cached information, and can return the last
4206 # patchset before upload. Calling it here makes it clear that it's the
4207 # last patchset before upload. Note that GetMostRecentPatchset will fail
4208 # if no CL has been uploaded yet.
4209 if options.retry_failed:
4210 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004211
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004212 ret = cl.CMDUpload(options, args, orig_args)
4213
4214 if options.retry_failed:
4215 if ret != 0:
4216 print('Upload failed, so --retry-failed has no effect.')
4217 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004218 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004219 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004220 jobs = _filter_failed_for_retry(builds)
4221 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004222 print('No failed tryjobs, so --retry-failed has no effect.')
4223 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004224 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004225
4226 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004227
4228
Francois Dorayd42c6812017-05-30 15:10:20 -04004229@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004230@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004231def CMDsplit(parser, args):
4232 """Splits a branch into smaller branches and uploads CLs.
4233
4234 Creates a branch and uploads a CL for each group of files modified in the
4235 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004236 comment, the string '$directory', is replaced with the directory containing
4237 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004238 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004239 parser.add_option('-d', '--description', dest='description_file',
4240 help='A text file containing a CL description in which '
4241 '$directory will be replaced by each CL\'s directory.')
4242 parser.add_option('-c', '--comment', dest='comment_file',
4243 help='A text file containing a CL comment.')
4244 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004245 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004246 help='List the files and reviewers for each CL that would '
4247 'be created, but don\'t create branches or CLs.')
4248 parser.add_option('--cq-dry-run', action='store_true',
4249 help='If set, will do a cq dry run for each uploaded CL. '
4250 'Please be careful when doing this; more than ~10 CLs '
4251 'has the potential to overload our build '
4252 'infrastructure. Try to upload these not during high '
4253 'load times (usually 11-3 Mountain View time). Email '
4254 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004255 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4256 default=True,
4257 help='Sends your change to the CQ after an approval. Only '
4258 'works on repos that have the Auto-Submit label '
4259 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004260 options, _ = parser.parse_args(args)
4261
4262 if not options.description_file:
4263 parser.error('No --description flag specified.')
4264
4265 def WrappedCMDupload(args):
4266 return CMDupload(OptionParser(), args)
4267
Edward Lemur2c62b332020-03-12 22:12:33 +00004268 return split_cl.SplitCl(
4269 options.description_file, options.comment_file, Changelist,
4270 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4271 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004272
4273
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004274@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004275@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004277 """DEPRECATED: Used to commit the current changelist via git-svn."""
4278 message = ('git-cl no longer supports committing to SVN repositories via '
4279 'git-svn. You probably want to use `git cl land` instead.')
4280 print(message)
4281 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004282
4283
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004284@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004285@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004286def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004287 """Commits the current changelist via git.
4288
4289 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4290 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004291 """
4292 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4293 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004294 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004295 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004296 parser.add_option('--parallel', action='store_true',
4297 help='Run all tests specified by input_api.RunTests in all '
4298 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004299 parser.add_option('--resultdb', action='store_true',
4300 help='Run presubmit checks in the ResultSink environment '
4301 'and send results to the ResultDB database.')
4302 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004303 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004304
Edward Lemur934836a2019-09-09 20:16:54 +00004305 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004306
Robert Iannucci2e73d432018-03-14 01:10:47 -07004307 if not cl.GetIssue():
4308 DieWithError('You must upload the change first to Gerrit.\n'
4309 ' If you would rather have `git cl land` upload '
4310 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004311 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4312 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004313
4314
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004315@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004316@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004317def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004318 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004319 parser.add_option('-b', dest='newbranch',
4320 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004321 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004322 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004324 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004325
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004326 group = optparse.OptionGroup(
4327 parser,
4328 'Options for continuing work on the current issue uploaded from a '
4329 'different clone (e.g. different machine). Must be used independently '
4330 'from the other options. No issue number should be specified, and the '
4331 'branch must have an issue number associated with it')
4332 group.add_option('--reapply', action='store_true', dest='reapply',
4333 help='Reset the branch and reapply the issue.\n'
4334 'CAUTION: This will undo any local changes in this '
4335 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004336
4337 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004338 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004339 parser.add_option_group(group)
4340
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004341 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004342
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004343 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004344 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004345 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004346 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004347 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004348
Edward Lemur934836a2019-09-09 20:16:54 +00004349 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004350 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004351 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004352
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004353 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004354 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004355 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004356
4357 RunGit(['reset', '--hard', upstream])
4358 if options.pull:
4359 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004360
Edward Lemur678a6842019-10-03 22:25:05 +00004361 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4362 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004363
4364 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004365 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004366
Edward Lemurf38bc172019-09-03 21:02:13 +00004367 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004368 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004369 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004370
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004371 # We don't want uncommitted changes mixed up with the patch.
4372 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004373 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004374
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004375 if options.newbranch:
4376 if options.force:
4377 RunGit(['branch', '-D', options.newbranch],
4378 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004379 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004380
Edward Lemur678a6842019-10-03 22:25:05 +00004381 cl = Changelist(
4382 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004383
Edward Lemur678a6842019-10-03 22:25:05 +00004384 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004385 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004386
Edward Lemurf38bc172019-09-03 21:02:13 +00004387 return cl.CMDPatchWithParsedIssue(
4388 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004389
4390
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004391def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004392 """Fetches the tree status and returns either 'open', 'closed',
4393 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004394 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004395 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004396 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004397 if status.find('closed') != -1 or status == '0':
4398 return 'closed'
4399 elif status.find('open') != -1 or status == '1':
4400 return 'open'
4401 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004402 return 'unset'
4403
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004404
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004405def GetTreeStatusReason():
4406 """Fetches the tree status from a json url and returns the message
4407 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004408 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004409 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004410 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004411 status = json.loads(connection.read())
4412 connection.close()
4413 return status['message']
4414
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004415
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004416@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004417def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004418 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004419 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004420 status = GetTreeStatus()
4421 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004422 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004423 return 2
4424
vapiera7fbd5a2016-06-16 09:17:49 -07004425 print('The tree is %s' % status)
4426 print()
4427 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428 if status != 'open':
4429 return 1
4430 return 0
4431
4432
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004433@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004434def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004435 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4436 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004437 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004438 '-b', '--bot', action='append',
4439 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4440 'times to specify multiple builders. ex: '
4441 '"-b win_rel -b win_layout". See '
4442 'the try server waterfall for the builders name and the tests '
4443 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004444 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004445 '-B', '--bucket', default='',
4446 help=('Buildbucket bucket to send the try requests.'))
4447 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004448 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004449 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004450 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004451 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004452 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004453 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004454 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004455 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004456 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004457 '--category', default='git_cl_try', help='Specify custom build category.')
4458 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004459 '--project',
4460 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004461 'in recipe to determine to which repository or directory to '
4462 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004463 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004464 '-p', '--property', dest='properties', action='append', default=[],
4465 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004466 'key2=value2 etc. The value will be treated as '
4467 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004468 'NOTE: using this may make your tryjob not usable for CQ, '
4469 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004470 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004471 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4472 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004473 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004474 parser.add_option(
4475 '-R', '--retry-failed', action='store_true', default=False,
4476 help='Retry failed jobs from the latest set of tryjobs. '
4477 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004478 parser.add_option(
4479 '-i', '--issue', type=int,
4480 help='Operate on this issue instead of the current branch\'s implicit '
4481 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004482 options, args = parser.parse_args(args)
4483
machenbach@chromium.org45453142015-09-15 08:45:22 +00004484 # Make sure that all properties are prop=value pairs.
4485 bad_params = [x for x in options.properties if '=' not in x]
4486 if bad_params:
4487 parser.error('Got properties with missing "=": %s' % bad_params)
4488
maruel@chromium.org15192402012-09-06 12:38:29 +00004489 if args:
4490 parser.error('Unknown arguments: %s' % args)
4491
Edward Lemur934836a2019-09-09 20:16:54 +00004492 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004493 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004494 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004495
Edward Lemurf38bc172019-09-03 21:02:13 +00004496 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004497 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004498
tandriie113dfd2016-10-11 10:20:12 -07004499 error_message = cl.CannotTriggerTryJobReason()
4500 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004501 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004502
Edward Lemur45768512020-03-02 19:03:14 +00004503 if options.bot:
4504 if options.retry_failed:
4505 parser.error('--bot is not compatible with --retry-failed.')
4506 if not options.bucket:
4507 parser.error('A bucket (e.g. "chromium/try") is required.')
4508
4509 triggered = [b for b in options.bot if 'triggered' in b]
4510 if triggered:
4511 parser.error(
4512 'Cannot schedule builds on triggered bots: %s.\n'
4513 'This type of bot requires an initial job from a parent (usually a '
4514 'builder). Schedule a job on the parent instead.\n' % triggered)
4515
4516 if options.bucket.startswith('.master'):
4517 parser.error('Buildbot masters are not supported.')
4518
4519 project, bucket = _parse_bucket(options.bucket)
4520 if project is None or bucket is None:
4521 parser.error('Invalid bucket: %s.' % options.bucket)
4522 jobs = sorted((project, bucket, bot) for bot in options.bot)
4523 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004524 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004525 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004526 if options.verbose:
4527 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004528 jobs = _filter_failed_for_retry(builds)
4529 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004530 print('There are no failed jobs in the latest set of jobs '
4531 '(patchset #%d), doing nothing.' % patchset)
4532 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004533 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004534 if num_builders > 10:
4535 confirm_or_exit('There are %d builders with failed builds.'
4536 % num_builders, action='continue')
4537 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004538 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004539 print('git cl try with no bots now defaults to CQ dry run.')
4540 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4541 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004542
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004543 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004544 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004545 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004546 except BuildbucketResponseException as ex:
4547 print('ERROR: %s' % ex)
4548 return 1
4549 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004550
4551
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004552@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004553def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004554 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004555 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004556 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004557 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004558 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004559 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004560 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004561 '--color', action='store_true', default=setup_color.IS_TTY,
4562 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004563 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004564 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4565 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004566 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004567 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004568 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004569 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004570 parser.add_option(
4571 '-i', '--issue', type=int,
4572 help='Operate on this issue instead of the current branch\'s implicit '
4573 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004574 options, args = parser.parse_args(args)
4575 if args:
4576 parser.error('Unrecognized args: %s' % ' '.join(args))
4577
Edward Lemur934836a2019-09-09 20:16:54 +00004578 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004579 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004580 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004581
tandrii221ab252016-10-06 08:12:04 -07004582 patchset = options.patchset
4583 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004584 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004585 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004586 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004587 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004588 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004589 cl.GetIssue())
4590
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004591 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004592 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004593 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004594 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004595 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004596 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004597 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004598 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004599 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004600 return 0
4601
4602
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004603@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004604@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004606 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004607 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004608 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004609 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004610
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004612 if args:
4613 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004614 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004615 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004616 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004617 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004618
4619 # Clear configured merge-base, if there is one.
4620 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004621 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004622 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623 return 0
4624
4625
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004626@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004627def CMDweb(parser, args):
4628 """Opens the current CL in the web browser."""
4629 _, args = parser.parse_args(args)
4630 if args:
4631 parser.error('Unrecognized args: %s' % ' '.join(args))
4632
4633 issue_url = Changelist().GetIssueURL()
4634 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004635 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004636 return 1
4637
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004638 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004639 # allows us to hide the "Created new window in existing browser session."
4640 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004641 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004642 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004643 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004644 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004645 os.open(os.devnull, os.O_RDWR)
4646 try:
4647 webbrowser.open(issue_url)
4648 finally:
4649 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004650 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004651 return 0
4652
4653
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004654@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004655def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004656 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004657 parser.add_option('-d', '--dry-run', action='store_true',
4658 help='trigger in dry run mode')
4659 parser.add_option('-c', '--clear', action='store_true',
4660 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004661 parser.add_option(
4662 '-i', '--issue', type=int,
4663 help='Operate on this issue instead of the current branch\'s implicit '
4664 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004665 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004666 if args:
4667 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004668 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004669 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004670
Edward Lemur934836a2019-09-09 20:16:54 +00004671 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004672 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004673 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004674 elif options.dry_run:
4675 state = _CQState.DRY_RUN
4676 else:
4677 state = _CQState.COMMIT
4678 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004679 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004680 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004681 return 0
4682
4683
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004684@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004685def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004686 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004687 parser.add_option(
4688 '-i', '--issue', type=int,
4689 help='Operate on this issue instead of the current branch\'s implicit '
4690 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004691 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004692 if args:
4693 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004694 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004695 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004696 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004697 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004698 cl.CloseIssue()
4699 return 0
4700
4701
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004702@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004703def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004704 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004705 parser.add_option(
4706 '--stat',
4707 action='store_true',
4708 dest='stat',
4709 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004710 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004711 if args:
4712 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004713
Edward Lemur934836a2019-09-09 20:16:54 +00004714 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004715 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004716 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004717 if not issue:
4718 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004719
Aaron Gablea718c3e2017-08-28 17:47:28 -07004720 base = cl._GitGetBranchConfigValue('last-upload-hash')
4721 if not base:
4722 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4723 if not base:
4724 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4725 revision_info = detail['revisions'][detail['current_revision']]
4726 fetch_info = revision_info['fetch']['http']
4727 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4728 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004729
Aaron Gablea718c3e2017-08-28 17:47:28 -07004730 cmd = ['git', 'diff']
4731 if options.stat:
4732 cmd.append('--stat')
4733 cmd.append(base)
4734 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004735
4736 return 0
4737
4738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004739@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004740def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004741 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004742 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004743 '--ignore-current',
4744 action='store_true',
4745 help='Ignore the CL\'s current reviewers and start from scratch.')
4746 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004747 '--ignore-self',
4748 action='store_true',
4749 help='Do not consider CL\'s author as an owners.')
4750 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004751 '--no-color',
4752 action='store_true',
4753 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004754 parser.add_option(
4755 '--batch',
4756 action='store_true',
4757 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004758 # TODO: Consider moving this to another command, since other
4759 # git-cl owners commands deal with owners for a given CL.
4760 parser.add_option(
4761 '--show-all',
4762 action='store_true',
4763 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004764 options, args = parser.parse_args(args)
4765
Edward Lemur934836a2019-09-09 20:16:54 +00004766 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004767 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004768
Yang Guo6e269a02019-06-26 11:17:02 +00004769 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004770 if len(args) == 0:
4771 print('No files specified for --show-all. Nothing to do.')
4772 return 0
Edward Lesmeseeca9c62020-11-20 00:00:17 +00004773 project = cl.GetGerritProject()
4774 branch = cl.GetCommonAncestorWithUpstream()
4775 client = owners_client.DepotToolsClient(
4776 host=cl.GetGerritHost(),
4777 root=settings.GetRoot(),
4778 branch=branch)
Yang Guo6e269a02019-06-26 11:17:02 +00004779 for arg in args:
Yang Guo6e269a02019-06-26 11:17:02 +00004780 print('Owners for %s:' % arg)
Edward Lesmeseeca9c62020-11-20 00:00:17 +00004781 for owner in client.ListOwnersForFile(project, branch, arg):
Yang Guo6e269a02019-06-26 11:17:02 +00004782 print(' - %s' % owner)
4783 return 0
4784
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004785 if args:
4786 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004787 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004788 base_branch = args[0]
4789 else:
4790 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004791 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004792
Edward Lemur2c62b332020-03-12 22:12:33 +00004793 root = settings.GetRoot()
4794 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004795
4796 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004797 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004798 print('\n'.join(db.reviewers_for(affected_files, author)))
4799 return 0
4800
Edward Lemur2c62b332020-03-12 22:12:33 +00004801 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4802 original_owner_files = {
4803 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4804 for f in owner_files}
4805
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004806 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004807 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004808 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004809 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004810 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004811 fopen=open,
4812 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004813 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004814 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004815 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004816
4817
Aiden Bennerc08566e2018-10-03 17:52:42 +00004818def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004819 """Generates a diff command."""
4820 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004821 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4822
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004823 if allow_prefix:
4824 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4825 # case that diff.noprefix is set in the user's git config.
4826 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4827 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004828 diff_cmd += ['--no-prefix']
4829
4830 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004831
4832 if args:
4833 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004834 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004835 diff_cmd.append(arg)
4836 else:
4837 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004838
4839 return diff_cmd
4840
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004841
Jamie Madill5e96ad12020-01-13 16:08:35 +00004842def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4843 """Runs clang-format-diff and sets a return value if necessary."""
4844
4845 if not clang_diff_files:
4846 return 0
4847
4848 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4849 # formatted. This is used to block during the presubmit.
4850 return_value = 0
4851
4852 # Locate the clang-format binary in the checkout
4853 try:
4854 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4855 except clang_format.NotFoundError as e:
4856 DieWithError(e)
4857
4858 if opts.full or settings.GetFormatFullByDefault():
4859 cmd = [clang_format_tool]
4860 if not opts.dry_run and not opts.diff:
4861 cmd.append('-i')
4862 if opts.dry_run:
4863 for diff_file in clang_diff_files:
4864 with open(diff_file, 'r') as myfile:
4865 code = myfile.read().replace('\r\n', '\n')
4866 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4867 stdout = stdout.replace('\r\n', '\n')
4868 if opts.diff:
4869 sys.stdout.write(stdout)
4870 if code != stdout:
4871 return_value = 2
4872 else:
4873 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4874 if opts.diff:
4875 sys.stdout.write(stdout)
4876 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004877 try:
4878 script = clang_format.FindClangFormatScriptInChromiumTree(
4879 'clang-format-diff.py')
4880 except clang_format.NotFoundError as e:
4881 DieWithError(e)
4882
Edward Lesmes89624cd2020-04-06 17:51:56 +00004883 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004884 if not opts.dry_run and not opts.diff:
4885 cmd.append('-i')
4886
4887 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004888 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004889
Edward Lesmes89624cd2020-04-06 17:51:56 +00004890 env = os.environ.copy()
4891 env['PATH'] = (
4892 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4893 stdout = RunCommand(
4894 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004895 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004896 if opts.diff:
4897 sys.stdout.write(stdout)
4898 if opts.dry_run and len(stdout) > 0:
4899 return_value = 2
4900
4901 return return_value
4902
4903
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004904def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004905 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004906 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004907
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004908
enne@chromium.org555cfe42014-01-29 18:21:39 +00004909@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004910@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004911def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004912 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004913 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004914 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004915 parser.add_option('--full', action='store_true',
4916 help='Reformat the full content of all touched files')
4917 parser.add_option('--dry-run', action='store_true',
4918 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004919 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004920 '--no-clang-format',
4921 dest='clang_format',
4922 action='store_false',
4923 default=True,
4924 help='Disables formatting of various file types using clang-format.')
4925 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004926 '--python',
4927 action='store_true',
4928 default=None,
4929 help='Enables python formatting on all python files.')
4930 parser.add_option(
4931 '--no-python',
4932 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004933 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004934 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004935 'If neither --python or --no-python are set, python files that have a '
4936 '.style.yapf file in an ancestor directory will be formatted. '
4937 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004938 parser.add_option(
4939 '--js',
4940 action='store_true',
4941 help='Format javascript code with clang-format. '
4942 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004943 parser.add_option('--diff', action='store_true',
4944 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004945 parser.add_option('--presubmit', action='store_true',
4946 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004947 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004948
Garrett Beaty91a6f332020-01-06 16:57:24 +00004949 if opts.python is not None and opts.no_python:
4950 raise parser.error('Cannot set both --python and --no-python')
4951 if opts.no_python:
4952 opts.python = False
4953
Daniel Chengc55eecf2016-12-30 03:11:02 -08004954 # Normalize any remaining args against the current path, so paths relative to
4955 # the current directory are still resolved as expected.
4956 args = [os.path.join(os.getcwd(), arg) for arg in args]
4957
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004958 # git diff generates paths against the root of the repository. Change
4959 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004960 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004961 if rel_base_path:
4962 os.chdir(rel_base_path)
4963
digit@chromium.org29e47272013-05-17 17:01:46 +00004964 # Grab the merge-base commit, i.e. the upstream commit of the current
4965 # branch when it was created or the last time it was rebased. This is
4966 # to cover the case where the user may have called "git fetch origin",
4967 # moving the origin branch to a newer commit, but hasn't rebased yet.
4968 upstream_commit = None
4969 cl = Changelist()
4970 upstream_branch = cl.GetUpstreamBranch()
4971 if upstream_branch:
4972 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4973 upstream_commit = upstream_commit.strip()
4974
4975 if not upstream_commit:
4976 DieWithError('Could not find base commit for this branch. '
4977 'Are you in detached state?')
4978
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004979 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4980 diff_output = RunGit(changed_files_cmd)
4981 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004982 # Filter out files deleted by this CL
4983 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004984
Andreas Haas417d89c2020-02-06 10:24:27 +00004985 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004986 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004987
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004988 clang_diff_files = []
4989 if opts.clang_format:
4990 clang_diff_files = [
4991 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4992 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004993 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004994 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004995
Edward Lesmes50da7702020-03-30 19:23:43 +00004996 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004997
Jamie Madill5e96ad12020-01-13 16:08:35 +00004998 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4999 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005000
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005001 # Similar code to above, but using yapf on .py files rather than clang-format
5002 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005003 py_explicitly_disabled = opts.python is not None and not opts.python
5004 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005005 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5006 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005007
Aiden Bennerc08566e2018-10-03 17:52:42 +00005008 # Used for caching.
5009 yapf_configs = {}
5010 for f in python_diff_files:
5011 # Find the yapf style config for the current file, defaults to depot
5012 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005013 _FindYapfConfigFile(f, yapf_configs, top_dir)
5014
5015 # Turn on python formatting by default if a yapf config is specified.
5016 # This breaks in the case of this repo though since the specified
5017 # style file is also the global default.
5018 if opts.python is None:
5019 filtered_py_files = []
5020 for f in python_diff_files:
5021 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5022 filtered_py_files.append(f)
5023 else:
5024 filtered_py_files = python_diff_files
5025
5026 # Note: yapf still seems to fix indentation of the entire file
5027 # even if line ranges are specified.
5028 # See https://github.com/google/yapf/issues/499
5029 if not opts.full and filtered_py_files:
5030 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5031
Brian Sheedyb4307d52019-12-02 19:18:17 +00005032 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5033 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5034 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005035
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005036 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005037 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5038 # Default to pep8 if not .style.yapf is found.
5039 if not yapf_style:
5040 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005041
Peter Wend9399922020-06-17 17:33:49 +00005042 with open(f, 'r') as py_f:
5043 if 'python3' in py_f.readline():
5044 vpython_script = 'vpython3'
5045 else:
5046 vpython_script = 'vpython'
5047
5048 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005049
5050 has_formattable_lines = False
5051 if not opts.full:
5052 # Only run yapf over changed line ranges.
5053 for diff_start, diff_len in py_line_diffs[f]:
5054 diff_end = diff_start + diff_len - 1
5055 # Yapf errors out if diff_end < diff_start but this
5056 # is a valid line range diff for a removal.
5057 if diff_end >= diff_start:
5058 has_formattable_lines = True
5059 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5060 # If all line diffs were removals we have nothing to format.
5061 if not has_formattable_lines:
5062 continue
5063
5064 if opts.diff or opts.dry_run:
5065 cmd += ['--diff']
5066 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005067 stdout = RunCommand(cmd,
5068 error_ok=True,
5069 cwd=top_dir,
5070 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005071 if opts.diff:
5072 sys.stdout.write(stdout)
5073 elif len(stdout) > 0:
5074 return_value = 2
5075 else:
5076 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005077 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005078
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005079 # Format GN build files. Always run on full build files for canonical form.
5080 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005081 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005082 if opts.dry_run or opts.diff:
5083 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005084 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005085 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005086 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005087 cwd=top_dir)
5088 if opts.dry_run and gn_ret == 2:
5089 return_value = 2 # Not formatted.
5090 elif opts.diff and gn_ret == 2:
5091 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005092 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005093 elif gn_ret != 0:
5094 # For non-dry run cases (and non-2 return values for dry-run), a
5095 # nonzero error code indicates a failure, probably because the file
5096 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005097 DieWithError('gn format failed on ' + gn_diff_file +
5098 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005099
Ilya Shermane081cbe2017-08-15 17:51:04 -07005100 # Skip the metrics formatting from the global presubmit hook. These files have
5101 # a separate presubmit hook that issues an error if the files need formatting,
5102 # whereas the top-level presubmit script merely issues a warning. Formatting
5103 # these files is somewhat slow, so it's important not to duplicate the work.
5104 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005105 for diff_xml in GetDiffXMLs(diff_files):
5106 xml_dir = GetMetricsDir(diff_xml)
5107 if not xml_dir:
5108 continue
5109
Ilya Shermane081cbe2017-08-15 17:51:04 -07005110 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005111 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5112 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005113
5114 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5115 # command as histograms/pretty_print.py now needs a relative path argument
5116 # after splitting the histograms into multiple directories.
5117 # For example, in tools/metrics/ukm, pretty-print could be run using:
5118 # $ python pretty_print.py
5119 # But in tools/metrics/histogrmas, pretty-print should be run with an
5120 # additional relative path argument, like:
5121 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5122 # $ python pretty_print.py enums.xml
5123
5124 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5125 # version of histograms/pretty_print.py is released.
5126 filepath_required = os.path.exists(
5127 os.path.join(tool_dir, 'validate_prefix.py'))
5128
Weilun Shib92c4b72020-08-27 17:45:11 +00005129 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5130 or diff_xml.endswith('histogram_suffixes_list.xml')
5131 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005132 cmd.append(diff_xml)
5133
Ilya Shermane081cbe2017-08-15 17:51:04 -07005134 if opts.dry_run or opts.diff:
5135 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005136
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005137 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5138 # `shell` param and instead replace `'vpython'` with
5139 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005140 stdout = RunCommand(cmd,
5141 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005142 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005143 if opts.diff:
5144 sys.stdout.write(stdout)
5145 if opts.dry_run and stdout:
5146 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005147
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005148 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005149
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005150
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005151def GetDiffXMLs(diff_files):
5152 return [
5153 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5154 ]
5155
5156
5157def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005158 metrics_xml_dirs = [
5159 os.path.join('tools', 'metrics', 'actions'),
5160 os.path.join('tools', 'metrics', 'histograms'),
5161 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005162 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005163 os.path.join('tools', 'metrics', 'ukm'),
5164 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005165 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005166 if diff_xml.startswith(xml_dir):
5167 return xml_dir
5168 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005169
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005170
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005171@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005172@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005173def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005174 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005175 _, args = parser.parse_args(args)
5176
5177 if len(args) != 1:
5178 parser.print_help()
5179 return 1
5180
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005181 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005182 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005183 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005184
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005185 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005186
Edward Lemur52969c92020-02-06 18:15:28 +00005187 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005188 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005189 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005190
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005191 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005192 for key, issue in [x.split() for x in output.splitlines()]:
5193 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005194 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005195
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005196 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005197 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005198 return 1
5199 if len(branches) == 1:
5200 RunGit(['checkout', branches[0]])
5201 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005202 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005203 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005204 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005205 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005206 try:
5207 RunGit(['checkout', branches[int(which)]])
5208 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005209 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005210 return 1
5211
5212 return 0
5213
5214
maruel@chromium.org29404b52014-09-08 22:58:00 +00005215def CMDlol(parser, args):
5216 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005217 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005218 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5219 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5220 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005221 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005222 return 0
5223
5224
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005225class OptionParser(optparse.OptionParser):
5226 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005227
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005228 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005229 optparse.OptionParser.__init__(
5230 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005231 self.add_option(
5232 '-v', '--verbose', action='count', default=0,
5233 help='Use 2 times for more debugging info')
5234
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005235 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005236 try:
5237 return self._parse_args(args)
5238 finally:
5239 # Regardless of success or failure of args parsing, we want to report
5240 # metrics, but only after logging has been initialized (if parsing
5241 # succeeded).
5242 global settings
5243 settings = Settings()
5244
5245 if not metrics.DISABLE_METRICS_COLLECTION:
5246 # GetViewVCUrl ultimately calls logging method.
5247 project_url = settings.GetViewVCUrl().strip('/+')
5248 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5249 metrics.collector.add('project_urls', [project_url])
5250
5251 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005252 # Create an optparse.Values object that will store only the actual passed
5253 # options, without the defaults.
5254 actual_options = optparse.Values()
5255 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5256 # Create an optparse.Values object with the default options.
5257 options = optparse.Values(self.get_default_values().__dict__)
5258 # Update it with the options passed by the user.
5259 options._update_careful(actual_options.__dict__)
5260 # Store the options passed by the user in an _actual_options attribute.
5261 # We store only the keys, and not the values, since the values can contain
5262 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005263 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005264
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005265 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005266 logging.basicConfig(
5267 level=levels[min(options.verbose, len(levels) - 1)],
5268 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5269 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005270
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005271 return options, args
5272
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005273
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005275 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005276 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005277 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005278 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005279
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005280 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005281 dispatcher = subcommand.CommandDispatcher(__name__)
5282 try:
5283 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005284 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005285 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005286 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005287 if e.code != 500:
5288 raise
5289 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005290 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005291 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005292 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293
5294
5295if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005296 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5297 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005298 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005299 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005300 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005301 sys.exit(main(sys.argv[1:]))