blob: 204fbc25cb2b3801e3077de929aa8dd0916e6e96 [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
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000037import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000038import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000039import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000040import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000041import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000042import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000043import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000044import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000045import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000046import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
thestig@chromium.org44202a22014-03-11 19:22:18 +0000111# Valid extensions for files we want to lint.
112DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
113DEFAULT_LINT_IGNORE_REGEX = r"$^"
114
Aiden Bennerc08566e2018-10-03 17:52:42 +0000115# File name for yapf style config files.
116YAPF_CONFIG_FILENAME = '.style.yapf'
117
Edward Lesmes50da7702020-03-30 19:23:43 +0000118# The issue, patchset and codereview server are stored on git config for each
119# branch under branch.<branch-name>.<config-key>.
120ISSUE_CONFIG_KEY = 'gerritissue'
121PATCHSET_CONFIG_KEY = 'gerritpatchset'
122CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
123
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000124# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000125Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000126
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000127# Initialized in main()
128settings = None
129
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100130# Used by tests/git_cl_test.py to add extra logging.
131# Inside the weirdly failing test, add this:
132# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700133# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134_IS_BEING_TESTED = False
135
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000136
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000137_KNOWN_GERRIT_TO_SHORT_URLS = {
138 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
139 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
140}
141
142
Christopher Lamf732cd52017-01-24 12:40:11 +1100143def DieWithError(message, change_desc=None):
144 if change_desc:
145 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000146 print('\n ** Content of CL description **\n' +
147 '='*72 + '\n' +
148 change_desc.description + '\n' +
149 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100150
vapiera7fbd5a2016-06-16 09:17:49 -0700151 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000152 sys.exit(1)
153
154
Christopher Lamf732cd52017-01-24 12:40:11 +1100155def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000156 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000157 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000158 with open(backup_path, 'w') as backup_file:
159 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100160
161
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000162def GetNoGitPagerEnv():
163 env = os.environ.copy()
164 # 'cat' is a magical git string that disables pagers on all platforms.
165 env['GIT_PAGER'] = 'cat'
166 return env
167
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000168
bsep@chromium.org627d9002016-04-29 00:00:52 +0000169def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000171 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
172 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000173 except subprocess2.CalledProcessError as e:
174 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000175 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000176 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000177 'Command "%s" failed.\n%s' % (
178 ' '.join(args), error_message or e.stdout or ''))
Edward Lemur79d4f992019-11-11 23:49:02 +0000179 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180
181
182def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000183 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000184 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000185
186
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000187def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000188 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700189 if suppress_stderr:
190 stderr = subprocess2.VOID
191 else:
192 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000193 try:
tandrii5d48c322016-08-18 16:19:37 -0700194 (out, _), code = subprocess2.communicate(['git'] + args,
195 env=GetNoGitPagerEnv(),
196 stdout=subprocess2.PIPE,
197 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000198 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700199 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900200 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000201 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000202
203
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000204def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000205 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000206 return RunGitWithCode(args, suppress_stderr=True)[1]
207
208
tandrii2a16b952016-10-19 07:09:44 -0700209def time_sleep(seconds):
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700212 return time.sleep(seconds)
213
214
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000215def time_time():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return time.time()
219
220
Edward Lemur1b52d872019-05-09 21:12:12 +0000221def datetime_now():
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
224 return datetime.datetime.now()
225
226
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100227def confirm_or_exit(prefix='', action='confirm'):
228 """Asks user to press enter to continue or press Ctrl+C to abort."""
229 if not prefix or prefix.endswith('\n'):
230 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100231 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100232 mid = ' Press'
233 elif prefix.endswith(' '):
234 mid = 'press'
235 else:
236 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000237 gclient_utils.AskForData(
238 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239
240
241def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000242 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000243 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 while True:
245 if 'yes'.startswith(result):
246 return True
247 if 'no'.startswith(result):
248 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000249 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250
251
machenbach@chromium.org45453142015-09-15 08:45:22 +0000252def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000253 prop_list = getattr(options, 'properties', [])
254 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000255 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000256 try:
257 properties[key] = json.loads(val)
258 except ValueError:
259 pass # If a value couldn't be evaluated, treat it as a string.
260 return properties
261
262
Edward Lemur4c707a22019-09-24 21:13:43 +0000263def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000264 """Calls a buildbucket v2 method and returns the parsed json response."""
265 headers = {
266 'Accept': 'application/json',
267 'Content-Type': 'application/json',
268 }
269 request = json.dumps(request)
270 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
271
272 logging.info('POST %s with %s' % (url, request))
273
274 attempts = 1
275 time_to_sleep = 1
276 while True:
277 response, content = http.request(url, 'POST', body=request, headers=headers)
278 if response.status == 200:
279 return json.loads(content[4:])
280 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
281 msg = '%s error when calling POST %s with %s: %s' % (
282 response.status, url, request, content)
283 raise BuildbucketResponseException(msg)
284 logging.debug(
285 '%s error when calling POST %s with %s. '
286 'Sleeping for %d seconds and retrying...' % (
287 response.status, url, request, time_to_sleep))
288 time.sleep(time_to_sleep)
289 time_to_sleep *= 2
290 attempts += 1
291
292 assert False, 'unreachable'
293
294
Edward Lemur6215c792019-10-03 21:59:05 +0000295def _parse_bucket(raw_bucket):
296 legacy = True
297 project = bucket = None
298 if '/' in raw_bucket:
299 legacy = False
300 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000301 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000302 elif raw_bucket.startswith('luci.'):
303 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000304 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000305 elif '.' in raw_bucket:
306 project = raw_bucket.split('.')[0]
307 bucket = raw_bucket
308 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000309 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000310 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
311 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000312
313
Quinten Yearsley777660f2020-03-04 23:37:06 +0000314def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000315 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700316
317 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000318 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000319 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700320 options: Command-line options.
321 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000322 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000323 for project, bucket, builder in jobs:
324 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325 print('To see results here, run: git cl try-results')
326 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700327
Quinten Yearsley777660f2020-03-04 23:37:06 +0000328 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000329 if not requests:
330 return
331
Edward Lemur5b929a42019-10-21 17:57:39 +0000332 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000333 http.force_exception_to_status_code = True
334
335 batch_request = {'requests': requests}
336 batch_response = _call_buildbucket(
337 http, options.buildbucket_host, 'Batch', batch_request)
338
339 errors = [
340 ' ' + response['error']['message']
341 for response in batch_response.get('responses', [])
342 if 'error' in response
343 ]
344 if errors:
345 raise BuildbucketResponseException(
346 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
347
348
Quinten Yearsley777660f2020-03-04 23:37:06 +0000349def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000350 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000351 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000352 shared_properties = {
353 'category': options.ensure_value('category', 'git_cl_try')
354 }
355 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000356 shared_properties['clobber'] = True
357 shared_properties.update(_get_properties_from_options(options) or {})
358
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000359 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000360 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000361 shared_tags.append({'key': 'retry_failed',
362 'value': '1'})
363
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000365 for (project, bucket, builder) in jobs:
366 properties = shared_properties.copy()
367 if 'presubmit' in builder.lower():
368 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000369
Edward Lemur45768512020-03-02 19:03:14 +0000370 requests.append({
371 'scheduleBuild': {
372 'requestId': str(uuid.uuid4()),
373 'builder': {
374 'project': getattr(options, 'project', None) or project,
375 'bucket': bucket,
376 'builder': builder,
377 },
378 'gerritChanges': gerrit_changes,
379 'properties': properties,
380 'tags': [
381 {'key': 'builder', 'value': builder},
382 ] + shared_tags,
383 }
384 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000385
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000386 if options.ensure_value('revision', None):
Edward Lemur45768512020-03-02 19:03:14 +0000387 requests[-1]['scheduleBuild']['gitilesCommit'] = {
388 'host': gerrit_changes[0]['host'],
389 'project': gerrit_changes[0]['project'],
390 'id': options.revision
391 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000392
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000393 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000394
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000395
Quinten Yearsley777660f2020-03-04 23:37:06 +0000396def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000397 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000398
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000399 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000400 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000401 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000402 request = {
403 'predicate': {
404 'gerritChanges': [changelist.GetGerritChange(patchset)],
405 },
406 'fields': ','.join('builds.*.' + field for field in fields),
407 }
tandrii221ab252016-10-06 08:12:04 -0700408
Edward Lemur5b929a42019-10-21 17:57:39 +0000409 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000410 if authenticator.has_cached_credentials():
411 http = authenticator.authorize(httplib2.Http())
412 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700413 print('Warning: Some results might be missing because %s' %
414 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000415 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000416 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000417 http.force_exception_to_status_code = True
418
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000419 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
420 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000421
Edward Lemur45768512020-03-02 19:03:14 +0000422
Edward Lemur5b929a42019-10-21 17:57:39 +0000423def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000424 """Fetches builds from the latest patchset that has builds (within
425 the last few patchsets).
426
427 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000428 changelist (Changelist): The CL to fetch builds for
429 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000430 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
431 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000433 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
434 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000435 """
436 assert buildbucket_host
437 assert changelist.GetIssue(), 'CL must be uploaded first'
438 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000439 if latest_patchset is None:
440 assert changelist.GetMostRecentPatchset()
441 ps = changelist.GetMostRecentPatchset()
442 else:
443 assert latest_patchset > 0, latest_patchset
444 ps = latest_patchset
445
Quinten Yearsley983111f2019-09-26 17:18:48 +0000446 min_ps = max(1, ps - 5)
447 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000448 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000449 if len(builds):
450 return builds, ps
451 ps -= 1
452 return [], 0
453
454
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000455def _filter_failed_for_retry(all_builds):
456 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000457
458 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000459 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 i.e. a list of buildbucket.v2.Builds which includes status and builder
461 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000462
463 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000464 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000465 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000466 """
Edward Lemur45768512020-03-02 19:03:14 +0000467 grouped = {}
468 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000469 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000470 key = (builder['project'], builder['bucket'], builder['builder'])
471 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000472
Edward Lemur45768512020-03-02 19:03:14 +0000473 jobs = []
474 for (project, bucket, builder), builds in grouped.items():
475 if 'triggered' in builder:
476 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
477 'from a parent. Please schedule a manual job for the parent '
478 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000479 continue
480 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
481 # Don't retry if any are running.
482 continue
Edward Lemur45768512020-03-02 19:03:14 +0000483 # If builder had several builds, retry only if the last one failed.
484 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
485 # build, but in case of retrying failed jobs retrying a flaky one makes
486 # sense.
487 builds = sorted(builds, key=lambda b: b['createTime'])
488 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
489 continue
490 # Don't retry experimental build previously triggered by CQ.
491 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
492 for t in builds[-1]['tags']):
493 continue
494 jobs.append((project, bucket, builder))
495
496 # Sort the jobs to make testing easier.
497 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000498
499
Quinten Yearsley777660f2020-03-04 23:37:06 +0000500def _print_tryjobs(options, builds):
501 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000502 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000503 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000504 return
505
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000506 longest_builder = max(len(b['builder']['builder']) for b in builds)
507 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000508 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000509 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
510 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000511
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000512 builds_by_status = {}
513 for b in builds:
514 builds_by_status.setdefault(b['status'], []).append({
515 'id': b['id'],
516 'name': name_fmt.format(
517 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
518 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 sort_key = lambda b: (b['name'], b['id'])
521
522 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 if not builds:
525 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000527 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000528 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000529 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000530 else:
531 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
532
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 print(colorize(title))
534 for b in sorted(builds, key=sort_key):
535 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
537 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000538 print_builds(
539 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
540 print_builds(
541 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
542 color=Fore.MAGENTA)
543 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
544 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
545 color=Fore.MAGENTA)
546 print_builds('Started:', builds_by_status.pop('STARTED', []))
547 print_builds(
548 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000550 print_builds(
551 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000552 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553
554
Aiden Bennerc08566e2018-10-03 17:52:42 +0000555def _ComputeDiffLineRanges(files, upstream_commit):
556 """Gets the changed line ranges for each file since upstream_commit.
557
558 Parses a git diff on provided files and returns a dict that maps a file name
559 to an ordered list of range tuples in the form (start_line, count).
560 Ranges are in the same format as a git diff.
561 """
562 # If files is empty then diff_output will be a full diff.
563 if len(files) == 0:
564 return {}
565
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000566 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000567 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000568 diff_output = RunGit(diff_cmd)
569
570 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
571 # 2 capture groups
572 # 0 == fname of diff file
573 # 1 == 'diff_start,diff_count' or 'diff_start'
574 # will match each of
575 # diff --git a/foo.foo b/foo.py
576 # @@ -12,2 +14,3 @@
577 # @@ -12,2 +17 @@
578 # running re.findall on the above string with pattern will give
579 # [('foo.py', ''), ('', '14,3'), ('', '17')]
580
581 curr_file = None
582 line_diffs = {}
583 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
584 if match[0] != '':
585 # Will match the second filename in diff --git a/a.py b/b.py.
586 curr_file = match[0]
587 line_diffs[curr_file] = []
588 else:
589 # Matches +14,3
590 if ',' in match[1]:
591 diff_start, diff_count = match[1].split(',')
592 else:
593 # Single line changes are of the form +12 instead of +12,1.
594 diff_start = match[1]
595 diff_count = 1
596
597 diff_start = int(diff_start)
598 diff_count = int(diff_count)
599
600 # If diff_count == 0 this is a removal we can ignore.
601 line_diffs[curr_file].append((diff_start, diff_count))
602
603 return line_diffs
604
605
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000606def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000607 """Checks if a yapf file is in any parent directory of fpath until top_dir.
608
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000609 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000610 is found returns None. Uses yapf_config_cache as a cache for previously found
611 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000612 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000613 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000614 # Return result if we've already computed it.
615 if fpath in yapf_config_cache:
616 return yapf_config_cache[fpath]
617
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000618 parent_dir = os.path.dirname(fpath)
619 if os.path.isfile(fpath):
620 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622 # Otherwise fpath is a directory
623 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
624 if os.path.isfile(yapf_file):
625 ret = yapf_file
626 elif fpath == top_dir or parent_dir == fpath:
627 # If we're at the top level directory, or if we're at root
628 # there is no provided style.
629 ret = None
630 else:
631 # Otherwise recurse on the current directory.
632 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000633 yapf_config_cache[fpath] = ret
634 return ret
635
636
Brian Sheedyb4307d52019-12-02 19:18:17 +0000637def _GetYapfIgnorePatterns(top_dir):
638 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000639
640 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
641 but this functionality appears to break when explicitly passing files to
642 yapf for formatting. According to
643 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
644 the .yapfignore file should be in the directory that yapf is invoked from,
645 which we assume to be the top level directory in this case.
646
647 Args:
648 top_dir: The top level directory for the repository being formatted.
649
650 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000651 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000652 """
653 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000654 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000655 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000656 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000657
Brian Sheedyb4307d52019-12-02 19:18:17 +0000658 with open(yapfignore_file) as f:
659 for line in f.readlines():
660 stripped_line = line.strip()
661 # Comments and blank lines should be ignored.
662 if stripped_line.startswith('#') or stripped_line == '':
663 continue
664 ignore_patterns.add(stripped_line)
665 return ignore_patterns
666
667
668def _FilterYapfIgnoredFiles(filepaths, patterns):
669 """Filters out any filepaths that match any of the given patterns.
670
671 Args:
672 filepaths: An iterable of strings containing filepaths to filter.
673 patterns: An iterable of strings containing fnmatch patterns to filter on.
674
675 Returns:
676 A list of strings containing all the elements of |filepaths| that did not
677 match any of the patterns in |patterns|.
678 """
679 # Not inlined so that tests can use the same implementation.
680 return [f for f in filepaths
681 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000682
683
Aaron Gable13101a62018-02-09 13:20:41 -0800684def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000685 """Prints statistics about the change to the user."""
686 # --no-ext-diff is broken in some versions of Git, so try to work around
687 # this by overriding the environment (but there is still a problem if the
688 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000689 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000690 if 'GIT_EXTERNAL_DIFF' in env:
691 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000692
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000693 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800694 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000695 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000696
697
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000698class BuildbucketResponseException(Exception):
699 pass
700
701
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000702class Settings(object):
703 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000704 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000705 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000706 self.tree_status_url = None
707 self.viewvc_url = None
708 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000709 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000710 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000711 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000712 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000713 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000714
Edward Lemur26964072020-02-19 19:18:51 +0000715 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000717 if self.updated:
718 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000719
Edward Lemur26964072020-02-19 19:18:51 +0000720 # The only value that actually changes the behavior is
721 # autoupdate = "false". Everything else means "true".
722 autoupdate = (
723 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
724
725 cr_settings_file = FindCodereviewSettingsFile()
726 if autoupdate != 'false' and cr_settings_file:
727 LoadCodereviewSettingsFromFile(cr_settings_file)
728 cr_settings_file.close()
729
730 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000731
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000732 @staticmethod
733 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000734 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000735
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000736 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000737 if self.root is None:
738 self.root = os.path.abspath(self.GetRelativeRoot())
739 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000740
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741 def GetTreeStatusUrl(self, error_ok=False):
742 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000743 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
744 if self.tree_status_url is None and not error_ok:
745 DieWithError(
746 'You must configure your tree status URL by running '
747 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000748 return self.tree_status_url
749
750 def GetViewVCUrl(self):
751 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000752 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000753 return self.viewvc_url
754
rmistry@google.com90752582014-01-14 21:04:50 +0000755 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000756 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000757
rmistry@google.com5626a922015-02-26 14:03:30 +0000758 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000759 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000760 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000761 return run_post_upload_hook == "True"
762
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000763 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000764 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000765
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000766 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000767 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000768 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700769 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
Edward Lemur26964072020-02-19 19:18:51 +0000770 if self.squash_gerrit_uploads is None:
771 # Default is squash now (http://crbug.com/611892#c23).
772 self.squash_gerrit_uploads = self._GetConfig(
773 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000774 return self.squash_gerrit_uploads
775
tandriia60502f2016-06-20 02:01:53 -0700776 def GetSquashGerritUploadsOverride(self):
777 """Return True or False if codereview.settings should be overridden.
778
779 Returns None if no override has been defined.
780 """
781 # See also http://crbug.com/611892#c23
Edward Lemur26964072020-02-19 19:18:51 +0000782 result = self._GetConfig('gerrit.override-squash-uploads').lower()
tandriia60502f2016-06-20 02:01:53 -0700783 if result == 'true':
784 return True
785 if result == 'false':
786 return False
787 return None
788
tandrii@chromium.org28253532016-04-14 13:46:56 +0000789 def GetGerritSkipEnsureAuthenticated(self):
790 """Return True if EnsureAuthenticated should not be done for Gerrit
791 uploads."""
792 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000793 self.gerrit_skip_ensure_authenticated = self._GetConfig(
794 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000795 return self.gerrit_skip_ensure_authenticated
796
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000797 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000798 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000799 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000800 # Git requires single quotes for paths with spaces. We need to replace
801 # them with double quotes for Windows to treat such paths as a single
802 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000803 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000804 return self.git_editor or None
805
thestig@chromium.org44202a22014-03-11 19:22:18 +0000806 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000807 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000808
809 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000810 return self._GetConfig(
811 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000812
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000813 def GetFormatFullByDefault(self):
814 if self.format_full_by_default is None:
815 result = (
816 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
817 error_ok=True).strip())
818 self.format_full_by_default = (result == 'true')
819 return self.format_full_by_default
820
Edward Lemur26964072020-02-19 19:18:51 +0000821 def _GetConfig(self, key, default=''):
822 self._LazyUpdateIfNeeded()
823 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000824
825
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000826class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000827 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000828 NONE = 'none'
829 DRY_RUN = 'dry_run'
830 COMMIT = 'commit'
831
832 ALL_STATES = [NONE, DRY_RUN, COMMIT]
833
834
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000835class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000836 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000837 self.issue = issue
838 self.patchset = patchset
839 self.hostname = hostname
840
841 @property
842 def valid(self):
843 return self.issue is not None
844
845
Edward Lemurf38bc172019-09-03 21:02:13 +0000846def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000847 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
848 fail_result = _ParsedIssueNumberArgument()
849
Edward Lemur678a6842019-10-03 22:25:05 +0000850 if isinstance(arg, int):
851 return _ParsedIssueNumberArgument(issue=arg)
852 if not isinstance(arg, basestring):
853 return fail_result
854
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000855 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000856 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000857 if not arg.startswith('http'):
858 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700859
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000860 url = gclient_utils.UpgradeToHttps(arg)
861 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000862 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000863 except ValueError:
864 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200865
Edward Lemur678a6842019-10-03 22:25:05 +0000866 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
867 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
868 # Short urls like https://domain/<issue_number> can be used, but don't allow
869 # specifying the patchset (you'd 404), but we allow that here.
870 if parsed_url.path == '/':
871 part = parsed_url.fragment
872 else:
873 part = parsed_url.path
874
875 match = re.match(
876 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
877 if not match:
878 return fail_result
879
880 issue = int(match.group('issue'))
881 patchset = match.group('patchset')
882 return _ParsedIssueNumberArgument(
883 issue=issue,
884 patchset=int(patchset) if patchset else None,
885 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000886
887
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000888def _create_description_from_log(args):
889 """Pulls out the commit log to use as a base for the CL description."""
890 log_args = []
891 if len(args) == 1 and not args[0].endswith('.'):
892 log_args = [args[0] + '..']
893 elif len(args) == 1 and args[0].endswith('...'):
894 log_args = [args[0][:-1]]
895 elif len(args) == 2:
896 log_args = [args[0] + '..' + args[1]]
897 else:
898 log_args = args[:] # Hope for the best!
Edward Lemura12175c2020-03-09 16:58:26 +0000899 return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000900
901
Aaron Gablea45ee112016-11-22 15:14:38 -0800902class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700903 def __init__(self, issue, url):
904 self.issue = issue
905 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800906 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700907
908 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800909 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700910 self.issue, self.url)
911
912
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100913_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000914 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100915 # TODO(tandrii): these two aren't known in Gerrit.
916 'approval', 'disapproval'])
917
918
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000919class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000920 """Changelist works with one changelist in local branch.
921
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000922 Notes:
923 * Not safe for concurrent multi-{thread,process} use.
924 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700925 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000926 """
927
Edward Lemur125d60a2019-09-13 18:25:41 +0000928 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000929 """Create a new ChangeList instance.
930
Edward Lemurf38bc172019-09-03 21:02:13 +0000931 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000932 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000934 global settings
935 if not settings:
936 # Happens when git_cl.py is used as a utility library.
937 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000938
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000939 self.branchref = branchref
940 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000941 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000942 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000943 else:
944 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000945 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000946 self.lookedup_issue = False
947 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000948 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000949 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000950 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000951 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800952 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000953 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000954 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000955
Edward Lemur125d60a2019-09-13 18:25:41 +0000956 # Lazily cached values.
957 self._gerrit_host = None # e.g. chromium-review.googlesource.com
958 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
959 # Map from change number (issue) to its detail cache.
960 self._detail_cache = {}
961
962 if codereview_host is not None:
963 assert not codereview_host.startswith('https://'), codereview_host
964 self._gerrit_host = codereview_host
965 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000966
967 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700968 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000969
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700970 The return value is a string suitable for passing to git cl with the --cc
971 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000972 """
973 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000974 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800975 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000976 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
977 return self.cc
978
Daniel Cheng7227d212017-11-17 08:12:37 -0800979 def ExtendCC(self, more_cc):
980 """Extends the list of users to cc on this CL based on the changed files."""
981 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000982
983 def GetBranch(self):
984 """Returns the short branch name, e.g. 'master'."""
985 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +0000986 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000987 if not branchref:
988 return None
989 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +0000990 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000991 return self.branch
992
993 def GetBranchRef(self):
994 """Returns the full branch name, e.g. 'refs/heads/master'."""
995 self.GetBranch() # Poke the lazy loader.
996 return self.branchref
997
Edward Lemur85153282020-02-14 22:06:29 +0000998 def _GitGetBranchConfigValue(self, key, default=None):
999 return scm.GIT.GetBranchConfig(
1000 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001001
Edward Lemur85153282020-02-14 22:06:29 +00001002 def _GitSetBranchConfigValue(self, key, value):
1003 action = 'set %s to %r' % (key, value)
1004 if not value:
1005 action = 'unset %s' % key
1006 assert self.GetBranch(), 'a branch is needed to ' + action
1007 return scm.GIT.SetBranchConfig(
1008 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001009
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001010 @staticmethod
1011 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001012 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013 e.g. 'origin', 'refs/heads/master'
1014 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001015 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1016 settings.GetRoot(), branch)
1017 if not remote or not upstream_branch:
1018 DieWithError(
1019 'Unable to determine default branch to diff against.\n'
1020 'Either pass complete "git diff"-style arguments, like\n'
1021 ' git cl upload origin/master\n'
1022 'or verify this branch is set up to track another \n'
1023 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024
1025 return remote, upstream_branch
1026
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001027 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001028 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001029 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001030 DieWithError('The upstream for the current branch (%s) does not exist '
1031 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001032 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001033 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001034
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 def GetUpstreamBranch(self):
1036 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001037 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001038 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001039 upstream_branch = upstream_branch.replace('refs/heads/',
1040 'refs/remotes/%s/' % remote)
1041 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1042 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.upstream_branch = upstream_branch
1044 return self.upstream_branch
1045
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001046 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001047 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001048 remote, branch = None, self.GetBranch()
1049 seen_branches = set()
1050 while branch not in seen_branches:
1051 seen_branches.add(branch)
1052 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001053 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001054 if remote != '.' or branch.startswith('refs/remotes'):
1055 break
1056 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001057 remotes = RunGit(['remote'], error_ok=True).split()
1058 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001059 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001060 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001061 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001062 logging.warn('Could not determine which remote this change is '
1063 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001064 else:
1065 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001066 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001067 branch = 'HEAD'
1068 if branch.startswith('refs/remotes'):
1069 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001070 elif branch.startswith('refs/branch-heads/'):
1071 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001072 else:
1073 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001074 return self._remote
1075
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001076 def GetRemoteUrl(self):
1077 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1078
1079 Returns None if there is no remote.
1080 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001081 is_cached, value = self._cached_remote_url
1082 if is_cached:
1083 return value
1084
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001085 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001086 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001087
Edward Lemur298f2cf2019-02-22 21:40:39 +00001088 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001089 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001090 if host:
1091 self._cached_remote_url = (True, url)
1092 return url
1093
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001094 # If it cannot be parsed as an url, assume it is a local directory,
1095 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001096 logging.warning('"%s" doesn\'t appear to point to a git host. '
1097 'Interpreting it as a local directory.', url)
1098 if not os.path.isdir(url):
1099 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001100 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1101 'but it doesn\'t exist.',
1102 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001103 return None
1104
1105 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001106 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001107
Edward Lemur79d4f992019-11-11 23:49:02 +00001108 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001109 if not host:
1110 logging.error(
1111 'Remote "%(remote)s" for branch "%(branch)s" points to '
1112 '"%(cache_path)s", but it is misconfigured.\n'
1113 '"%(cache_path)s" must be a git repo and must have a remote named '
1114 '"%(remote)s" pointing to the git host.', {
1115 'remote': remote,
1116 'cache_path': cache_path,
1117 'branch': self.GetBranch()})
1118 return None
1119
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001120 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001121 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001123 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001124 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001125 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001126 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001127 if self.issue is not None:
1128 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001129 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130 return self.issue
1131
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001132 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001134 issue = self.GetIssue()
1135 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001136 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001137 server = self.GetCodereviewServer()
1138 if short:
1139 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1140 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141
Edward Lemur6c6827c2020-02-06 21:15:18 +00001142 def FetchDescription(self, pretty=False):
1143 assert self.GetIssue(), 'issue is required to query Gerrit'
1144
Edward Lemur9aa1a962020-02-25 00:58:38 +00001145 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001146 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1147 current_rev = data['current_revision']
1148 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001149
1150 if not pretty:
1151 return self.description
1152
1153 # Set width to 72 columns + 2 space indent.
1154 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1155 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1156 lines = self.description.splitlines()
1157 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158
1159 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001160 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001161 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001162 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001163 if self.patchset is not None:
1164 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001165 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001166 return self.patchset
1167
Edward Lemur9aa1a962020-02-25 00:58:38 +00001168 def GetAuthor(self):
1169 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1170
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001171 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001172 """Set this branch's patchset. If patchset=0, clears the patchset."""
1173 assert self.GetBranch()
1174 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001175 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001176 else:
1177 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001178 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001179
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001180 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001181 """Set this branch's issue. If issue isn't given, clears the issue."""
1182 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001183 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001184 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001185 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001186 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001187 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001188 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001189 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001190 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 else:
tandrii5d48c322016-08-18 16:19:37 -07001192 # Reset all of these just to be clean.
1193 reset_suffixes = [
1194 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001195 ISSUE_CONFIG_KEY,
1196 PATCHSET_CONFIG_KEY,
1197 CODEREVIEW_SERVER_CONFIG_KEY,
1198 'gerritsquashhash',
1199 ]
tandrii5d48c322016-08-18 16:19:37 -07001200 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001201 try:
1202 self._GitSetBranchConfigValue(prop, None)
1203 except subprocess2.CalledProcessError:
1204 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001205 msg = RunGit(['log', '-1', '--format=%B']).strip()
1206 if msg and git_footers.get_footer_change_id(msg):
1207 print('WARNING: The change patched into this branch has a Change-Id. '
1208 'Removing it.')
1209 RunGit(['commit', '--amend', '-m',
1210 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001211 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001212 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001213 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001214
Edward Lemur2c62b332020-03-12 22:12:33 +00001215 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001216 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001217 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001218 except subprocess2.CalledProcessError:
1219 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001220 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001221 'This branch probably doesn\'t exist anymore. To reset the\n'
1222 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001223 ' git branch --set-upstream-to origin/master %s\n'
1224 'or replace origin/master with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001225 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001226
dsansomee2d6fd92016-09-08 00:10:47 -07001227 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001228 assert self.GetIssue(), 'issue is required to update description'
1229
1230 if gerrit_util.HasPendingChangeEdit(
1231 self._GetGerritHost(), self._GerritChangeIdentifier()):
1232 if not force:
1233 confirm_or_exit(
1234 'The description cannot be modified while the issue has a pending '
1235 'unpublished edit. Either publish the edit in the Gerrit web UI '
1236 'or delete it.\n\n', action='delete the unpublished edit')
1237
1238 gerrit_util.DeletePendingChangeEdit(
1239 self._GetGerritHost(), self._GerritChangeIdentifier())
1240 gerrit_util.SetCommitMessage(
1241 self._GetGerritHost(), self._GerritChangeIdentifier(),
1242 description, notify='NONE')
1243
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001244 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001245
Edward Lemur75526302020-02-27 22:31:05 +00001246 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001247 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001248 '--root', settings.GetRoot(),
1249 '--upstream', upstream,
1250 ]
1251
1252 args.extend(['--verbose'] * verbose)
1253
Edward Lemur99df04e2020-03-05 19:39:43 +00001254 author = self.GetAuthor()
1255 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001256 issue = self.GetIssue()
1257 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001258 if author:
1259 args.extend(['--author', author])
1260 if gerrit_url:
1261 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001262 if issue:
1263 args.extend(['--issue', str(issue)])
1264 if patchset:
1265 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001266
Edward Lemur75526302020-02-27 22:31:05 +00001267 return args
1268
1269 def RunHook(
1270 self, committing, may_prompt, verbose, parallel, upstream, description,
1271 all_files):
1272 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1273 args = self._GetCommonPresubmitArgs(verbose, upstream)
1274 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001275 if may_prompt:
1276 args.append('--may_prompt')
1277 if parallel:
1278 args.append('--parallel')
1279 if all_files:
1280 args.append('--all_files')
1281
1282 with gclient_utils.temporary_file() as description_file:
1283 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001284
1285 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001286 args.extend(['--json_output', json_output])
1287 args.extend(['--description_file', description_file])
1288
1289 start = time_time()
1290 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1291 exit_code = p.wait()
1292 metrics.collector.add_repeated('sub_commands', {
1293 'command': 'presubmit',
1294 'execution_time': time_time() - start,
1295 'exit_code': exit_code,
1296 })
1297
1298 if exit_code:
1299 sys.exit(exit_code)
1300
1301 json_results = gclient_utils.FileRead(json_output)
1302 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001303
Edward Lemur75526302020-02-27 22:31:05 +00001304 def RunPostUploadHook(self, verbose, upstream, description):
1305 args = self._GetCommonPresubmitArgs(verbose, upstream)
1306 args.append('--post_upload')
1307
1308 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001309 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001310 args.extend(['--description_file', description_file])
1311 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1312 p.wait()
1313
Edward Lemur5a644f82020-03-18 16:44:57 +00001314 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1315 # Get description message for upload.
1316 if self.GetIssue():
1317 description = self.FetchDescription()
1318 elif options.message:
1319 description = options.message
1320 else:
1321 description = _create_description_from_log(git_diff_args)
1322 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001323 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001324
1325 # Extract bug number from branch name.
1326 bug = options.bug
1327 fixed = options.fixed
1328 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1329 self.GetBranch())
1330 if not bug and not fixed and match:
1331 if match.group('type') == 'bug':
1332 bug = match.group('bugnum')
1333 else:
1334 fixed = match.group('bugnum')
1335
1336 change_description = ChangeDescription(description, bug, fixed)
1337
1338 # Set the reviewer list now so that presubmit checks can access it.
1339 if options.reviewers or options.tbrs or options.add_owners_to:
1340 change_description.update_reviewers(
1341 options.reviewers, options.tbrs, options.add_owners_to, files,
1342 self.GetAuthor())
1343
1344 return change_description
1345
1346 def _GetTitleForUpload(self, options):
1347 # When not squashing, just return options.title.
1348 if not options.squash:
1349 return options.title
1350
1351 # On first upload, patchset title is always this string, while options.title
1352 # gets converted to first line of message.
1353 if not self.GetIssue():
1354 return 'Initial upload'
1355
1356 # When uploading subsequent patchsets, options.message is taken as the title
1357 # if options.title is not provided.
1358 if options.title:
1359 return options.title
1360 if options.message:
1361 return options.message.strip()
1362
1363 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001364 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Edward Lemur5a644f82020-03-18 16:44:57 +00001365 if options.force:
1366 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001367 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1368 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001369
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001370 def CMDUpload(self, options, git_diff_args, orig_args):
1371 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001372 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001373 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001374 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001375 else:
1376 if self.GetBranch() is None:
1377 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1378
1379 # Default to diffing against common ancestor of upstream branch
1380 base_branch = self.GetCommonAncestorWithUpstream()
1381 git_diff_args = [base_branch, 'HEAD']
1382
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001383 # Fast best-effort checks to abort before running potentially expensive
1384 # hooks if uploading is likely to fail anyway. Passing these checks does
1385 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001386 self.EnsureAuthenticated(force=options.force)
1387 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001388
1389 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001390 watchlist = watchlists.Watchlists(settings.GetRoot())
1391 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001392 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001393 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001394
Edward Lemur5a644f82020-03-18 16:44:57 +00001395 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001396 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001397 hook_results = self.RunHook(
1398 committing=False,
1399 may_prompt=not options.force,
1400 verbose=options.verbose,
1401 parallel=options.parallel,
1402 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001403 description=change_desc.description,
Edward Lemur2c62b332020-03-12 22:12:33 +00001404 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001405 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001406
Aaron Gable13101a62018-02-09 13:20:41 -08001407 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001408 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001409 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001410 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001411 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001412 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001413 # Run post upload hooks, if specified.
1414 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001415 self.RunPostUploadHook(
1416 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001417
1418 # Upload all dependencies if specified.
1419 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001420 print()
1421 print('--dependencies has been specified.')
1422 print('All dependent local branches will be re-uploaded.')
1423 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001424 # Remove the dependencies flag from args so that we do not end up in a
1425 # loop.
1426 orig_args.remove('--dependencies')
1427 ret = upload_branch_deps(self, orig_args)
1428 return ret
1429
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001430 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001431 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001432
1433 Issue must have been already uploaded and known.
1434 """
1435 assert new_state in _CQState.ALL_STATES
1436 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001437 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001438 vote_map = {
1439 _CQState.NONE: 0,
1440 _CQState.DRY_RUN: 1,
1441 _CQState.COMMIT: 2,
1442 }
1443 labels = {'Commit-Queue': vote_map[new_state]}
1444 notify = False if new_state == _CQState.DRY_RUN else None
1445 gerrit_util.SetReview(
1446 self._GetGerritHost(), self._GerritChangeIdentifier(),
1447 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001448 return 0
1449 except KeyboardInterrupt:
1450 raise
1451 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001452 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001453 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001454 ' * Your project has no CQ,\n'
1455 ' * You don\'t have permission to change the CQ state,\n'
1456 ' * There\'s a bug in this code (see stack trace below).\n'
1457 'Consider specifying which bots to trigger manually or asking your '
1458 'project owners for permissions or contacting Chrome Infra at:\n'
1459 'https://www.chromium.org/infra\n\n' %
1460 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001461 # Still raise exception so that stack trace is printed.
1462 raise
1463
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 def _GetGerritHost(self):
1465 # Lazy load of configs.
1466 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001467 if self._gerrit_host and '.' not in self._gerrit_host:
1468 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1469 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001470 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001471 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001472 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001473 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001474 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1475 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001476 return self._gerrit_host
1477
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001478 def _GetGitHost(self):
1479 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001480 remote_url = self.GetRemoteUrl()
1481 if not remote_url:
1482 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001483 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001484
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001485 def GetCodereviewServer(self):
1486 if not self._gerrit_server:
1487 # If we're on a branch then get the server potentially associated
1488 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001489 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001490 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001491 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001492 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001493 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001494 if not self._gerrit_server:
1495 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1496 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001497 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001498 parts[0] = parts[0] + '-review'
1499 self._gerrit_host = '.'.join(parts)
1500 self._gerrit_server = 'https://%s' % self._gerrit_host
1501 return self._gerrit_server
1502
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001503 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001504 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001505 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001506 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001507 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001508 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001509 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001510 if project.endswith('.git'):
1511 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001512 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1513 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1514 # gitiles/git-over-https protocol. E.g.,
1515 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1516 # as
1517 # https://chromium.googlesource.com/v8/v8
1518 if project.startswith('a/'):
1519 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001520 return project
1521
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001522 def _GerritChangeIdentifier(self):
1523 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1524
1525 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001526 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001527 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001528 project = self._GetGerritProject()
1529 if project:
1530 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1531 # Fall back on still unique, but less efficient change number.
1532 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001533
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001534 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001535 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001536 if settings.GetGerritSkipEnsureAuthenticated():
1537 # For projects with unusual authentication schemes.
1538 # See http://crbug.com/603378.
1539 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001540
1541 # Check presence of cookies only if using cookies-based auth method.
1542 cookie_auth = gerrit_util.Authenticator.get()
1543 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001544 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001545
Florian Mayerae510e82020-01-30 21:04:48 +00001546 remote_url = self.GetRemoteUrl()
1547 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001548 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001549 return
1550 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001551 logging.warning('Ignoring branch %(branch)s with non-https remote '
1552 '%(remote)s', {
1553 'branch': self.branch,
1554 'remote': self.GetRemoteUrl()
1555 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001556 return
1557
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001558 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001559 self.GetCodereviewServer()
1560 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001561 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001562
1563 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1564 git_auth = cookie_auth.get_auth_header(git_host)
1565 if gerrit_auth and git_auth:
1566 if gerrit_auth == git_auth:
1567 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001568 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001569 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001570 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001571 ' %s\n'
1572 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001573 ' Consider running the following command:\n'
1574 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001575 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001576 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001577 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001578 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001579 cookie_auth.get_new_password_message(git_host)))
1580 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001581 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001582 return
1583 else:
1584 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001585 ([] if gerrit_auth else [self._gerrit_host]) +
1586 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001587 DieWithError('Credentials for the following hosts are required:\n'
1588 ' %s\n'
1589 'These are read from %s (or legacy %s)\n'
1590 '%s' % (
1591 '\n '.join(missing),
1592 cookie_auth.get_gitcookies_path(),
1593 cookie_auth.get_netrc_path(),
1594 cookie_auth.get_new_password_message(git_host)))
1595
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001596 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001597 if not self.GetIssue():
1598 return
1599
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001600 status = self._GetChangeDetail()['status']
1601 if status in ('MERGED', 'ABANDONED'):
1602 DieWithError('Change %s has been %s, new uploads are not allowed' %
1603 (self.GetIssueURL(),
1604 'submitted' if status == 'MERGED' else 'abandoned'))
1605
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001606 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1607 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1608 # Apparently this check is not very important? Otherwise get_auth_email
1609 # could have been added to other implementations of Authenticator.
1610 cookies_auth = gerrit_util.Authenticator.get()
1611 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001612 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001613
1614 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001615 if self.GetIssueOwner() == cookies_user:
1616 return
1617 logging.debug('change %s owner is %s, cookies user is %s',
1618 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001619 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001620 # so ask what Gerrit thinks of this user.
1621 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1622 if details['email'] == self.GetIssueOwner():
1623 return
1624 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001625 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001626 'as %s.\n'
1627 'Uploading may fail due to lack of permissions.' %
1628 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1629 confirm_or_exit(action='upload')
1630
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001631 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001632 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001633 or CQ status, assuming adherence to a common workflow.
1634
1635 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001636 * 'error' - error from review tool (including deleted issues)
1637 * 'unsent' - no reviewers added
1638 * 'waiting' - waiting for review
1639 * 'reply' - waiting for uploader to reply to review
1640 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001641 * 'dry-run' - dry-running in the CQ
1642 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001643 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001644 """
1645 if not self.GetIssue():
1646 return None
1647
1648 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001649 data = self._GetChangeDetail([
1650 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001651 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001652 return 'error'
1653
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001654 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001655 return 'closed'
1656
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001657 cq_label = data['labels'].get('Commit-Queue', {})
1658 max_cq_vote = 0
1659 for vote in cq_label.get('all', []):
1660 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1661 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001662 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001663 if max_cq_vote == 1:
1664 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001665
Aaron Gable9ab38c62017-04-06 14:36:33 -07001666 if data['labels'].get('Code-Review', {}).get('approved'):
1667 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001668
1669 if not data.get('reviewers', {}).get('REVIEWER', []):
1670 return 'unsent'
1671
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001672 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001673 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001674 while messages:
1675 m = messages.pop()
1676 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001677 # Ignore replies from CQ.
1678 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001679 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001680 # Most recent message was by owner.
1681 return 'waiting'
1682 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001683 # Some reply from non-owner.
1684 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001685
1686 # Somehow there are no messages even though there are reviewers.
1687 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001688
1689 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001690 if not self.GetIssue():
1691 return None
1692
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001693 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001694 patchset = data['revisions'][data['current_revision']]['_number']
1695 self.SetPatchset(patchset)
1696 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001697
Aaron Gable636b13f2017-07-14 10:42:48 -07001698 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001699 gerrit_util.SetReview(
1700 self._GetGerritHost(), self._GerritChangeIdentifier(),
1701 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001702
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001703 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001704 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001705 # CURRENT_REVISION is included to get the latest patchset so that
1706 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001707 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001708 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1709 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001710 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001711 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001712 robot_file_comments = gerrit_util.GetChangeRobotComments(
1713 self._GetGerritHost(), self._GerritChangeIdentifier())
1714
1715 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001716 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001717 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001718 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001719 line_comments = file_comments.setdefault(path, [])
1720 line_comments.extend(
1721 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001722
1723 # Build dictionary of file comments for easy access and sorting later.
1724 # {author+date: {path: {patchset: {line: url+message}}}}
1725 comments = collections.defaultdict(
1726 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001727 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001729 tag = comment.get('tag', '')
1730 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001731 continue
1732 key = (comment['author']['email'], comment['updated'])
1733 if comment.get('side', 'REVISION') == 'PARENT':
1734 patchset = 'Base'
1735 else:
1736 patchset = 'PS%d' % comment['patch_set']
1737 line = comment.get('line', 0)
1738 url = ('https://%s/c/%s/%s/%s#%s%s' %
1739 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1740 'b' if comment.get('side') == 'PARENT' else '',
1741 str(line) if line else ''))
1742 comments[key][path][patchset][line] = (url, comment['message'])
1743
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001744 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001745 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001746 summary = self._BuildCommentSummary(msg, comments, readable)
1747 if summary:
1748 summaries.append(summary)
1749 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001750
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001751 @staticmethod
1752 def _BuildCommentSummary(msg, comments, readable):
1753 key = (msg['author']['email'], msg['date'])
1754 # Don't bother showing autogenerated messages that don't have associated
1755 # file or line comments. this will filter out most autogenerated
1756 # messages, but will keep robot comments like those from Tricium.
1757 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1758 if is_autogenerated and not comments.get(key):
1759 return None
1760 message = msg['message']
1761 # Gerrit spits out nanoseconds.
1762 assert len(msg['date'].split('.')[-1]) == 9
1763 date = datetime.datetime.strptime(msg['date'][:-3],
1764 '%Y-%m-%d %H:%M:%S.%f')
1765 if key in comments:
1766 message += '\n'
1767 for path, patchsets in sorted(comments.get(key, {}).items()):
1768 if readable:
1769 message += '\n%s' % path
1770 for patchset, lines in sorted(patchsets.items()):
1771 for line, (url, content) in sorted(lines.items()):
1772 if line:
1773 line_str = 'Line %d' % line
1774 path_str = '%s:%d:' % (path, line)
1775 else:
1776 line_str = 'File comment'
1777 path_str = '%s:0:' % path
1778 if readable:
1779 message += '\n %s, %s: %s' % (patchset, line_str, url)
1780 message += '\n %s\n' % content
1781 else:
1782 message += '\n%s ' % path_str
1783 message += '\n%s\n' % content
1784
1785 return _CommentSummary(
1786 date=date,
1787 message=message,
1788 sender=msg['author']['email'],
1789 autogenerated=is_autogenerated,
1790 # These could be inferred from the text messages and correlated with
1791 # Code-Review label maximum, however this is not reliable.
1792 # Leaving as is until the need arises.
1793 approval=False,
1794 disapproval=False,
1795 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001796
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001798 gerrit_util.AbandonChange(
1799 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001800
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001801 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001802 gerrit_util.SubmitChange(
1803 self._GetGerritHost(), self._GerritChangeIdentifier(),
1804 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001805
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001806 def _GetChangeDetail(self, options=None):
1807 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001808 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001809 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001810
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001811 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001812 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001813 options.append('CURRENT_COMMIT')
1814
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001815 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001816 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001817 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001818
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001819 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1820 # Assumption: data fetched before with extra options is suitable
1821 # for return for a smaller set of options.
1822 # For example, if we cached data for
1823 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1824 # and request is for options=[CURRENT_REVISION],
1825 # THEN we can return prior cached data.
1826 if options_set.issubset(cached_options_set):
1827 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001828
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001829 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001830 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001831 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001832 except gerrit_util.GerritError as e:
1833 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001834 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001835 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001836
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001837 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001838 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001839
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001840 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001841 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001842 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001843 data = gerrit_util.GetChangeCommit(
1844 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001845 except gerrit_util.GerritError as e:
1846 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001847 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001848 raise
agable32978d92016-11-01 12:55:02 -07001849 return data
1850
Karen Qian40c19422019-03-13 21:28:29 +00001851 def _IsCqConfigured(self):
1852 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001853 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001854
Olivier Robin75ee7252018-04-13 10:02:56 +02001855 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001856 if git_common.is_dirty_git_tree('land'):
1857 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001858
tandriid60367b2016-06-22 05:25:12 -07001859 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001860 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001861 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001862 'which can test and land changes for you. '
1863 'Are you sure you wish to bypass it?\n',
1864 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001865 differs = True
tandriic4344b52016-08-29 06:04:54 -07001866 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001867 # Note: git diff outputs nothing if there is no diff.
1868 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001869 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001870 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001871 if detail['current_revision'] == last_upload:
1872 differs = False
1873 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001874 print('WARNING: Local branch contents differ from latest uploaded '
1875 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001876 if differs:
1877 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001878 confirm_or_exit(
1879 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1880 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001881 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001882 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001883 upstream = self.GetCommonAncestorWithUpstream()
1884 if self.GetIssue():
1885 description = self.FetchDescription()
1886 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001887 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001888 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001889 committing=True,
1890 may_prompt=not force,
1891 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001892 parallel=parallel,
1893 upstream=upstream,
1894 description=description,
1895 all_files=False)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001896
1897 self.SubmitIssue(wait_for_merge=True)
1898 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001899 links = self._GetChangeCommit().get('web_links', [])
1900 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001901 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001902 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001903 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001904 return 0
1905
Edward Lemurf38bc172019-09-03 21:02:13 +00001906 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001907 assert parsed_issue_arg.valid
1908
Edward Lemur125d60a2019-09-13 18:25:41 +00001909 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001910
1911 if parsed_issue_arg.hostname:
1912 self._gerrit_host = parsed_issue_arg.hostname
1913 self._gerrit_server = 'https://%s' % self._gerrit_host
1914
tandriic2405f52016-10-10 08:13:15 -07001915 try:
1916 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001917 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001918 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001919
1920 if not parsed_issue_arg.patchset:
1921 # Use current revision by default.
1922 revision_info = detail['revisions'][detail['current_revision']]
1923 patchset = int(revision_info['_number'])
1924 else:
1925 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001926 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001927 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1928 break
1929 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001930 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001931 (parsed_issue_arg.patchset, self.GetIssue()))
1932
Edward Lemur125d60a2019-09-13 18:25:41 +00001933 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001934 if remote_url.endswith('.git'):
1935 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001936 remote_url = remote_url.rstrip('/')
1937
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001938 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001939 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001940
1941 if remote_url != fetch_info['url']:
1942 DieWithError('Trying to patch a change from %s but this repo appears '
1943 'to be %s.' % (fetch_info['url'], remote_url))
1944
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001946
Aaron Gable62619a32017-06-16 08:22:09 -07001947 if force:
1948 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1949 print('Checked out commit for change %i patchset %i locally' %
1950 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001951 elif nocommit:
1952 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1953 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001954 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001955 RunGit(['cherry-pick', 'FETCH_HEAD'])
1956 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001957 (parsed_issue_arg.issue, patchset))
1958 print('Note: this created a local commit which does not have '
1959 'the same hash as the one uploaded for review. This will make '
1960 'uploading changes based on top of this branch difficult.\n'
1961 'If you want to do that, use "git cl patch --force" instead.')
1962
Stefan Zagerd08043c2017-10-12 12:07:02 -07001963 if self.GetBranch():
1964 self.SetIssue(parsed_issue_arg.issue)
1965 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001966 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07001967 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
1968 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
1969 else:
1970 print('WARNING: You are in detached HEAD state.\n'
1971 'The patch has been applied to your checkout, but you will not be '
1972 'able to upload a new patch set to the gerrit issue.\n'
1973 'Try using the \'-b\' option if you would like to work on a '
1974 'branch and/or upload a new patch set.')
1975
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001976 return 0
1977
tandrii16e0b4e2016-06-07 10:34:28 -07001978 def _GerritCommitMsgHookCheck(self, offer_removal):
1979 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
1980 if not os.path.exists(hook):
1981 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001982 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
1983 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07001984 data = gclient_utils.FileRead(hook)
1985 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
1986 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001987 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07001988 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07001989 'and may interfere with it in subtle ways.\n'
1990 'We recommend you remove the commit-msg hook.')
1991 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001992 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07001993 gclient_utils.rm_file_or_tree(hook)
1994 print('Gerrit commit-msg hook removed.')
1995 else:
1996 print('OK, will keep Gerrit commit-msg hook in place.')
1997
Edward Lemur1b52d872019-05-09 21:12:12 +00001998 def _CleanUpOldTraces(self):
1999 """Keep only the last |MAX_TRACES| traces."""
2000 try:
2001 traces = sorted([
2002 os.path.join(TRACES_DIR, f)
2003 for f in os.listdir(TRACES_DIR)
2004 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2005 and not f.startswith('tmp'))
2006 ])
2007 traces_to_delete = traces[:-MAX_TRACES]
2008 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002009 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002010 except OSError:
2011 print('WARNING: Failed to remove old git traces from\n'
2012 ' %s'
2013 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002014
Edward Lemur5737f022019-05-17 01:24:00 +00002015 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002016 """Zip and write the git push traces stored in traces_dir."""
2017 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002018 traces_zip = trace_name + '-traces'
2019 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002020 # Create a temporary dir to store git config and gitcookies in. It will be
2021 # compressed and stored next to the traces.
2022 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002023 git_info_zip = trace_name + '-git-info'
2024
Edward Lemur5737f022019-05-17 01:24:00 +00002025 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002026 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002027 git_push_metadata['now'] = git_push_metadata['now'].decode(
2028 sys.stdin.encoding)
2029
Edward Lemur1b52d872019-05-09 21:12:12 +00002030 git_push_metadata['trace_name'] = trace_name
2031 gclient_utils.FileWrite(
2032 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2033
2034 # Keep only the first 6 characters of the git hashes on the packet
2035 # trace. This greatly decreases size after compression.
2036 packet_traces = os.path.join(traces_dir, 'trace-packet')
2037 if os.path.isfile(packet_traces):
2038 contents = gclient_utils.FileRead(packet_traces)
2039 gclient_utils.FileWrite(
2040 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2041 shutil.make_archive(traces_zip, 'zip', traces_dir)
2042
2043 # Collect and compress the git config and gitcookies.
2044 git_config = RunGit(['config', '-l'])
2045 gclient_utils.FileWrite(
2046 os.path.join(git_info_dir, 'git-config'),
2047 git_config)
2048
2049 cookie_auth = gerrit_util.Authenticator.get()
2050 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2051 gitcookies_path = cookie_auth.get_gitcookies_path()
2052 if os.path.isfile(gitcookies_path):
2053 gitcookies = gclient_utils.FileRead(gitcookies_path)
2054 gclient_utils.FileWrite(
2055 os.path.join(git_info_dir, 'gitcookies'),
2056 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2057 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2058
Edward Lemur1b52d872019-05-09 21:12:12 +00002059 gclient_utils.rmtree(git_info_dir)
2060
2061 def _RunGitPushWithTraces(
2062 self, change_desc, refspec, refspec_opts, git_push_metadata):
2063 """Run git push and collect the traces resulting from the execution."""
2064 # Create a temporary directory to store traces in. Traces will be compressed
2065 # and stored in a 'traces' dir inside depot_tools.
2066 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002067 trace_name = os.path.join(
2068 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002069
2070 env = os.environ.copy()
2071 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2072 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002073 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002074 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2075 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2076 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2077
2078 try:
2079 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002080 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002081 before_push = time_time()
2082 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002083 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002084 env=env,
2085 print_stdout=True,
2086 # Flush after every line: useful for seeing progress when running as
2087 # recipe.
2088 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002089 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002090 except subprocess2.CalledProcessError as e:
2091 push_returncode = e.returncode
2092 DieWithError('Failed to create a change. Please examine output above '
2093 'for the reason of the failure.\n'
2094 'Hint: run command below to diagnose common Git/Gerrit '
2095 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002096 ' git cl creds-check\n'
2097 '\n'
2098 'If git-cl is not working correctly, file a bug under the '
2099 'Infra>SDK component including the files below.\n'
2100 'Review the files before upload, since they might contain '
2101 'sensitive information.\n'
2102 'Set the Restrict-View-Google label so that they are not '
2103 'publicly accessible.\n'
2104 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002105 change_desc)
2106 finally:
2107 execution_time = time_time() - before_push
2108 metrics.collector.add_repeated('sub_commands', {
2109 'command': 'git push',
2110 'execution_time': execution_time,
2111 'exit_code': push_returncode,
2112 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2113 })
2114
Edward Lemur1b52d872019-05-09 21:12:12 +00002115 git_push_metadata['execution_time'] = execution_time
2116 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002117 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002118
Edward Lemur1b52d872019-05-09 21:12:12 +00002119 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002120 gclient_utils.rmtree(traces_dir)
2121
2122 return push_stdout
2123
Edward Lemura12175c2020-03-09 16:58:26 +00002124 def CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002125 self, options, git_diff_args, custom_cl_base, change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002126 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002127 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002128 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002129
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002130 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002131 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002132 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002133 # User requested to change description
2134 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002135 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002136 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002137 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002138 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002139 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002140 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002141 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002142 if len(change_ids) == 1:
2143 change_id = change_ids[0]
2144 else:
2145 change_id = GenerateGerritChangeId(change_desc.description)
2146 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002147
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002148 if options.preserve_tryjobs:
2149 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002150
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002151 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002152 parent = self._ComputeParent(
2153 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002154 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002155 with gclient_utils.temporary_file() as desc_tempfile:
2156 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2157 ref_to_push = RunGit(
2158 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002159 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002160 if not git_footers.get_footer_change_id(change_desc.description):
2161 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002162 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002163 self._AddChangeIdToCommitMessage(
2164 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002165 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002166 # For no-squash mode, we assume the remote called "origin" is the one we
2167 # want. It is not worthwhile to support different workflows for
2168 # no-squash mode.
2169 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002170 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2171
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002172 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002173 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2174 ref_to_push)]).splitlines()
2175 if len(commits) > 1:
2176 print('WARNING: This will upload %d commits. Run the following command '
2177 'to see which commits will be uploaded: ' % len(commits))
2178 print('git log %s..%s' % (parent, ref_to_push))
2179 print('You can also use `git squash-branch` to squash these into a '
2180 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002181 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002182
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002183 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002184 cc = []
2185 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2186 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2187 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002188 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002189 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002190 if options.cc:
2191 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002192 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002193 if change_desc.get_cced():
2194 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002195 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2196 valid_accounts = set(reviewers + cc)
2197 # TODO(crbug/877717): relax this for all hosts.
2198 else:
2199 valid_accounts = gerrit_util.ValidAccounts(
2200 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002201 logging.info('accounts %s are recognized, %s invalid',
2202 sorted(valid_accounts),
2203 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002204
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002205 # Extra options that can be specified at push time. Doc:
2206 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002207 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002208
Aaron Gable844cf292017-06-28 11:32:59 -07002209 # By default, new changes are started in WIP mode, and subsequent patchsets
2210 # don't send email. At any time, passing --send-mail will mark the change
2211 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002212 if options.send_mail:
2213 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002214 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002215 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002216 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002217 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002218 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002219
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002220 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002221 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002222
Edward Lemur5a644f82020-03-18 16:44:57 +00002223 title = self._GetTitleForUpload(options)
Aaron Gable9b713dd2016-12-14 16:04:21 -08002224 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002225 # Punctuation and whitespace in |title| must be percent-encoded.
2226 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002227
agablec6787972016-09-09 16:13:34 -07002228 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002229 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002230
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002231 for r in sorted(reviewers):
2232 if r in valid_accounts:
2233 refspec_opts.append('r=%s' % r)
2234 reviewers.remove(r)
2235 else:
2236 # TODO(tandrii): this should probably be a hard failure.
2237 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2238 % r)
2239 for c in sorted(cc):
2240 # refspec option will be rejected if cc doesn't correspond to an
2241 # account, even though REST call to add such arbitrary cc may succeed.
2242 if c in valid_accounts:
2243 refspec_opts.append('cc=%s' % c)
2244 cc.remove(c)
2245
rmistry9eadede2016-09-19 11:22:43 -07002246 if options.topic:
2247 # Documentation on Gerrit topics is here:
2248 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002249 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002250
Edward Lemur687ca902018-12-05 02:30:30 +00002251 if options.enable_auto_submit:
2252 refspec_opts.append('l=Auto-Submit+1')
2253 if options.use_commit_queue:
2254 refspec_opts.append('l=Commit-Queue+2')
2255 elif options.cq_dry_run:
2256 refspec_opts.append('l=Commit-Queue+1')
2257
2258 if change_desc.get_reviewers(tbr_only=True):
2259 score = gerrit_util.GetCodeReviewTbrScore(
2260 self._GetGerritHost(),
2261 self._GetGerritProject())
2262 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002263
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002264 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002265 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002266 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002267 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002268 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2269
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002270 refspec_suffix = ''
2271 if refspec_opts:
2272 refspec_suffix = '%' + ','.join(refspec_opts)
2273 assert ' ' not in refspec_suffix, (
2274 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2275 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2276
Edward Lemur1b52d872019-05-09 21:12:12 +00002277 git_push_metadata = {
2278 'gerrit_host': self._GetGerritHost(),
2279 'title': title or '<untitled>',
2280 'change_id': change_id,
2281 'description': change_desc.description,
2282 }
2283 push_stdout = self._RunGitPushWithTraces(
2284 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285
2286 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002287 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 change_numbers = [m.group(1)
2289 for m in map(regex.match, push_stdout.splitlines())
2290 if m]
2291 if len(change_numbers) != 1:
2292 DieWithError(
2293 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002294 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002296 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002297
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002298 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002299 # GetIssue() is not set in case of non-squash uploads according to tests.
2300 # TODO(agable): non-squash uploads in git cl should be removed.
2301 gerrit_util.AddReviewers(
2302 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002303 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002304 reviewers, cc,
2305 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002306
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 return 0
2308
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002309 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2310 change_desc):
2311 """Computes parent of the generated commit to be uploaded to Gerrit.
2312
2313 Returns revision or a ref name.
2314 """
2315 if custom_cl_base:
2316 # Try to avoid creating additional unintended CLs when uploading, unless
2317 # user wants to take this risk.
2318 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2319 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2320 local_ref_of_target_remote])
2321 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002322 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002323 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2324 'If you proceed with upload, more than 1 CL may be created by '
2325 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2326 'If you are certain that specified base `%s` has already been '
2327 'uploaded to Gerrit as another CL, you may proceed.\n' %
2328 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2329 if not force:
2330 confirm_or_exit(
2331 'Do you take responsibility for cleaning up potential mess '
2332 'resulting from proceeding with upload?',
2333 action='upload')
2334 return custom_cl_base
2335
Aaron Gablef97e33d2017-03-30 15:44:27 -07002336 if remote != '.':
2337 return self.GetCommonAncestorWithUpstream()
2338
2339 # If our upstream branch is local, we base our squashed commit on its
2340 # squashed version.
2341 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2342
Aaron Gablef97e33d2017-03-30 15:44:27 -07002343 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002344 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002345
2346 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002347 # TODO(tandrii): consider checking parent change in Gerrit and using its
2348 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2349 # the tree hash of the parent branch. The upside is less likely bogus
2350 # requests to reupload parent change just because it's uploadhash is
2351 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002352 parent = scm.GIT.GetBranchConfig(
2353 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002354 # Verify that the upstream branch has been uploaded too, otherwise
2355 # Gerrit will create additional CLs when uploading.
2356 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2357 RunGitSilent(['rev-parse', parent + ':'])):
2358 DieWithError(
2359 '\nUpload upstream branch %s first.\n'
2360 'It is likely that this branch has been rebased since its last '
2361 'upload, so you just need to upload it again.\n'
2362 '(If you uploaded it with --no-squash, then branch dependencies '
2363 'are not supported, and you should reupload with --squash.)'
2364 % upstream_branch_name,
2365 change_desc)
2366 return parent
2367
Edward Lemura12175c2020-03-09 16:58:26 +00002368 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002369 """Re-commits using the current message, assumes the commit hook is in
2370 place.
2371 """
Edward Lemura12175c2020-03-09 16:58:26 +00002372 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002373 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002374 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002375 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002376 return new_log_desc
2377 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002378 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379
tandriie113dfd2016-10-11 10:20:12 -07002380 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002381 try:
2382 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002383 except GerritChangeNotExists:
2384 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002385
2386 if data['status'] in ('ABANDONED', 'MERGED'):
2387 return 'CL %s is closed' % self.GetIssue()
2388
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002389 def GetGerritChange(self, patchset=None):
2390 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002391 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002392 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002393 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002394 data = self._GetChangeDetail(['ALL_REVISIONS'])
2395
2396 assert host and issue and patchset, 'CL must be uploaded first'
2397
2398 has_patchset = any(
2399 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002400 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002401 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002402 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002403 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002404
tandrii8c5a3532016-11-04 07:52:02 -07002405 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002406 'host': host,
2407 'change': issue,
2408 'project': data['project'],
2409 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002410 }
tandriie113dfd2016-10-11 10:20:12 -07002411
tandriide281ae2016-10-12 06:02:30 -07002412 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002413 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002414
Edward Lemur707d70b2018-02-07 00:50:14 +01002415 def GetReviewers(self):
2416 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002417 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002418
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002419
tandriif9aefb72016-07-01 09:06:51 -07002420def _get_bug_line_values(default_project, bugs):
2421 """Given default_project and comma separated list of bugs, yields bug line
2422 values.
2423
2424 Each bug can be either:
2425 * a number, which is combined with default_project
2426 * string, which is left as is.
2427
2428 This function may produce more than one line, because bugdroid expects one
2429 project per line.
2430
2431 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2432 ['v8:123', 'chromium:789']
2433 """
2434 default_bugs = []
2435 others = []
2436 for bug in bugs.split(','):
2437 bug = bug.strip()
2438 if bug:
2439 try:
2440 default_bugs.append(int(bug))
2441 except ValueError:
2442 others.append(bug)
2443
2444 if default_bugs:
2445 default_bugs = ','.join(map(str, default_bugs))
2446 if default_project:
2447 yield '%s:%s' % (default_project, default_bugs)
2448 else:
2449 yield default_bugs
2450 for other in sorted(others):
2451 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2452 yield other
2453
2454
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002455class ChangeDescription(object):
2456 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002457 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002458 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002459 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002460 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002461 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002462 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2463 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002464 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002465 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002466
Dan Beamd8b04ca2019-10-10 21:23:26 +00002467 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002468 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002469 if bug:
2470 regexp = re.compile(self.BUG_LINE)
2471 prefix = settings.GetBugPrefix()
2472 if not any((regexp.match(line) for line in self._description_lines)):
2473 values = list(_get_bug_line_values(prefix, bug))
2474 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002475 if fixed:
2476 regexp = re.compile(self.FIXED_LINE)
2477 prefix = settings.GetBugPrefix()
2478 if not any((regexp.match(line) for line in self._description_lines)):
2479 values = list(_get_bug_line_values(prefix, fixed))
2480 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002481
agable@chromium.org42c20792013-09-12 17:34:49 +00002482 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002483 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002484 return '\n'.join(self._description_lines)
2485
2486 def set_description(self, desc):
2487 if isinstance(desc, basestring):
2488 lines = desc.splitlines()
2489 else:
2490 lines = [line.rstrip() for line in desc]
2491 while lines and not lines[0]:
2492 lines.pop(0)
2493 while lines and not lines[-1]:
2494 lines.pop(-1)
2495 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002496
Edward Lemur5a644f82020-03-18 16:44:57 +00002497 def ensure_change_id(self, change_id):
2498 description = self.description
2499 footer_change_ids = git_footers.get_footer_change_id(description)
2500 # Make sure that the Change-Id in the description matches the given one.
2501 if footer_change_ids != [change_id]:
2502 if footer_change_ids:
2503 # Remove any existing Change-Id footers since they don't match the
2504 # expected change_id footer.
2505 description = git_footers.remove_footer(description, 'Change-Id')
2506 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2507 'if you want to set a new one.')
2508 # Add the expected Change-Id footer.
2509 description = git_footers.add_footer_change_id(description, change_id)
2510 self.set_description(description)
2511
Edward Lemur2c62b332020-03-12 22:12:33 +00002512 def update_reviewers(
2513 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002514 """Rewrites the R=/TBR= line(s) as a single line each.
2515
2516 Args:
2517 reviewers (list(str)) - list of additional emails to use for reviewers.
2518 tbrs (list(str)) - list of additional emails to use for TBRs.
2519 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2520 the change that are missing OWNER coverage. If this is not None, you
2521 must also pass a value for `change`.
2522 change (Change) - The Change that should be used for OWNERS lookups.
2523 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002524 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002525 assert isinstance(tbrs, list), tbrs
2526
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002527 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002528 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002529
2530 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002531 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002532
2533 reviewers = set(reviewers)
2534 tbrs = set(tbrs)
2535 LOOKUP = {
2536 'TBR': tbrs,
2537 'R': reviewers,
2538 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002539
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002540 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002541 regexp = re.compile(self.R_LINE)
2542 matches = [regexp.match(line) for line in self._description_lines]
2543 new_desc = [l for i, l in enumerate(self._description_lines)
2544 if not matches[i]]
2545 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002546
agable@chromium.org42c20792013-09-12 17:34:49 +00002547 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002548
2549 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002550 for match in matches:
2551 if not match:
2552 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002553 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2554
2555 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002556 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002557 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002558 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002559 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002560 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002561 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002562 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002563
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002564 # If any folks ended up in both groups, remove them from tbrs.
2565 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002566
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002567 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2568 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002569
2570 # Put the new lines in the description where the old first R= line was.
2571 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2572 if 0 <= line_loc < len(self._description_lines):
2573 if new_tbr_line:
2574 self._description_lines.insert(line_loc, new_tbr_line)
2575 if new_r_line:
2576 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002577 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002578 if new_r_line:
2579 self.append_footer(new_r_line)
2580 if new_tbr_line:
2581 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002582
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002583 def set_preserve_tryjobs(self):
2584 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2585 footers = git_footers.parse_footers(self.description)
2586 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2587 if v.lower() == 'true':
2588 return
2589 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2590
Anthony Polito8b955342019-09-24 19:01:36 +00002591 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002592 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002593 self.set_description([
2594 '# Enter a description of the change.',
2595 '# This will be displayed on the codereview site.',
2596 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002597 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002598 '--------------------',
2599 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002600 bug_regexp = re.compile(self.BUG_LINE)
2601 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002602 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002603 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2604 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002605 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002606
agable@chromium.org42c20792013-09-12 17:34:49 +00002607 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002608 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002609 if not content:
2610 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002611 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002612
Bruce Dawson2377b012018-01-11 16:46:49 -08002613 # Strip off comments and default inserted "Bug:" line.
2614 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002615 (line.startswith('#') or
2616 line.rstrip() == "Bug:" or
2617 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002618 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002619 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002620 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002621
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002622 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002623 """Adds a footer line to the description.
2624
2625 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2626 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2627 that Gerrit footers are always at the end.
2628 """
2629 parsed_footer_line = git_footers.parse_footer(line)
2630 if parsed_footer_line:
2631 # Line is a gerrit footer in the form: Footer-Key: any value.
2632 # Thus, must be appended observing Gerrit footer rules.
2633 self.set_description(
2634 git_footers.add_footer(self.description,
2635 key=parsed_footer_line[0],
2636 value=parsed_footer_line[1]))
2637 return
2638
2639 if not self._description_lines:
2640 self._description_lines.append(line)
2641 return
2642
2643 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2644 if gerrit_footers:
2645 # git_footers.split_footers ensures that there is an empty line before
2646 # actual (gerrit) footers, if any. We have to keep it that way.
2647 assert top_lines and top_lines[-1] == ''
2648 top_lines, separator = top_lines[:-1], top_lines[-1:]
2649 else:
2650 separator = [] # No need for separator if there are no gerrit_footers.
2651
2652 prev_line = top_lines[-1] if top_lines else ''
2653 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2654 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2655 top_lines.append('')
2656 top_lines.append(line)
2657 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002658
tandrii99a72f22016-08-17 14:33:24 -07002659 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002660 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002661 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002662 reviewers = [match.group(2).strip()
2663 for match in matches
2664 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002665 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002666
bradnelsond975b302016-10-23 12:20:23 -07002667 def get_cced(self):
2668 """Retrieves the list of reviewers."""
2669 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2670 cced = [match.group(2).strip() for match in matches if match]
2671 return cleanup_list(cced)
2672
Nodir Turakulov23b82142017-11-16 11:04:25 -08002673 def get_hash_tags(self):
2674 """Extracts and sanitizes a list of Gerrit hashtags."""
2675 subject = (self._description_lines or ('',))[0]
2676 subject = re.sub(
2677 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2678
2679 tags = []
2680 start = 0
2681 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2682 while True:
2683 m = bracket_exp.match(subject, start)
2684 if not m:
2685 break
2686 tags.append(self.sanitize_hash_tag(m.group(1)))
2687 start = m.end()
2688
2689 if not tags:
2690 # Try "Tag: " prefix.
2691 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2692 if m:
2693 tags.append(self.sanitize_hash_tag(m.group(1)))
2694 return tags
2695
2696 @classmethod
2697 def sanitize_hash_tag(cls, tag):
2698 """Returns a sanitized Gerrit hash tag.
2699
2700 A sanitized hashtag can be used as a git push refspec parameter value.
2701 """
2702 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2703
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002704
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002705def FindCodereviewSettingsFile(filename='codereview.settings'):
2706 """Finds the given file starting in the cwd and going up.
2707
2708 Only looks up to the top of the repository unless an
2709 'inherit-review-settings-ok' file exists in the root of the repository.
2710 """
2711 inherit_ok_file = 'inherit-review-settings-ok'
2712 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002713 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002714 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2715 root = '/'
2716 while True:
2717 if filename in os.listdir(cwd):
2718 if os.path.isfile(os.path.join(cwd, filename)):
2719 return open(os.path.join(cwd, filename))
2720 if cwd == root:
2721 break
2722 cwd = os.path.dirname(cwd)
2723
2724
2725def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002726 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002727 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002728
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002729 def SetProperty(name, setting, unset_error_ok=False):
2730 fullname = 'rietveld.' + name
2731 if setting in keyvals:
2732 RunGit(['config', fullname, keyvals[setting]])
2733 else:
2734 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2735
tandrii48df5812016-10-17 03:55:37 -07002736 if not keyvals.get('GERRIT_HOST', False):
2737 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002738 # Only server setting is required. Other settings can be absent.
2739 # In that case, we ignore errors raised during option deletion attempt.
2740 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2741 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2742 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002743 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002744 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2745 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002746 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2747 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002748 SetProperty(
2749 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002750
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002751 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002752 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002753
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002754 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002755 RunGit(['config', 'gerrit.squash-uploads',
2756 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002757
tandrii@chromium.org28253532016-04-14 13:46:56 +00002758 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002759 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002760 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2761
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002762 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002763 # should be of the form
2764 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2765 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002766 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2767 keyvals['ORIGIN_URL_CONFIG']])
2768
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002769
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002770def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002771 """Downloads a network object to a local file, like urllib.urlretrieve.
2772
2773 This is necessary because urllib is broken for SSL connections via a proxy.
2774 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002775 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002776 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002777
2778
ukai@chromium.org712d6102013-11-27 00:52:58 +00002779def hasSheBang(fname):
2780 """Checks fname is a #! script."""
2781 with open(fname) as f:
2782 return f.read(2).startswith('#!')
2783
2784
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002785def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002786 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002787
2788 Args:
2789 force: True to update hooks. False to install hooks if not present.
2790 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002791 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002792 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2793 if not os.access(dst, os.X_OK):
2794 if os.path.exists(dst):
2795 if not force:
2796 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002797 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002798 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002799 if not hasSheBang(dst):
2800 DieWithError('Not a script: %s\n'
2801 'You need to download from\n%s\n'
2802 'into .git/hooks/commit-msg and '
2803 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002804 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2805 except Exception:
2806 if os.path.exists(dst):
2807 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002808 DieWithError('\nFailed to download hooks.\n'
2809 'You need to download from\n%s\n'
2810 'into .git/hooks/commit-msg and '
2811 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002812
2813
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002814class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002815 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002816
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002817 _GOOGLESOURCE = 'googlesource.com'
2818
2819 def __init__(self):
2820 # Cached list of [host, identity, source], where source is either
2821 # .gitcookies or .netrc.
2822 self._all_hosts = None
2823
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002824 def ensure_configured_gitcookies(self):
2825 """Runs checks and suggests fixes to make git use .gitcookies from default
2826 path."""
2827 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2828 configured_path = RunGitSilent(
2829 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002830 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002831 if configured_path:
2832 self._ensure_default_gitcookies_path(configured_path, default)
2833 else:
2834 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002835
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002836 @staticmethod
2837 def _ensure_default_gitcookies_path(configured_path, default_path):
2838 assert configured_path
2839 if configured_path == default_path:
2840 print('git is already configured to use your .gitcookies from %s' %
2841 configured_path)
2842 return
2843
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002844 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002845 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2846 (configured_path, default_path))
2847
2848 if not os.path.exists(configured_path):
2849 print('However, your configured .gitcookies file is missing.')
2850 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2851 action='reconfigure')
2852 RunGit(['config', '--global', 'http.cookiefile', default_path])
2853 return
2854
2855 if os.path.exists(default_path):
2856 print('WARNING: default .gitcookies file already exists %s' %
2857 default_path)
2858 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2859 default_path)
2860
2861 confirm_or_exit('Move existing .gitcookies to default location?',
2862 action='move')
2863 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002864 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002865 print('Moved and reconfigured git to use .gitcookies from %s' %
2866 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002867
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002868 @staticmethod
2869 def _configure_gitcookies_path(default_path):
2870 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2871 if os.path.exists(netrc_path):
2872 print('You seem to be using outdated .netrc for git credentials: %s' %
2873 netrc_path)
2874 print('This tool will guide you through setting up recommended '
2875 '.gitcookies store for git credentials.\n'
2876 '\n'
2877 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2878 ' git config --global --unset http.cookiefile\n'
2879 ' mv %s %s.backup\n\n' % (default_path, default_path))
2880 confirm_or_exit(action='setup .gitcookies')
2881 RunGit(['config', '--global', 'http.cookiefile', default_path])
2882 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002883
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002884 def get_hosts_with_creds(self, include_netrc=False):
2885 if self._all_hosts is None:
2886 a = gerrit_util.CookiesAuthenticator()
2887 self._all_hosts = [
2888 (h, u, s)
2889 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002890 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2891 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002892 )
2893 if h.endswith(self._GOOGLESOURCE)
2894 ]
2895
2896 if include_netrc:
2897 return self._all_hosts
2898 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2899
2900 def print_current_creds(self, include_netrc=False):
2901 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2902 if not hosts:
2903 print('No Git/Gerrit credentials found')
2904 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002905 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002906 header = [('Host', 'User', 'Which file'),
2907 ['=' * l for l in lengths]]
2908 for row in (header + hosts):
2909 print('\t'.join((('%%+%ds' % l) % s)
2910 for l, s in zip(lengths, row)))
2911
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002912 @staticmethod
2913 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002914 """Parses identity "git-<username>.domain" into <username> and domain."""
2915 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002916 # distinguishable from sub-domains. But we do know typical domains:
2917 if identity.endswith('.chromium.org'):
2918 domain = 'chromium.org'
2919 username = identity[:-len('.chromium.org')]
2920 else:
2921 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002922 if username.startswith('git-'):
2923 username = username[len('git-'):]
2924 return username, domain
2925
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002926 def _canonical_git_googlesource_host(self, host):
2927 """Normalizes Gerrit hosts (with '-review') to Git host."""
2928 assert host.endswith(self._GOOGLESOURCE)
2929 # Prefix doesn't include '.' at the end.
2930 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2931 if prefix.endswith('-review'):
2932 prefix = prefix[:-len('-review')]
2933 return prefix + '.' + self._GOOGLESOURCE
2934
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002935 def _canonical_gerrit_googlesource_host(self, host):
2936 git_host = self._canonical_git_googlesource_host(host)
2937 prefix = git_host.split('.', 1)[0]
2938 return prefix + '-review.' + self._GOOGLESOURCE
2939
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002940 def _get_counterpart_host(self, host):
2941 assert host.endswith(self._GOOGLESOURCE)
2942 git = self._canonical_git_googlesource_host(host)
2943 gerrit = self._canonical_gerrit_googlesource_host(git)
2944 return git if gerrit == host else gerrit
2945
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002946 def has_generic_host(self):
2947 """Returns whether generic .googlesource.com has been configured.
2948
2949 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
2950 """
2951 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
2952 if host == '.' + self._GOOGLESOURCE:
2953 return True
2954 return False
2955
2956 def _get_git_gerrit_identity_pairs(self):
2957 """Returns map from canonic host to pair of identities (Git, Gerrit).
2958
2959 One of identities might be None, meaning not configured.
2960 """
2961 host_to_identity_pairs = {}
2962 for host, identity, _ in self.get_hosts_with_creds():
2963 canonical = self._canonical_git_googlesource_host(host)
2964 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
2965 idx = 0 if canonical == host else 1
2966 pair[idx] = identity
2967 return host_to_identity_pairs
2968
2969 def get_partially_configured_hosts(self):
2970 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002971 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002972 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002973 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002974
2975 def get_conflicting_hosts(self):
2976 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02002977 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002978 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002979 if None not in (i1, i2) and i1 != i2)
2980
2981 def get_duplicated_hosts(self):
2982 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002983 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002984
2985 _EXPECTED_HOST_IDENTITY_DOMAINS = {
2986 'chromium.googlesource.com': 'chromium.org',
2987 'chrome-internal.googlesource.com': 'google.com',
2988 }
2989
2990 def get_hosts_with_wrong_identities(self):
2991 """Finds hosts which **likely** reference wrong identities.
2992
2993 Note: skips hosts which have conflicting identities for Git and Gerrit.
2994 """
2995 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002996 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002997 pair = self._get_git_gerrit_identity_pairs().get(host)
2998 if pair and pair[0] == pair[1]:
2999 _, domain = self._parse_identity(pair[0])
3000 if domain != expected:
3001 hosts.add(host)
3002 return hosts
3003
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003004 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003005 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003006 hosts = sorted(hosts)
3007 assert hosts
3008 if extra_column_func is None:
3009 extras = [''] * len(hosts)
3010 else:
3011 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003012 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3013 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003014 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003015 lines.append(tmpl % he)
3016 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003017
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003018 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003019 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003020 yield ('.googlesource.com wildcard record detected',
3021 ['Chrome Infrastructure team recommends to list full host names '
3022 'explicitly.'],
3023 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003024
3025 dups = self.get_duplicated_hosts()
3026 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003027 yield ('The following hosts were defined twice',
3028 self._format_hosts(dups),
3029 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003030
3031 partial = self.get_partially_configured_hosts()
3032 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003033 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3034 'These hosts are missing',
3035 self._format_hosts(partial, lambda host: 'but %s defined' %
3036 self._get_counterpart_host(host)),
3037 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003038
3039 conflicting = self.get_conflicting_hosts()
3040 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003041 yield ('The following Git hosts have differing credentials from their '
3042 'Gerrit counterparts',
3043 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3044 tuple(self._get_git_gerrit_identity_pairs()[host])),
3045 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003046
3047 wrong = self.get_hosts_with_wrong_identities()
3048 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003049 yield ('These hosts likely use wrong identity',
3050 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3051 (self._get_git_gerrit_identity_pairs()[host][0],
3052 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3053 wrong)
3054
3055 def find_and_report_problems(self):
3056 """Returns True if there was at least one problem, else False."""
3057 found = False
3058 bad_hosts = set()
3059 for title, sublines, hosts in self._find_problems():
3060 if not found:
3061 found = True
3062 print('\n\n.gitcookies problem report:\n')
3063 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003064 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003065 if sublines:
3066 print()
3067 print(' %s' % '\n '.join(sublines))
3068 print()
3069
3070 if bad_hosts:
3071 assert found
3072 print(' You can manually remove corresponding lines in your %s file and '
3073 'visit the following URLs with correct account to generate '
3074 'correct credential lines:\n' %
3075 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3076 print(' %s' % '\n '.join(sorted(set(
3077 gerrit_util.CookiesAuthenticator().get_new_password_url(
3078 self._canonical_git_googlesource_host(host))
3079 for host in bad_hosts
3080 ))))
3081 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003082
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003083
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003084@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003085def CMDcreds_check(parser, args):
3086 """Checks credentials and suggests changes."""
3087 _, _ = parser.parse_args(args)
3088
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003089 # Code below checks .gitcookies. Abort if using something else.
3090 authn = gerrit_util.Authenticator.get()
3091 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003092 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003093 'This command is not designed for bot environment. It checks '
3094 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003095 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3096 if isinstance(authn, gerrit_util.GceAuthenticator):
3097 message += (
3098 '\n'
3099 'If you need to run this on GCE or a cloudtop instance, '
3100 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3101 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003102
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003103 checker = _GitCookiesChecker()
3104 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003105
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003106 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003107 checker.print_current_creds(include_netrc=True)
3108
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003109 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003110 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003111 return 0
3112 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003113
3114
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003115@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003116def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003117 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003118 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003119 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003120 _, args = parser.parse_args(args)
3121 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003122 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003123 return RunGit(['config', 'branch.%s.base-url' % branch],
3124 error_ok=False).strip()
3125 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003126 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003127 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3128 error_ok=False).strip()
3129
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003130
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003131def color_for_status(status):
3132 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003133 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003134 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003135 'unsent': BOLD + Fore.YELLOW,
3136 'waiting': BOLD + Fore.RED,
3137 'reply': BOLD + Fore.YELLOW,
3138 'not lgtm': BOLD + Fore.RED,
3139 'lgtm': BOLD + Fore.GREEN,
3140 'commit': BOLD + Fore.MAGENTA,
3141 'closed': BOLD + Fore.CYAN,
3142 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003143 }.get(status, Fore.WHITE)
3144
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003145
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003146def get_cl_statuses(changes, fine_grained, max_processes=None):
3147 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003148
3149 If fine_grained is true, this will fetch CL statuses from the server.
3150 Otherwise, simply indicate if there's a matching url for the given branches.
3151
3152 If max_processes is specified, it is used as the maximum number of processes
3153 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3154 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003155
3156 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003157 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003158 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003159 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003160
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003161 if not fine_grained:
3162 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003163 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003164 for cl in changes:
3165 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003166 return
3167
3168 # First, sort out authentication issues.
3169 logging.debug('ensuring credentials exist')
3170 for cl in changes:
3171 cl.EnsureAuthenticated(force=False, refresh=True)
3172
3173 def fetch(cl):
3174 try:
3175 return (cl, cl.GetStatus())
3176 except:
3177 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003178 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003179 raise
3180
3181 threads_count = len(changes)
3182 if max_processes:
3183 threads_count = max(1, min(threads_count, max_processes))
3184 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3185
Edward Lemur61bf4172020-02-24 23:22:37 +00003186 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003187 fetched_cls = set()
3188 try:
3189 it = pool.imap_unordered(fetch, changes).__iter__()
3190 while True:
3191 try:
3192 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003193 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003194 break
3195 fetched_cls.add(cl)
3196 yield cl, status
3197 finally:
3198 pool.close()
3199
3200 # Add any branches that failed to fetch.
3201 for cl in set(changes) - fetched_cls:
3202 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003203
rmistry@google.com2dd99862015-06-22 12:22:18 +00003204
3205def upload_branch_deps(cl, args):
3206 """Uploads CLs of local branches that are dependents of the current branch.
3207
3208 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003209
3210 test1 -> test2.1 -> test3.1
3211 -> test3.2
3212 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003213
3214 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3215 run on the dependent branches in this order:
3216 test2.1, test3.1, test3.2, test2.2, test3.3
3217
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003218 Note: This function does not rebase your local dependent branches. Use it
3219 when you make a change to the parent branch that will not conflict
3220 with its dependent branches, and you would like their dependencies
3221 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003222 """
3223 if git_common.is_dirty_git_tree('upload-branch-deps'):
3224 return 1
3225
3226 root_branch = cl.GetBranch()
3227 if root_branch is None:
3228 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3229 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003230 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003231 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3232 'patchset dependencies without an uploaded CL.')
3233
3234 branches = RunGit(['for-each-ref',
3235 '--format=%(refname:short) %(upstream:short)',
3236 'refs/heads'])
3237 if not branches:
3238 print('No local branches found.')
3239 return 0
3240
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003241 # Create a dictionary of all local branches to the branches that are
3242 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003243 tracked_to_dependents = collections.defaultdict(list)
3244 for b in branches.splitlines():
3245 tokens = b.split()
3246 if len(tokens) == 2:
3247 branch_name, tracked = tokens
3248 tracked_to_dependents[tracked].append(branch_name)
3249
vapiera7fbd5a2016-06-16 09:17:49 -07003250 print()
3251 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003252 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003253
rmistry@google.com2dd99862015-06-22 12:22:18 +00003254 def traverse_dependents_preorder(branch, padding=''):
3255 dependents_to_process = tracked_to_dependents.get(branch, [])
3256 padding += ' '
3257 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003258 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003259 dependents.append(dependent)
3260 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003261
rmistry@google.com2dd99862015-06-22 12:22:18 +00003262 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003263 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003264
3265 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003266 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003267 return 0
3268
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003269 confirm_or_exit('This command will checkout all dependent branches and run '
3270 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003271
rmistry@google.com2dd99862015-06-22 12:22:18 +00003272 # Record all dependents that failed to upload.
3273 failures = {}
3274 # Go through all dependents, checkout the branch and upload.
3275 try:
3276 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003277 print()
3278 print('--------------------------------------')
3279 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003280 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003281 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003282 try:
3283 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003284 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003285 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003286 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003287 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003288 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003289 finally:
3290 # Swap back to the original root branch.
3291 RunGit(['checkout', '-q', root_branch])
3292
vapiera7fbd5a2016-06-16 09:17:49 -07003293 print()
3294 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003295 for dependent_branch in dependents:
3296 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003297 print(' %s : %s' % (dependent_branch, upload_status))
3298 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003299
3300 return 0
3301
3302
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003303def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003304 """Given a proposed tag name, returns a tag name that is guaranteed to be
3305 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3306 or 'foo-3', and so on."""
3307
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003308 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003309 for suffix_num in itertools.count(1):
3310 if suffix_num == 1:
3311 to_check = proposed_tag
3312 else:
3313 to_check = '%s-%d' % (proposed_tag, suffix_num)
3314
3315 if to_check not in existing_tags:
3316 return to_check
3317
3318
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003319@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003320def CMDarchive(parser, args):
3321 """Archives and deletes branches associated with closed changelists."""
3322 parser.add_option(
3323 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003324 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003325 parser.add_option(
3326 '-f', '--force', action='store_true',
3327 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003328 parser.add_option(
3329 '-d', '--dry-run', action='store_true',
3330 help='Skip the branch tagging and removal steps.')
3331 parser.add_option(
3332 '-t', '--notags', action='store_true',
3333 help='Do not tag archived branches. '
3334 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003335 parser.add_option(
3336 '-p',
3337 '--pattern',
3338 default='git-cl-archived-{issue}-{branch}',
3339 help='Format string for archive tags. '
3340 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003341
kmarshall3bff56b2016-06-06 18:31:47 -07003342 options, args = parser.parse_args(args)
3343 if args:
3344 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003345
3346 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3347 if not branches:
3348 return 0
3349
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003350 tags = RunGit(['for-each-ref', '--format=%(refname)',
3351 'refs/tags']).splitlines() or []
3352 tags = [t.split('/')[-1] for t in tags]
3353
vapiera7fbd5a2016-06-16 09:17:49 -07003354 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003355 changes = [Changelist(branchref=b)
3356 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003357 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3358 statuses = get_cl_statuses(changes,
3359 fine_grained=True,
3360 max_processes=options.maxjobs)
3361 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003362 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3363 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003364 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003365 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003366 proposal.sort()
3367
3368 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003369 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003370 return 0
3371
Edward Lemur85153282020-02-14 22:06:29 +00003372 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003373
vapiera7fbd5a2016-06-16 09:17:49 -07003374 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003375 if options.notags:
3376 for next_item in proposal:
3377 print(' ' + next_item[0])
3378 else:
3379 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3380 for next_item in proposal:
3381 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003382
kmarshall9249e012016-08-23 12:02:16 -07003383 # Quit now on precondition failure or if instructed by the user, either
3384 # via an interactive prompt or by command line flags.
3385 if options.dry_run:
3386 print('\nNo changes were made (dry run).\n')
3387 return 0
3388 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003389 print('You are currently on a branch \'%s\' which is associated with a '
3390 'closed codereview issue, so archive cannot proceed. Please '
3391 'checkout another branch and run this command again.' %
3392 current_branch)
3393 return 1
kmarshall9249e012016-08-23 12:02:16 -07003394 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003395 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003396 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003397 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003398 return 1
3399
3400 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003401 if not options.notags:
3402 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003403
3404 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3405 # Clean up the tag if we failed to delete the branch.
3406 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003407
vapiera7fbd5a2016-06-16 09:17:49 -07003408 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003409
3410 return 0
3411
3412
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003413@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003414def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003415 """Show status of changelists.
3416
3417 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003418 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003419 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003420 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003421 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003422 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003423 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003424 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003425
3426 Also see 'git cl comments'.
3427 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003428 parser.add_option(
3429 '--no-branch-color',
3430 action='store_true',
3431 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003432 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003433 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003434 parser.add_option('-f', '--fast', action='store_true',
3435 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003436 parser.add_option(
3437 '-j', '--maxjobs', action='store', type=int,
3438 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003439 parser.add_option(
3440 '-i', '--issue', type=int,
3441 help='Operate on this issue instead of the current branch\'s implicit '
3442 'issue. Requires --field to be set.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003443 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003444 if args:
3445 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003446
iannuccie53c9352016-08-17 14:40:40 -07003447 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003448 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003449
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003450 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003451 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003453 if cl.GetIssue():
3454 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003455 elif options.field == 'id':
3456 issueid = cl.GetIssue()
3457 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003458 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003459 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003460 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003461 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003462 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003463 elif options.field == 'status':
3464 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003465 elif options.field == 'url':
3466 url = cl.GetIssueURL()
3467 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003468 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003469 return 0
3470
3471 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3472 if not branches:
3473 print('No local branch found.')
3474 return 0
3475
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003476 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003477 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003478 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003479 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003480 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003481 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003482 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003483
Edward Lemur85153282020-02-14 22:06:29 +00003484 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003485
3486 def FormatBranchName(branch, colorize=False):
3487 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3488 an asterisk when it is the current branch."""
3489
3490 asterisk = ""
3491 color = Fore.RESET
3492 if branch == current_branch:
3493 asterisk = "* "
3494 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003495 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003496
3497 if colorize:
3498 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003499 return asterisk + branch_name
3500
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003501 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003502
3503 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003504 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3505 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003506 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003507 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003508 branch_statuses[c.GetBranch()] = status
3509 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003510 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003511 if url and (not status or status == 'error'):
3512 # The issue probably doesn't exist anymore.
3513 url += ' (broken)'
3514
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003515 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003516 # Turn off bold as well as colors.
3517 END = '\033[0m'
3518 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003519 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003520 color = ''
3521 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003522 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003523
Alan Cuttera3be9a52019-03-04 18:50:33 +00003524 branch_display = FormatBranchName(branch)
3525 padding = ' ' * (alignment - len(branch_display))
3526 if not options.no_branch_color:
3527 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003528
Alan Cuttera3be9a52019-03-04 18:50:33 +00003529 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3530 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003531
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003533 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003534 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003535 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003536 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003537 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003539 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003540 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003541 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003542 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003543 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003544 return 0
3545
3546
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003547def colorize_CMDstatus_doc():
3548 """To be called once in main() to add colors to git cl status help."""
3549 colors = [i for i in dir(Fore) if i[0].isupper()]
3550
3551 def colorize_line(line):
3552 for color in colors:
3553 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003554 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003555 indent = len(line) - len(line.lstrip(' ')) + 1
3556 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3557 return line
3558
3559 lines = CMDstatus.__doc__.splitlines()
3560 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3561
3562
phajdan.jre328cf92016-08-22 04:12:17 -07003563def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003564 if path == '-':
3565 json.dump(contents, sys.stdout)
3566 else:
3567 with open(path, 'w') as f:
3568 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003569
3570
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003571@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003572@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003573def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003574 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003575
3576 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003577 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003578 parser.add_option('-r', '--reverse', action='store_true',
3579 help='Lookup the branch(es) for the specified issues. If '
3580 'no issues are specified, all branches with mapped '
3581 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003582 parser.add_option('--json',
3583 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003584 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003585
dnj@chromium.org406c4402015-03-03 17:22:28 +00003586 if options.reverse:
3587 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003588 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003589 # Reverse issue lookup.
3590 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003591
3592 git_config = {}
3593 for config in RunGit(['config', '--get-regexp',
3594 r'branch\..*issue']).splitlines():
3595 name, _space, val = config.partition(' ')
3596 git_config[name] = val
3597
dnj@chromium.org406c4402015-03-03 17:22:28 +00003598 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003599 issue = git_config.get(
3600 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003601 if issue:
3602 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003603 if not args:
3604 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003605 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003606 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003607 try:
3608 issue_num = int(issue)
3609 except ValueError:
3610 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003611 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003612 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003613 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003614 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003615 if options.json:
3616 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003617 return 0
3618
3619 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003620 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003621 if not issue.valid:
3622 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3623 'or no argument to list it.\n'
3624 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003625 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003626 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003627 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003628 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003629 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3630 if options.json:
3631 write_json(options.json, {
3632 'issue': cl.GetIssue(),
3633 'issue_url': cl.GetIssueURL(),
3634 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003635 return 0
3636
3637
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003638@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003639def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003640 """Shows or posts review comments for any changelist."""
3641 parser.add_option('-a', '--add-comment', dest='comment',
3642 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003643 parser.add_option('-p', '--publish', action='store_true',
3644 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003645 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003646 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003647 parser.add_option('-m', '--machine-readable', dest='readable',
3648 action='store_false', default=True,
3649 help='output comments in a format compatible with '
3650 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003651 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003652 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003653 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003654
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003655 issue = None
3656 if options.issue:
3657 try:
3658 issue = int(options.issue)
3659 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003660 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003661
Edward Lemur934836a2019-09-09 20:16:54 +00003662 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003663
3664 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003665 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003666 return 0
3667
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003668 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3669 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003670 for comment in summary:
3671 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003672 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003673 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003674 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003675 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003676 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003677 elif comment.autogenerated:
3678 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003679 else:
3680 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003681 print('\n%s%s %s%s\n%s' % (
3682 color,
3683 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3684 comment.sender,
3685 Fore.RESET,
3686 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3687
smut@google.comc85ac942015-09-15 16:34:43 +00003688 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003689 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003690 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003691 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3692 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003693 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003694 return 0
3695
3696
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003697@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003698@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003699def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003700 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003701 parser.add_option('-d', '--display', action='store_true',
3702 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003703 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003704 help='New description to set for this issue (- for stdin, '
3705 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003706 parser.add_option('-f', '--force', action='store_true',
3707 help='Delete any unpublished Gerrit edits for this issue '
3708 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003709
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003710 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003711
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003712 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003713 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003714 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003715 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003716 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003717
Edward Lemur934836a2019-09-09 20:16:54 +00003718 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003719 if target_issue_arg:
3720 kwargs['issue'] = target_issue_arg.issue
3721 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003722
3723 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003724 if not cl.GetIssue():
3725 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003726
Edward Lemur678a6842019-10-03 22:25:05 +00003727 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003728 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003729
Edward Lemur6c6827c2020-02-06 21:15:18 +00003730 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003731
smut@google.com34fb6b12015-07-13 20:03:26 +00003732 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003734 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003735
3736 if options.new_description:
3737 text = options.new_description
3738 if text == '-':
3739 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003740 elif text == '+':
3741 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003742 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003743
3744 description.set_description(text)
3745 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003746 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003747 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003748 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003749 return 0
3750
3751
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003752@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003753def CMDlint(parser, args):
3754 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003755 parser.add_option('--filter', action='append', metavar='-x,+y',
3756 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003757 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003758
3759 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003760 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003761 try:
3762 import cpplint
3763 import cpplint_chromium
3764 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003765 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003766 return 1
3767
3768 # Change the current working directory before calling lint so that it
3769 # shows the correct base.
3770 previous_cwd = os.getcwd()
3771 os.chdir(settings.GetRoot())
3772 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003773 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003774 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003775 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003776 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003777 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003778
3779 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003780 command = args + files
3781 if options.filter:
3782 command = ['--filter=' + ','.join(options.filter)] + command
3783 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003784
3785 white_regex = re.compile(settings.GetLintRegex())
3786 black_regex = re.compile(settings.GetLintIgnoreRegex())
3787 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3788 for filename in filenames:
3789 if white_regex.match(filename):
3790 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003791 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003792 else:
3793 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3794 extra_check_functions)
3795 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003796 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003797 finally:
3798 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003799 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003800 if cpplint._cpplint_state.error_count != 0:
3801 return 1
3802 return 0
3803
3804
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003805@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003806def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003807 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003808 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003809 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003810 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003811 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003812 parser.add_option('--all', action='store_true',
3813 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003814 parser.add_option('--parallel', action='store_true',
3815 help='Run all tests specified by input_api.RunTests in all '
3816 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003817 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818
sbc@chromium.org71437c02015-04-09 19:29:40 +00003819 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003820 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003821 return 1
3822
Edward Lemur934836a2019-09-09 20:16:54 +00003823 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003824 if args:
3825 base_branch = args[0]
3826 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003827 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003828 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003829
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003830 if cl.GetIssue():
3831 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003832 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003833 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003834
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003835 cl.RunHook(
3836 committing=not options.upload,
3837 may_prompt=False,
3838 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003839 parallel=options.parallel,
3840 upstream=base_branch,
3841 description=description,
3842 all_files=options.all)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003843 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844
3845
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003846def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003847 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003848
3849 Works the same way as
3850 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3851 but can be called on demand on all platforms.
3852
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003853 The basic idea is to generate git hash of a state of the tree, original
3854 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003855 """
3856 lines = []
3857 tree_hash = RunGitSilent(['write-tree'])
3858 lines.append('tree %s' % tree_hash.strip())
3859 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3860 if code == 0:
3861 lines.append('parent %s' % parent.strip())
3862 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3863 lines.append('author %s' % author.strip())
3864 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3865 lines.append('committer %s' % committer.strip())
3866 lines.append('')
3867 # Note: Gerrit's commit-hook actually cleans message of some lines and
3868 # whitespace. This code is not doing this, but it clearly won't decrease
3869 # entropy.
3870 lines.append(message)
3871 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003872 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003873 return 'I%s' % change_hash.strip()
3874
3875
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003876def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003877 """Computes the remote branch ref to use for the CL.
3878
3879 Args:
3880 remote (str): The git remote for the CL.
3881 remote_branch (str): The git remote branch for the CL.
3882 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003883 """
3884 if not (remote and remote_branch):
3885 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003886
wittman@chromium.org455dc922015-01-26 20:15:50 +00003887 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003888 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003889 # refs, which are then translated into the remote full symbolic refs
3890 # below.
3891 if '/' not in target_branch:
3892 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3893 else:
3894 prefix_replacements = (
3895 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3896 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3897 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3898 )
3899 match = None
3900 for regex, replacement in prefix_replacements:
3901 match = re.search(regex, target_branch)
3902 if match:
3903 remote_branch = target_branch.replace(match.group(0), replacement)
3904 break
3905 if not match:
3906 # This is a branch path but not one we recognize; use as-is.
3907 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003908 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3909 # Handle the refs that need to land in different refs.
3910 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003911
wittman@chromium.org455dc922015-01-26 20:15:50 +00003912 # Create the true path to the remote branch.
3913 # Does the following translation:
3914 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3915 # * refs/remotes/origin/master -> refs/heads/master
3916 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3917 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3918 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3919 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3920 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3921 'refs/heads/')
3922 elif remote_branch.startswith('refs/remotes/branch-heads'):
3923 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01003924
wittman@chromium.org455dc922015-01-26 20:15:50 +00003925 return remote_branch
3926
3927
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003928def cleanup_list(l):
3929 """Fixes a list so that comma separated items are put as individual items.
3930
3931 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3932 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3933 """
3934 items = sum((i.split(',') for i in l), [])
3935 stripped_items = (i.strip() for i in items)
3936 return sorted(filter(None, stripped_items))
3937
3938
Aaron Gable4db38df2017-11-03 14:59:07 -07003939@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003940@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003941def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003942 """Uploads the current changelist to codereview.
3943
3944 Can skip dependency patchset uploads for a branch by running:
3945 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003946 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00003947 git config --unset branch.branch_name.skip-deps-uploads
3948 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02003949
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003950 If the name of the checked out branch starts with "bug-" or "fix-" followed
3951 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02003952 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003953
3954 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003955 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003956 [git-cl] add support for hashtags
3957 Foo bar: implement foo
3958 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00003959 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003960 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3961 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003962 parser.add_option('--bypass-watchlists', action='store_true',
3963 dest='bypass_watchlists',
3964 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07003965 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003966 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003967 parser.add_option('--message', '-m', dest='message',
3968 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003969 parser.add_option('-b', '--bug',
3970 help='pre-populate the bug number(s) for this issue. '
3971 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003972 parser.add_option('--message-file', dest='message_file',
3973 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003974 parser.add_option('--title', '-t', dest='title',
3975 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003976 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003977 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003978 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003979 parser.add_option('--tbrs',
3980 action='append', default=[],
3981 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003982 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003983 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003984 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003985 parser.add_option('--hashtag', dest='hashtags',
3986 action='append', default=[],
3987 help=('Gerrit hashtag for new CL; '
3988 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00003989 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08003990 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003991 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003992 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003993 metavar='TARGET',
3994 help='Apply CL to remote ref TARGET. ' +
3995 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003996 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003997 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00003998 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003999 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004000 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004001 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004002 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4003 const='TBR', help='add a set of OWNERS to TBR')
4004 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4005 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004006 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004007 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004008 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004009 'implies --send-mail')
4010 parser.add_option('-d', '--cq-dry-run',
4011 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004012 help='Send the patchset to do a CQ dry run right after '
4013 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004014 parser.add_option('--preserve-tryjobs', action='store_true',
4015 help='instruct the CQ to let tryjobs running even after '
4016 'new patchsets are uploaded instead of canceling '
4017 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004018 parser.add_option('--dependencies', action='store_true',
4019 help='Uploads CLs of all the local branches that depend on '
4020 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004021 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4022 help='Sends your change to the CQ after an approval. Only '
4023 'works on repos that have the Auto-Submit label '
4024 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004025 parser.add_option('--parallel', action='store_true',
4026 help='Run all tests specified by input_api.RunTests in all '
4027 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004028 parser.add_option('--no-autocc', action='store_true',
4029 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004030 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004031 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004032 parser.add_option('-R', '--retry-failed', action='store_true',
4033 help='Retry failed tryjobs from old patchset immediately '
4034 'after uploading new patchset. Cannot be used with '
4035 '--use-commit-queue or --cq-dry-run.')
4036 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4037 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004038 parser.add_option('--fixed', '-x',
4039 help='List of bugs that will be commented on and marked '
4040 'fixed (pre-populates "Fixed:" tag). Same format as '
4041 '-b option / "Bug:" tag. If fixing several issues, '
4042 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004043 parser.add_option('--edit-description', action='store_true', default=False,
4044 help='Modify description before upload. Cannot be used '
4045 'with --force. It is a noop when --no-squash is set '
4046 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004047
rmistry@google.com2dd99862015-06-22 12:22:18 +00004048 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004049 (options, args) = parser.parse_args(args)
4050
sbc@chromium.org71437c02015-04-09 19:29:40 +00004051 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004052 return 1
4053
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004054 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004055 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004056 options.cc = cleanup_list(options.cc)
4057
Josipe827b0f2020-01-30 00:07:20 +00004058 if options.edit_description and options.force:
4059 parser.error('Only one of --force and --edit-description allowed')
4060
tandriib80458a2016-06-23 12:20:07 -07004061 if options.message_file:
4062 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004063 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004064 options.message = gclient_utils.FileRead(options.message_file)
4065 options.message_file = None
4066
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004067 if ([options.cq_dry_run,
4068 options.use_commit_queue,
4069 options.retry_failed].count(True) > 1):
4070 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4071 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004072
Aaron Gableedbc4132017-09-11 13:22:28 -07004073 if options.use_commit_queue:
4074 options.send_mail = True
4075
Edward Lesmes0dd54822020-03-26 18:24:25 +00004076 if options.squash is None:
4077 # Load default for user, repo, squash=true, in this order.
4078 options.squash = settings.GetSquashGerritUploads()
4079
Edward Lemur934836a2019-09-09 20:16:54 +00004080 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004081 # Warm change details cache now to avoid RPCs later, reducing latency for
4082 # developers.
4083 if cl.GetIssue():
4084 cl._GetChangeDetail(
4085 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4086
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004087 if options.retry_failed and not cl.GetIssue():
4088 print('No previous patchsets, so --retry-failed has no effect.')
4089 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004090
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004091 # cl.GetMostRecentPatchset uses cached information, and can return the last
4092 # patchset before upload. Calling it here makes it clear that it's the
4093 # last patchset before upload. Note that GetMostRecentPatchset will fail
4094 # if no CL has been uploaded yet.
4095 if options.retry_failed:
4096 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004097
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004098 ret = cl.CMDUpload(options, args, orig_args)
4099
4100 if options.retry_failed:
4101 if ret != 0:
4102 print('Upload failed, so --retry-failed has no effect.')
4103 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004104 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004105 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004106 jobs = _filter_failed_for_retry(builds)
4107 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004108 print('No failed tryjobs, so --retry-failed has no effect.')
4109 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004110 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004111
4112 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004113
4114
Francois Dorayd42c6812017-05-30 15:10:20 -04004115@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004116@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004117def CMDsplit(parser, args):
4118 """Splits a branch into smaller branches and uploads CLs.
4119
4120 Creates a branch and uploads a CL for each group of files modified in the
4121 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004122 comment, the string '$directory', is replaced with the directory containing
4123 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004124 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004125 parser.add_option('-d', '--description', dest='description_file',
4126 help='A text file containing a CL description in which '
4127 '$directory will be replaced by each CL\'s directory.')
4128 parser.add_option('-c', '--comment', dest='comment_file',
4129 help='A text file containing a CL comment.')
4130 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004131 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004132 help='List the files and reviewers for each CL that would '
4133 'be created, but don\'t create branches or CLs.')
4134 parser.add_option('--cq-dry-run', action='store_true',
4135 help='If set, will do a cq dry run for each uploaded CL. '
4136 'Please be careful when doing this; more than ~10 CLs '
4137 'has the potential to overload our build '
4138 'infrastructure. Try to upload these not during high '
4139 'load times (usually 11-3 Mountain View time). Email '
4140 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004141 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4142 default=True,
4143 help='Sends your change to the CQ after an approval. Only '
4144 'works on repos that have the Auto-Submit label '
4145 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004146 options, _ = parser.parse_args(args)
4147
4148 if not options.description_file:
4149 parser.error('No --description flag specified.')
4150
4151 def WrappedCMDupload(args):
4152 return CMDupload(OptionParser(), args)
4153
Edward Lemur2c62b332020-03-12 22:12:33 +00004154 return split_cl.SplitCl(
4155 options.description_file, options.comment_file, Changelist,
4156 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4157 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004158
4159
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004160@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004161@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004162def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004163 """DEPRECATED: Used to commit the current changelist via git-svn."""
4164 message = ('git-cl no longer supports committing to SVN repositories via '
4165 'git-svn. You probably want to use `git cl land` instead.')
4166 print(message)
4167 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004168
4169
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004170@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004171@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004172def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004173 """Commits the current changelist via git.
4174
4175 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4176 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004177 """
4178 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4179 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004180 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004181 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004182 parser.add_option('--parallel', action='store_true',
4183 help='Run all tests specified by input_api.RunTests in all '
4184 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004185 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004186
Edward Lemur934836a2019-09-09 20:16:54 +00004187 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004188
Robert Iannucci2e73d432018-03-14 01:10:47 -07004189 if not cl.GetIssue():
4190 DieWithError('You must upload the change first to Gerrit.\n'
4191 ' If you would rather have `git cl land` upload '
4192 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004193 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004194 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004195
4196
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004197@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004198@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004200 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004201 parser.add_option('-b', dest='newbranch',
4202 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004203 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004204 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004205 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004206 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004207
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004208 group = optparse.OptionGroup(
4209 parser,
4210 'Options for continuing work on the current issue uploaded from a '
4211 'different clone (e.g. different machine). Must be used independently '
4212 'from the other options. No issue number should be specified, and the '
4213 'branch must have an issue number associated with it')
4214 group.add_option('--reapply', action='store_true', dest='reapply',
4215 help='Reset the branch and reapply the issue.\n'
4216 'CAUTION: This will undo any local changes in this '
4217 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004218
4219 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004220 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004221 parser.add_option_group(group)
4222
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004223 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004224
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004225 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004226 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004227 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004228 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004229 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004230
Edward Lemur934836a2019-09-09 20:16:54 +00004231 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004232 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004233 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004234
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004235 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004236 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004237 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004238
4239 RunGit(['reset', '--hard', upstream])
4240 if options.pull:
4241 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004242
Edward Lemur678a6842019-10-03 22:25:05 +00004243 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4244 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004245
4246 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004247 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004248
Edward Lemurf38bc172019-09-03 21:02:13 +00004249 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004250 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004251 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004252
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004253 # We don't want uncommitted changes mixed up with the patch.
4254 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004255 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004257 if options.newbranch:
4258 if options.force:
4259 RunGit(['branch', '-D', options.newbranch],
4260 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004261 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004262
Edward Lemur678a6842019-10-03 22:25:05 +00004263 cl = Changelist(
4264 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004265
Edward Lemur678a6842019-10-03 22:25:05 +00004266 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004267 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004268
Edward Lemurf38bc172019-09-03 21:02:13 +00004269 return cl.CMDPatchWithParsedIssue(
4270 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004271
4272
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004273def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004274 """Fetches the tree status and returns either 'open', 'closed',
4275 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004276 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004277 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004278 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004279 if status.find('closed') != -1 or status == '0':
4280 return 'closed'
4281 elif status.find('open') != -1 or status == '1':
4282 return 'open'
4283 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004284 return 'unset'
4285
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004286
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004287def GetTreeStatusReason():
4288 """Fetches the tree status from a json url and returns the message
4289 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004290 url = settings.GetTreeStatusUrl()
4291 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004292 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004293 status = json.loads(connection.read())
4294 connection.close()
4295 return status['message']
4296
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004297
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004298@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004299def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004300 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004301 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004302 status = GetTreeStatus()
4303 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004305 return 2
4306
vapiera7fbd5a2016-06-16 09:17:49 -07004307 print('The tree is %s' % status)
4308 print()
4309 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004310 if status != 'open':
4311 return 1
4312 return 0
4313
4314
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004315@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004316def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004317 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4318 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004319 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004320 '-b', '--bot', action='append',
4321 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4322 'times to specify multiple builders. ex: '
4323 '"-b win_rel -b win_layout". See '
4324 'the try server waterfall for the builders name and the tests '
4325 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004326 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004327 '-B', '--bucket', default='',
4328 help=('Buildbucket bucket to send the try requests.'))
4329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004330 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004331 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004332 'be determined by the try recipe that builder runs, which usually '
4333 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004334 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004335 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004336 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004337 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004338 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004339 '--category', default='git_cl_try', help='Specify custom build category.')
4340 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004341 '--project',
4342 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004343 'in recipe to determine to which repository or directory to '
4344 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004345 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004346 '-p', '--property', dest='properties', action='append', default=[],
4347 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004348 'key2=value2 etc. The value will be treated as '
4349 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004350 'NOTE: using this may make your tryjob not usable for CQ, '
4351 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004352 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004353 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4354 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004355 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004356 parser.add_option(
4357 '-R', '--retry-failed', action='store_true', default=False,
4358 help='Retry failed jobs from the latest set of tryjobs. '
4359 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004360 parser.add_option(
4361 '-i', '--issue', type=int,
4362 help='Operate on this issue instead of the current branch\'s implicit '
4363 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004364 options, args = parser.parse_args(args)
4365
machenbach@chromium.org45453142015-09-15 08:45:22 +00004366 # Make sure that all properties are prop=value pairs.
4367 bad_params = [x for x in options.properties if '=' not in x]
4368 if bad_params:
4369 parser.error('Got properties with missing "=": %s' % bad_params)
4370
maruel@chromium.org15192402012-09-06 12:38:29 +00004371 if args:
4372 parser.error('Unknown arguments: %s' % args)
4373
Edward Lemur934836a2019-09-09 20:16:54 +00004374 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004375 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004376 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004377
Edward Lemurf38bc172019-09-03 21:02:13 +00004378 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004379 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004380
tandriie113dfd2016-10-11 10:20:12 -07004381 error_message = cl.CannotTriggerTryJobReason()
4382 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004383 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004384
Edward Lemur45768512020-03-02 19:03:14 +00004385 if options.bot:
4386 if options.retry_failed:
4387 parser.error('--bot is not compatible with --retry-failed.')
4388 if not options.bucket:
4389 parser.error('A bucket (e.g. "chromium/try") is required.')
4390
4391 triggered = [b for b in options.bot if 'triggered' in b]
4392 if triggered:
4393 parser.error(
4394 'Cannot schedule builds on triggered bots: %s.\n'
4395 'This type of bot requires an initial job from a parent (usually a '
4396 'builder). Schedule a job on the parent instead.\n' % triggered)
4397
4398 if options.bucket.startswith('.master'):
4399 parser.error('Buildbot masters are not supported.')
4400
4401 project, bucket = _parse_bucket(options.bucket)
4402 if project is None or bucket is None:
4403 parser.error('Invalid bucket: %s.' % options.bucket)
4404 jobs = sorted((project, bucket, bot) for bot in options.bot)
4405 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004406 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004407 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004408 if options.verbose:
4409 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004410 jobs = _filter_failed_for_retry(builds)
4411 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004412 print('There are no failed jobs in the latest set of jobs '
4413 '(patchset #%d), doing nothing.' % patchset)
4414 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004415 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004416 if num_builders > 10:
4417 confirm_or_exit('There are %d builders with failed builds.'
4418 % num_builders, action='continue')
4419 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004420 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004421 print('git cl try with no bots now defaults to CQ dry run.')
4422 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4423 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004424
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004425 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004426 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004427 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004428 except BuildbucketResponseException as ex:
4429 print('ERROR: %s' % ex)
4430 return 1
4431 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004432
4433
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004434@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004435def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004436 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004437 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004438 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004439 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004440 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004441 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004442 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004443 '--color', action='store_true', default=setup_color.IS_TTY,
4444 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004445 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004446 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4447 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004448 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004449 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004450 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004451 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004452 parser.add_option(
4453 '-i', '--issue', type=int,
4454 help='Operate on this issue instead of the current branch\'s implicit '
4455 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004456 options, args = parser.parse_args(args)
4457 if args:
4458 parser.error('Unrecognized args: %s' % ' '.join(args))
4459
Edward Lemur934836a2019-09-09 20:16:54 +00004460 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004461 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004462 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004463
tandrii221ab252016-10-06 08:12:04 -07004464 patchset = options.patchset
4465 if not patchset:
4466 patchset = cl.GetMostRecentPatchset()
4467 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004468 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004469 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004470 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004471 cl.GetIssue())
4472
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004473 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004474 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004475 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004476 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004477 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004478 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004479 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004480 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004481 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004482 return 0
4483
4484
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004485@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004486@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004488 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004489 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004490 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004491 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004492
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004494 if args:
4495 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004496 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004497 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004498 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004499 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004500
4501 # Clear configured merge-base, if there is one.
4502 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004503 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004504 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505 return 0
4506
4507
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004508@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004509def CMDweb(parser, args):
4510 """Opens the current CL in the web browser."""
4511 _, args = parser.parse_args(args)
4512 if args:
4513 parser.error('Unrecognized args: %s' % ' '.join(args))
4514
4515 issue_url = Changelist().GetIssueURL()
4516 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004517 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004518 return 1
4519
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004520 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004521 # allows us to hide the "Created new window in existing browser session."
4522 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004523 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004524 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004525 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004526 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004527 os.open(os.devnull, os.O_RDWR)
4528 try:
4529 webbrowser.open(issue_url)
4530 finally:
4531 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004532 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004533 return 0
4534
4535
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004536@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004537def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004538 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004539 parser.add_option('-d', '--dry-run', action='store_true',
4540 help='trigger in dry run mode')
4541 parser.add_option('-c', '--clear', action='store_true',
4542 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004543 parser.add_option(
4544 '-i', '--issue', type=int,
4545 help='Operate on this issue instead of the current branch\'s implicit '
4546 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004547 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004548 if args:
4549 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004550 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004551 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004552
Edward Lemur934836a2019-09-09 20:16:54 +00004553 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004554 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004555 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004556 elif options.dry_run:
4557 state = _CQState.DRY_RUN
4558 else:
4559 state = _CQState.COMMIT
4560 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004561 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004562 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004563 return 0
4564
4565
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004566@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004567def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004568 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004569 parser.add_option(
4570 '-i', '--issue', type=int,
4571 help='Operate on this issue instead of the current branch\'s implicit '
4572 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004573 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004574 if args:
4575 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004576 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004577 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004578 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004580 cl.CloseIssue()
4581 return 0
4582
4583
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004584@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004585def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004586 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004587 parser.add_option(
4588 '--stat',
4589 action='store_true',
4590 dest='stat',
4591 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004592 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004593 if args:
4594 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004595
Edward Lemur934836a2019-09-09 20:16:54 +00004596 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004597 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004598 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004599 if not issue:
4600 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004601
Aaron Gablea718c3e2017-08-28 17:47:28 -07004602 base = cl._GitGetBranchConfigValue('last-upload-hash')
4603 if not base:
4604 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4605 if not base:
4606 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4607 revision_info = detail['revisions'][detail['current_revision']]
4608 fetch_info = revision_info['fetch']['http']
4609 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4610 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004611
Aaron Gablea718c3e2017-08-28 17:47:28 -07004612 cmd = ['git', 'diff']
4613 if options.stat:
4614 cmd.append('--stat')
4615 cmd.append(base)
4616 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004617
4618 return 0
4619
4620
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004621@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004622def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004623 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004624 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004625 '--ignore-current',
4626 action='store_true',
4627 help='Ignore the CL\'s current reviewers and start from scratch.')
4628 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004629 '--ignore-self',
4630 action='store_true',
4631 help='Do not consider CL\'s author as an owners.')
4632 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004633 '--no-color',
4634 action='store_true',
4635 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004636 parser.add_option(
4637 '--batch',
4638 action='store_true',
4639 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004640 # TODO: Consider moving this to another command, since other
4641 # git-cl owners commands deal with owners for a given CL.
4642 parser.add_option(
4643 '--show-all',
4644 action='store_true',
4645 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004646 options, args = parser.parse_args(args)
4647
Edward Lemur934836a2019-09-09 20:16:54 +00004648 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004649 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004650
Yang Guo6e269a02019-06-26 11:17:02 +00004651 if options.show_all:
4652 for arg in args:
4653 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004654 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004655 database.load_data_needed_for([arg])
4656 print('Owners for %s:' % arg)
4657 for owner in sorted(database.all_possible_owners([arg], None)):
4658 print(' - %s' % owner)
4659 return 0
4660
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004661 if args:
4662 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004663 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004664 base_branch = args[0]
4665 else:
4666 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004667 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004668
Edward Lemur2c62b332020-03-12 22:12:33 +00004669 root = settings.GetRoot()
4670 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004671
4672 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004673 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004674 print('\n'.join(db.reviewers_for(affected_files, author)))
4675 return 0
4676
Edward Lemur2c62b332020-03-12 22:12:33 +00004677 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4678 original_owner_files = {
4679 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4680 for f in owner_files}
4681
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004682 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004683 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004684 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004685 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004686 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004687 fopen=open,
4688 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004689 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004690 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004691 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004692
4693
Aiden Bennerc08566e2018-10-03 17:52:42 +00004694def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004695 """Generates a diff command."""
4696 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004697 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4698
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004699 if allow_prefix:
4700 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4701 # case that diff.noprefix is set in the user's git config.
4702 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4703 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004704 diff_cmd += ['--no-prefix']
4705
4706 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004707
4708 if args:
4709 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004710 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004711 diff_cmd.append(arg)
4712 else:
4713 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004714
4715 return diff_cmd
4716
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004717
Jamie Madill5e96ad12020-01-13 16:08:35 +00004718def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4719 """Runs clang-format-diff and sets a return value if necessary."""
4720
4721 if not clang_diff_files:
4722 return 0
4723
4724 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4725 # formatted. This is used to block during the presubmit.
4726 return_value = 0
4727
4728 # Locate the clang-format binary in the checkout
4729 try:
4730 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4731 except clang_format.NotFoundError as e:
4732 DieWithError(e)
4733
4734 if opts.full or settings.GetFormatFullByDefault():
4735 cmd = [clang_format_tool]
4736 if not opts.dry_run and not opts.diff:
4737 cmd.append('-i')
4738 if opts.dry_run:
4739 for diff_file in clang_diff_files:
4740 with open(diff_file, 'r') as myfile:
4741 code = myfile.read().replace('\r\n', '\n')
4742 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4743 stdout = stdout.replace('\r\n', '\n')
4744 if opts.diff:
4745 sys.stdout.write(stdout)
4746 if code != stdout:
4747 return_value = 2
4748 else:
4749 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4750 if opts.diff:
4751 sys.stdout.write(stdout)
4752 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004753 try:
4754 script = clang_format.FindClangFormatScriptInChromiumTree(
4755 'clang-format-diff.py')
4756 except clang_format.NotFoundError as e:
4757 DieWithError(e)
4758
Edward Lesmes87661af2020-04-01 21:05:00 +00004759 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004760 if not opts.dry_run and not opts.diff:
4761 cmd.append('-i')
4762
4763 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004764 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004765
Edward Lesmes87661af2020-04-01 21:05:00 +00004766 env = os.environ.copy()
4767 env['PATH'] = (
4768 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
Jamie Madill5e96ad12020-01-13 16:08:35 +00004769 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
4770 if opts.diff:
4771 sys.stdout.write(stdout)
4772 if opts.dry_run and len(stdout) > 0:
4773 return_value = 2
4774
4775 return return_value
4776
4777
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004778def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004779 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004780 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004781
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004782
enne@chromium.org555cfe42014-01-29 18:21:39 +00004783@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004784@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004785def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004786 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004787 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004788 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004789 parser.add_option('--full', action='store_true',
4790 help='Reformat the full content of all touched files')
4791 parser.add_option('--dry-run', action='store_true',
4792 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004793 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004794 '--no-clang-format',
4795 dest='clang_format',
4796 action='store_false',
4797 default=True,
4798 help='Disables formatting of various file types using clang-format.')
4799 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004800 '--python',
4801 action='store_true',
4802 default=None,
4803 help='Enables python formatting on all python files.')
4804 parser.add_option(
4805 '--no-python',
4806 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004807 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004808 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004809 'If neither --python or --no-python are set, python files that have a '
4810 '.style.yapf file in an ancestor directory will be formatted. '
4811 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004812 parser.add_option(
4813 '--js',
4814 action='store_true',
4815 help='Format javascript code with clang-format. '
4816 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004817 parser.add_option('--diff', action='store_true',
4818 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004819 parser.add_option('--presubmit', action='store_true',
4820 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004821 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004822
Garrett Beaty91a6f332020-01-06 16:57:24 +00004823 if opts.python is not None and opts.no_python:
4824 raise parser.error('Cannot set both --python and --no-python')
4825 if opts.no_python:
4826 opts.python = False
4827
Daniel Chengc55eecf2016-12-30 03:11:02 -08004828 # Normalize any remaining args against the current path, so paths relative to
4829 # the current directory are still resolved as expected.
4830 args = [os.path.join(os.getcwd(), arg) for arg in args]
4831
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004832 # git diff generates paths against the root of the repository. Change
4833 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004834 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004835 if rel_base_path:
4836 os.chdir(rel_base_path)
4837
digit@chromium.org29e47272013-05-17 17:01:46 +00004838 # Grab the merge-base commit, i.e. the upstream commit of the current
4839 # branch when it was created or the last time it was rebased. This is
4840 # to cover the case where the user may have called "git fetch origin",
4841 # moving the origin branch to a newer commit, but hasn't rebased yet.
4842 upstream_commit = None
4843 cl = Changelist()
4844 upstream_branch = cl.GetUpstreamBranch()
4845 if upstream_branch:
4846 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4847 upstream_commit = upstream_commit.strip()
4848
4849 if not upstream_commit:
4850 DieWithError('Could not find base commit for this branch. '
4851 'Are you in detached state?')
4852
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004853 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4854 diff_output = RunGit(changed_files_cmd)
4855 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004856 # Filter out files deleted by this CL
4857 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004858
Andreas Haas417d89c2020-02-06 10:24:27 +00004859 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004860 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004861
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004862 clang_diff_files = []
4863 if opts.clang_format:
4864 clang_diff_files = [
4865 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4866 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004867 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
4868 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004869 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004870
Edward Lesmes50da7702020-03-30 19:23:43 +00004871 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004872
Jamie Madill5e96ad12020-01-13 16:08:35 +00004873 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4874 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004875
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004876 # Similar code to above, but using yapf on .py files rather than clang-format
4877 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004878 py_explicitly_disabled = opts.python is not None and not opts.python
4879 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00004880 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
4881 yapf_tool = os.path.join(depot_tools_path, 'yapf')
4882 if sys.platform.startswith('win'):
4883 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004884
Aiden Bennerc08566e2018-10-03 17:52:42 +00004885 # Used for caching.
4886 yapf_configs = {}
4887 for f in python_diff_files:
4888 # Find the yapf style config for the current file, defaults to depot
4889 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004890 _FindYapfConfigFile(f, yapf_configs, top_dir)
4891
4892 # Turn on python formatting by default if a yapf config is specified.
4893 # This breaks in the case of this repo though since the specified
4894 # style file is also the global default.
4895 if opts.python is None:
4896 filtered_py_files = []
4897 for f in python_diff_files:
4898 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
4899 filtered_py_files.append(f)
4900 else:
4901 filtered_py_files = python_diff_files
4902
4903 # Note: yapf still seems to fix indentation of the entire file
4904 # even if line ranges are specified.
4905 # See https://github.com/google/yapf/issues/499
4906 if not opts.full and filtered_py_files:
4907 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
4908
Brian Sheedyb4307d52019-12-02 19:18:17 +00004909 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
4910 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
4911 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004912
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004913 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004914 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
4915 # Default to pep8 if not .style.yapf is found.
4916 if not yapf_style:
4917 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00004918
Andrew Grievefa40bfa2020-01-07 02:32:57 +00004919 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00004920
4921 has_formattable_lines = False
4922 if not opts.full:
4923 # Only run yapf over changed line ranges.
4924 for diff_start, diff_len in py_line_diffs[f]:
4925 diff_end = diff_start + diff_len - 1
4926 # Yapf errors out if diff_end < diff_start but this
4927 # is a valid line range diff for a removal.
4928 if diff_end >= diff_start:
4929 has_formattable_lines = True
4930 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
4931 # If all line diffs were removals we have nothing to format.
4932 if not has_formattable_lines:
4933 continue
4934
4935 if opts.diff or opts.dry_run:
4936 cmd += ['--diff']
4937 # Will return non-zero exit code if non-empty diff.
4938 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
4939 if opts.diff:
4940 sys.stdout.write(stdout)
4941 elif len(stdout) > 0:
4942 return_value = 2
4943 else:
4944 cmd += ['-i']
4945 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004946
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004947 # Dart's formatter does not have the nice property of only operating on
4948 # modified chunks, so hard code full.
4949 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004950 try:
4951 command = [dart_format.FindDartFmtToolInChromiumTree()]
4952 if not opts.dry_run and not opts.diff:
4953 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004954 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004955
ppi@chromium.org6593d932016-03-03 15:41:15 +00004956 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004957 if opts.dry_run and stdout:
4958 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00004959 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07004960 print('Warning: Unable to check Dart code formatting. Dart SDK not '
4961 'found in this checkout. Files in other languages are still '
4962 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004963
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004964 # Format GN build files. Always run on full build files for canonical form.
4965 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004966 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07004967 if opts.dry_run or opts.diff:
4968 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004969 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07004970 gn_ret = subprocess2.call(cmd + [gn_diff_file],
4971 shell=sys.platform == 'win32',
4972 cwd=top_dir)
4973 if opts.dry_run and gn_ret == 2:
4974 return_value = 2 # Not formatted.
4975 elif opts.diff and gn_ret == 2:
4976 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004977 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07004978 elif gn_ret != 0:
4979 # For non-dry run cases (and non-2 return values for dry-run), a
4980 # nonzero error code indicates a failure, probably because the file
4981 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004982 DieWithError('gn format failed on ' + gn_diff_file +
4983 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004984
Ilya Shermane081cbe2017-08-15 17:51:04 -07004985 # Skip the metrics formatting from the global presubmit hook. These files have
4986 # a separate presubmit hook that issues an error if the files need formatting,
4987 # whereas the top-level presubmit script merely issues a warning. Formatting
4988 # these files is somewhat slow, so it's important not to duplicate the work.
4989 if not opts.presubmit:
4990 for xml_dir in GetDirtyMetricsDirs(diff_files):
4991 tool_dir = os.path.join(top_dir, xml_dir)
4992 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
4993 if opts.dry_run or opts.diff:
4994 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07004995 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07004996 if opts.diff:
4997 sys.stdout.write(stdout)
4998 if opts.dry_run and stdout:
4999 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005000
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005001 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005002
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005003
Steven Holte2e664bf2017-04-21 13:10:47 -07005004def GetDirtyMetricsDirs(diff_files):
5005 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5006 metrics_xml_dirs = [
5007 os.path.join('tools', 'metrics', 'actions'),
5008 os.path.join('tools', 'metrics', 'histograms'),
5009 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005010 os.path.join('tools', 'metrics', 'ukm'),
5011 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005012 for xml_dir in metrics_xml_dirs:
5013 if any(file.startswith(xml_dir) for file in xml_diff_files):
5014 yield xml_dir
5015
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005016
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005017@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005018@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005019def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005020 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005021 _, args = parser.parse_args(args)
5022
5023 if len(args) != 1:
5024 parser.print_help()
5025 return 1
5026
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005027 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005028 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005029 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005030
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005031 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005032
Edward Lemur52969c92020-02-06 18:15:28 +00005033 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005034 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005035 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005036
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005037 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005038 for key, issue in [x.split() for x in output.splitlines()]:
5039 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005040 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005041
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005042 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005043 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005044 return 1
5045 if len(branches) == 1:
5046 RunGit(['checkout', branches[0]])
5047 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005048 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005049 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005050 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005051 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005052 try:
5053 RunGit(['checkout', branches[int(which)]])
5054 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005055 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005056 return 1
5057
5058 return 0
5059
5060
maruel@chromium.org29404b52014-09-08 22:58:00 +00005061def CMDlol(parser, args):
5062 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005063 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005064 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5065 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5066 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005067 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005068 return 0
5069
5070
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005071class OptionParser(optparse.OptionParser):
5072 """Creates the option parse and add --verbose support."""
5073 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005074 optparse.OptionParser.__init__(
5075 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005076 self.add_option(
5077 '-v', '--verbose', action='count', default=0,
5078 help='Use 2 times for more debugging info')
5079
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005080 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005081 try:
5082 return self._parse_args(args)
5083 finally:
5084 # Regardless of success or failure of args parsing, we want to report
5085 # metrics, but only after logging has been initialized (if parsing
5086 # succeeded).
5087 global settings
5088 settings = Settings()
5089
5090 if not metrics.DISABLE_METRICS_COLLECTION:
5091 # GetViewVCUrl ultimately calls logging method.
5092 project_url = settings.GetViewVCUrl().strip('/+')
5093 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5094 metrics.collector.add('project_urls', [project_url])
5095
5096 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005097 # Create an optparse.Values object that will store only the actual passed
5098 # options, without the defaults.
5099 actual_options = optparse.Values()
5100 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5101 # Create an optparse.Values object with the default options.
5102 options = optparse.Values(self.get_default_values().__dict__)
5103 # Update it with the options passed by the user.
5104 options._update_careful(actual_options.__dict__)
5105 # Store the options passed by the user in an _actual_options attribute.
5106 # We store only the keys, and not the values, since the values can contain
5107 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005108 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005109
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005110 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005111 logging.basicConfig(
5112 level=levels[min(options.verbose, len(levels) - 1)],
5113 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5114 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005115
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005116 return options, args
5117
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005118
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005119def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005120 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005121 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005122 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005123 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005124
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005125 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005126 dispatcher = subcommand.CommandDispatcher(__name__)
5127 try:
5128 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005129 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005130 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005131 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005132 if e.code != 500:
5133 raise
5134 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005135 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005136 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005137 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005138
5139
5140if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005141 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5142 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005143 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005144 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005145 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005146 sys.exit(main(sys.argv[1:]))