blob: 378744b37bb765422961d516dc1644da2375b742 [file] [log] [blame]
Edward Lesmes98eda3f2019-08-12 21:09:53 +00001#!/usr/bin/env python
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
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000017import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000038from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000039from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000040import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000041import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000042import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000043import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000044import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000045import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000047import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000048import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000049import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000050import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000051import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000052import presubmit_support
53import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000054import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040055import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000056import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000057import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import watchlists
59
tandrii7400cf02016-06-21 08:48:07 -070060__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061
Edward Lemur0f58ae42019-04-30 17:24:12 +000062# Traces for git push will be stored in a traces directory inside the
63# depot_tools checkout.
64DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
65TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
66
67# When collecting traces, Git hashes will be reduced to 6 characters to reduce
68# the size after compression.
69GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
70# Used to redact the cookies from the gitcookies file.
71GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
72
Edward Lemurd4d1ba42019-09-20 21:46:37 +000073MAX_ATTEMPTS = 3
74
Edward Lemur1b52d872019-05-09 21:12:12 +000075# The maximum number of traces we will keep. Multiplied by 3 since we store
76# 3 files per trace.
77MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000078# Message to be displayed to the user to inform where to find the traces for a
79# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000080TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000081'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000082'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000083' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000084'Copies of your gitcookies file and git config have been recorded at:\n'
85' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000086# Format of the message to be stored as part of the traces to give developers a
87# better context when they go through traces.
88TRACES_README_FORMAT = (
89'Date: %(now)s\n'
90'\n'
91'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
92'Title: %(title)s\n'
93'\n'
94'%(description)s\n'
95'\n'
96'Execution time: %(execution_time)s\n'
97'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000098
tandrii9d2c7a32016-06-22 03:42:45 -070099COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800100POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000101DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000102REFS_THAT_ALIAS_TO_OTHER_REFS = {
103 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
104 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
105}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000106
thestig@chromium.org44202a22014-03-11 19:22:18 +0000107# Valid extensions for files we want to lint.
108DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
109DEFAULT_LINT_IGNORE_REGEX = r"$^"
110
Aiden Bennerc08566e2018-10-03 17:52:42 +0000111# File name for yapf style config files.
112YAPF_CONFIG_FILENAME = '.style.yapf'
113
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000114# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000115Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000116
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000117# Initialized in main()
118settings = None
119
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100120# Used by tests/git_cl_test.py to add extra logging.
121# Inside the weirdly failing test, add this:
122# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700123# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100124_IS_BEING_TESTED = False
125
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000126
Christopher Lamf732cd52017-01-24 12:40:11 +1100127def DieWithError(message, change_desc=None):
128 if change_desc:
129 SaveDescriptionBackup(change_desc)
130
vapiera7fbd5a2016-06-16 09:17:49 -0700131 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132 sys.exit(1)
133
134
Christopher Lamf732cd52017-01-24 12:40:11 +1100135def SaveDescriptionBackup(change_desc):
136 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000137 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100138 backup_file = open(backup_path, 'w')
139 backup_file.write(change_desc.description)
140 backup_file.close()
141
142
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000143def GetNoGitPagerEnv():
144 env = os.environ.copy()
145 # 'cat' is a magical git string that disables pagers on all platforms.
146 env['GIT_PAGER'] = 'cat'
147 return env
148
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000149
bsep@chromium.org627d9002016-04-29 00:00:52 +0000150def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000151 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000152 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000153 except subprocess2.CalledProcessError as e:
154 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000155 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000157 'Command "%s" failed.\n%s' % (
158 ' '.join(args), error_message or e.stdout or ''))
159 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160
161
162def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000164 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000167def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700169 if suppress_stderr:
170 stderr = subprocess2.VOID
171 else:
172 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000173 try:
tandrii5d48c322016-08-18 16:19:37 -0700174 (out, _), code = subprocess2.communicate(['git'] + args,
175 env=GetNoGitPagerEnv(),
176 stdout=subprocess2.PIPE,
177 stderr=stderr)
178 return code, out
179 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900180 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700181 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000182
183
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000184def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000185 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000186 return RunGitWithCode(args, suppress_stderr=True)[1]
187
188
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000189def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000190 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000191 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000192 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000193 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194
195
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000196def BranchExists(branch):
197 """Return True if specified branch exists."""
198 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
199 suppress_stderr=True)
200 return not code
201
202
tandrii2a16b952016-10-19 07:09:44 -0700203def time_sleep(seconds):
204 # Use this so that it can be mocked in tests without interfering with python
205 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700206 return time.sleep(seconds)
207
208
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000209def time_time():
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
212 return time.time()
213
214
Edward Lemur1b52d872019-05-09 21:12:12 +0000215def datetime_now():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return datetime.datetime.now()
219
220
maruel@chromium.org90541732011-04-01 17:54:18 +0000221def ask_for_data(prompt):
222 try:
223 return raw_input(prompt)
224 except KeyboardInterrupt:
225 # Hide the exception.
226 sys.exit(1)
227
228
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100229def confirm_or_exit(prefix='', action='confirm'):
230 """Asks user to press enter to continue or press Ctrl+C to abort."""
231 if not prefix or prefix.endswith('\n'):
232 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100233 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234 mid = ' Press'
235 elif prefix.endswith(' '):
236 mid = 'press'
237 else:
238 mid = ' press'
239 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
240
241
242def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000243 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
245 while True:
246 if 'yes'.startswith(result):
247 return True
248 if 'no'.startswith(result):
249 return False
250 result = ask_for_data('Please, type yes or no: ').lower()
251
252
tandrii5d48c322016-08-18 16:19:37 -0700253def _git_branch_config_key(branch, key):
254 """Helper method to return Git config key for a branch."""
255 assert branch, 'branch name is required to set git config for it'
256 return 'branch.%s.%s' % (branch, key)
257
258
259def _git_get_branch_config_value(key, default=None, value_type=str,
260 branch=False):
261 """Returns git config value of given or current branch if any.
262
263 Returns default in all other cases.
264 """
265 assert value_type in (int, str, bool)
266 if branch is False: # Distinguishing default arg value from None.
267 branch = GetCurrentBranch()
268
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000269 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700270 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000271
tandrii5d48c322016-08-18 16:19:37 -0700272 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700273 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700274 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000275 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 args.append(_git_branch_config_key(branch, key))
278 code, out = RunGitWithCode(args)
279 if code == 0:
280 value = out.strip()
281 if value_type == int:
282 return int(value)
283 if value_type == bool:
284 return bool(value.lower() == 'true')
285 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000286 return default
287
288
tandrii5d48c322016-08-18 16:19:37 -0700289def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000290 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700291
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000292 If value is None, the key will be unset, otherwise it will be set.
293 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700294 """
295 if not branch:
296 branch = GetCurrentBranch()
297 assert branch, 'a branch name OR currently checked out branch is required'
298 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700299 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700300 if value is None:
301 args.append('--unset')
302 elif isinstance(value, bool):
303 args.append('--bool')
304 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700305 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000306 # `git config` also has --int, but apparently git config suffers from
307 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700308 value = str(value)
309 args.append(_git_branch_config_key(branch, key))
310 if value is not None:
311 args.append(value)
312 RunGit(args, **kwargs)
313
314
machenbach@chromium.org45453142015-09-15 08:45:22 +0000315def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000316 prop_list = getattr(options, 'properties', [])
317 properties = dict(x.split('=', 1) for x in prop_list)
machenbach@chromium.org45453142015-09-15 08:45:22 +0000318 for key, val in properties.iteritems():
319 try:
320 properties[key] = json.loads(val)
321 except ValueError:
322 pass # If a value couldn't be evaluated, treat it as a string.
323 return properties
324
325
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326# TODO(crbug.com/976104): Remove this function once git-cl try-results has
327# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328def _buildbucket_retry(operation_name, http, *args, **kwargs):
329 """Retries requests to buildbucket service and returns parsed json content."""
330 try_count = 0
331 while True:
332 response, content = http.request(*args, **kwargs)
333 try:
334 content_json = json.loads(content)
335 except ValueError:
336 content_json = None
337
338 # Buildbucket could return an error even if status==200.
339 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000340 error = content_json.get('error')
341 if error.get('code') == 403:
342 raise BuildbucketResponseException(
343 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000344 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000345 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000346 raise BuildbucketResponseException(msg)
347
348 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700349 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000351 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700352 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000353 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000354 content)
355 return content_json
356 if response.status < 500 or try_count >= 2:
357 raise httplib2.HttpLib2Error(content)
358
359 # status >= 500 means transient failures.
360 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000361 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 try_count += 1
363 assert False, 'unreachable'
364
365
Edward Lemur4c707a22019-09-24 21:13:43 +0000366def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000367 """Calls a buildbucket v2 method and returns the parsed json response."""
368 headers = {
369 'Accept': 'application/json',
370 'Content-Type': 'application/json',
371 }
372 request = json.dumps(request)
373 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
374
375 logging.info('POST %s with %s' % (url, request))
376
377 attempts = 1
378 time_to_sleep = 1
379 while True:
380 response, content = http.request(url, 'POST', body=request, headers=headers)
381 if response.status == 200:
382 return json.loads(content[4:])
383 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
384 msg = '%s error when calling POST %s with %s: %s' % (
385 response.status, url, request, content)
386 raise BuildbucketResponseException(msg)
387 logging.debug(
388 '%s error when calling POST %s with %s. '
389 'Sleeping for %d seconds and retrying...' % (
390 response.status, url, request, time_to_sleep))
391 time.sleep(time_to_sleep)
392 time_to_sleep *= 2
393 attempts += 1
394
395 assert False, 'unreachable'
396
397
qyearsley1fdfcb62016-10-24 13:22:03 -0700398def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700399 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000400 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700401 """
qyearsleydd49f942016-10-28 11:57:22 -0700402 # If no bots are listed, we try to get a set of builders and tests based
403 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700404 if not options.bot:
405 change = changelist.GetChange(
406 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700407 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700408 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 change=change,
410 changed_files=change.LocalPaths(),
411 repository_root=settings.GetRoot(),
412 default_presubmit=None,
413 project=None,
414 verbose=options.verbose,
415 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700416 if masters is None:
417 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000418 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700419
qyearsley1fdfcb62016-10-24 13:22:03 -0700420 if options.bucket:
421 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000422 option_parser.error(
423 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700424
425
Edward Lemur6215c792019-10-03 21:59:05 +0000426def _parse_bucket(raw_bucket):
427 legacy = True
428 project = bucket = None
429 if '/' in raw_bucket:
430 legacy = False
431 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000433 elif raw_bucket.startswith('luci.'):
434 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000435 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000436 elif '.' in raw_bucket:
437 project = raw_bucket.split('.')[0]
438 bucket = raw_bucket
439 # Legacy buckets.
440 if legacy:
441 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
442 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000443
444
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800445def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000446 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700447
448 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700449 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 buckets: A nested dict mapping bucket names to builders to tests.
452 options: Command-line options.
453 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454 print('Scheduling jobs on:')
455 for bucket, builders_and_tests in sorted(buckets.iteritems()):
456 print('Bucket:', bucket)
457 print('\n'.join(
458 ' %s: %s' % (builder, tests)
459 for builder, tests in sorted(builders_and_tests.iteritems())))
460 print('To see results here, run: git cl try-results')
461 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700462
Edward Lemurf0faf482019-09-25 20:40:17 +0000463 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000464 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Edward Lemurf0faf482019-09-25 20:40:17 +0000465 shared_properties.update(changelist.GetLegacyProperties(patchset))
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000466 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000467 shared_properties['clobber'] = True
468 shared_properties.update(_get_properties_from_options(options) or {})
469
470 requests = []
471 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
472 project, bucket = _parse_bucket(raw_bucket)
473 if not project or not bucket:
474 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
475 continue
476
477 for builder, tests in sorted(builders_and_tests.iteritems()):
478 properties = shared_properties.copy()
479 if 'presubmit' in builder.lower():
480 properties['dry_run'] = 'true'
481 if tests:
482 properties['testfilter'] = tests
483
484 requests.append({
485 'scheduleBuild': {
486 'requestId': str(uuid.uuid4()),
487 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000488 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000489 'bucket': bucket,
490 'builder': builder,
491 },
492 'gerritChanges': gerrit_changes,
493 'properties': properties,
494 'tags': [
495 {'key': 'builder', 'value': builder},
496 {'key': 'user_agent', 'value': 'git_cl_try'},
497 ],
498 }
499 })
500
501 if not requests:
502 return
503
504 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000505 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000506
Edward Lemur2c210a42019-09-16 23:58:35 +0000507 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
508 http = authenticator.authorize(httplib2.Http())
509 http.force_exception_to_status_code = True
510
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000511 batch_request = {'requests': requests}
512 batch_response = _call_buildbucket(
Edward Lemur4c707a22019-09-24 21:13:43 +0000513 http, options.buildbucket_host, 'Batch', batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000514
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000515 errors = [
516 ' ' + response['error']['message']
517 for response in batch_response.get('responses', [])
518 if 'error' in response
519 ]
520 if errors:
521 raise BuildbucketResponseException(
522 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000523
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000524
tandrii221ab252016-10-06 08:12:04 -0700525def fetch_try_jobs(auth_config, changelist, buildbucket_host,
526 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000527 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000528
Quinten Yearsley983111f2019-09-26 17:18:48 +0000529 Returns a map from build ID to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000530 """
tandrii221ab252016-10-06 08:12:04 -0700531 assert buildbucket_host
532 assert changelist.GetIssue(), 'CL must be uploaded first'
533 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
534 patchset = patchset or changelist.GetMostRecentPatchset()
535 assert patchset, 'CL must be uploaded first'
536
537 codereview_url = changelist.GetCodereviewServer()
538 codereview_host = urlparse.urlparse(codereview_url).hostname
539 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540 if authenticator.has_cached_credentials():
541 http = authenticator.authorize(httplib2.Http())
542 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700543 print('Warning: Some results might be missing because %s' %
544 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000545 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 http = httplib2.Http()
547
548 http.force_exception_to_status_code = True
549
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000550 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700551 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700553 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 params = {'tag': 'buildset:%s' % buildset}
555
556 builds = {}
557 while True:
558 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700559 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 for build in content.get('builds', []):
563 builds[build['id']] = build
564 if 'next_cursor' in content:
565 params['start_cursor'] = content['next_cursor']
566 else:
567 break
568 return builds
569
570
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000571def _fetch_latest_builds(
572 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000573 """Fetches builds from the latest patchset that has builds (within
574 the last few patchsets).
575
576 Args:
577 auth_config (auth.AuthConfig): Auth info for Buildbucket
578 changelist (Changelist): The CL to fetch builds for
579 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000580 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
581 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000582 Returns:
583 A tuple (builds, patchset) where builds is a dict mapping from build ID to
584 build info from Buildbucket, and patchset is the patchset number where
585 those builds came from.
586 """
587 assert buildbucket_host
588 assert changelist.GetIssue(), 'CL must be uploaded first'
589 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000590 if latest_patchset is None:
591 assert changelist.GetMostRecentPatchset()
592 ps = changelist.GetMostRecentPatchset()
593 else:
594 assert latest_patchset > 0, latest_patchset
595 ps = latest_patchset
596
Quinten Yearsley983111f2019-09-26 17:18:48 +0000597 min_ps = max(1, ps - 5)
598 while ps >= min_ps:
599 builds = fetch_try_jobs(
600 auth_config, changelist, buildbucket_host, patchset=ps)
601 if len(builds):
602 return builds, ps
603 ps -= 1
604 return [], 0
605
606
607def _filter_failed(builds):
608 """Returns a list of buckets/builders that had failed builds.
609
610 Args:
611 builds (dict): Builds, in the format returned by fetch_try_jobs,
612 i.e. a dict mapping build ID to build info dict, which includes
613 the keys status, result, bucket, and builder_name.
614
615 Returns:
616 A dict of bucket to builder to tests (empty list). This is the same format
617 accepted by _trigger_try_jobs and returned by _get_bucket_map.
618 """
619 buckets = collections.defaultdict(dict)
620 for build in builds.values():
621 if build['status'] == 'COMPLETED' and build['result'] == 'FAILURE':
622 project = build['project']
623 bucket = build['bucket']
624 if bucket.startswith('luci.'):
625 # Assume legacy bucket name luci.<project>.<bucket>.
626 bucket = bucket.split('.')[2]
627 builder = _get_builder_from_build(build)
628 buckets[project + '/' + bucket][builder] = []
629 return buckets
630
631
qyearsleyeab3c042016-08-24 09:18:28 -0700632def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633 """Prints nicely result of fetch_try_jobs."""
634 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000635 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 return
637
638 # Make a copy, because we'll be modifying builds dictionary.
639 builds = builds.copy()
640 builder_names_cache = {}
641
642 def get_builder(b):
643 try:
644 return builder_names_cache[b['id']]
645 except KeyError:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000646 name = _get_builder_from_build(b)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000647 builder_names_cache[b['id']] = name
648 return name
649
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000650 if options.print_master:
651 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000652 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000653 max(len(str(get_builder(b))) for b in builds.itervalues()))
654 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000655 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656 else:
657 name_fmt = '%%-%ds' % (
658 max(len(str(get_builder(b))) for b in builds.itervalues()))
659 def get_name(b):
660 return name_fmt % get_builder(b)
661
662 def sort_key(b):
663 return b['status'], b.get('result'), get_name(b), b.get('url')
664
665 def pop(title, f, color=None, **kwargs):
666 """Pop matching builds from `builds` dict and print them."""
667
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000668 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000669 colorize = str
670 else:
671 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
672
673 result = []
674 for b in builds.values():
675 if all(b.get(k) == v for k, v in kwargs.iteritems()):
676 builds.pop(b['id'])
677 result.append(b)
678 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700679 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000680 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700681 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000682
683 total = len(builds)
684 pop(status='COMPLETED', result='SUCCESS',
685 title='Successes:', color=Fore.GREEN,
686 f=lambda b: (get_name(b), b.get('url')))
687 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
688 title='Infra Failures:', color=Fore.MAGENTA,
689 f=lambda b: (get_name(b), b.get('url')))
690 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
691 title='Failures:', color=Fore.RED,
692 f=lambda b: (get_name(b), b.get('url')))
693 pop(status='COMPLETED', result='CANCELED',
694 title='Canceled:', color=Fore.MAGENTA,
695 f=lambda b: (get_name(b),))
696 pop(status='COMPLETED', result='FAILURE',
697 failure_reason='INVALID_BUILD_DEFINITION',
698 title='Wrong master/builder name:', color=Fore.MAGENTA,
699 f=lambda b: (get_name(b),))
700 pop(status='COMPLETED', result='FAILURE',
701 title='Other failures:',
702 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
703 pop(status='COMPLETED',
704 title='Other finished:',
705 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
706 pop(status='STARTED',
707 title='Started:', color=Fore.YELLOW,
708 f=lambda b: (get_name(b), b.get('url')))
709 pop(status='SCHEDULED',
710 title='Scheduled:',
711 f=lambda b: (get_name(b), 'id=%s' % b['id']))
712 # The last section is just in case buildbucket API changes OR there is a bug.
713 pop(title='Other:',
714 f=lambda b: (get_name(b), 'id=%s' % b['id']))
715 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000716 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000717
718
Quinten Yearsley983111f2019-09-26 17:18:48 +0000719def _get_builder_from_build(build):
720 """Returns a builder name from a BB v1 build info dict."""
721 try:
722 parameters = json.loads(build['parameters_json'])
723 name = parameters['builder_name']
724 except (ValueError, KeyError) as error:
725 print('WARNING: Failed to get builder name for build %s: %s' % (
726 build['id'], error))
727 name = None
728 return name
729
730
Aiden Bennerc08566e2018-10-03 17:52:42 +0000731def _ComputeDiffLineRanges(files, upstream_commit):
732 """Gets the changed line ranges for each file since upstream_commit.
733
734 Parses a git diff on provided files and returns a dict that maps a file name
735 to an ordered list of range tuples in the form (start_line, count).
736 Ranges are in the same format as a git diff.
737 """
738 # If files is empty then diff_output will be a full diff.
739 if len(files) == 0:
740 return {}
741
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000742 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000743 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
744 diff_output = RunGit(diff_cmd)
745
746 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
747 # 2 capture groups
748 # 0 == fname of diff file
749 # 1 == 'diff_start,diff_count' or 'diff_start'
750 # will match each of
751 # diff --git a/foo.foo b/foo.py
752 # @@ -12,2 +14,3 @@
753 # @@ -12,2 +17 @@
754 # running re.findall on the above string with pattern will give
755 # [('foo.py', ''), ('', '14,3'), ('', '17')]
756
757 curr_file = None
758 line_diffs = {}
759 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
760 if match[0] != '':
761 # Will match the second filename in diff --git a/a.py b/b.py.
762 curr_file = match[0]
763 line_diffs[curr_file] = []
764 else:
765 # Matches +14,3
766 if ',' in match[1]:
767 diff_start, diff_count = match[1].split(',')
768 else:
769 # Single line changes are of the form +12 instead of +12,1.
770 diff_start = match[1]
771 diff_count = 1
772
773 diff_start = int(diff_start)
774 diff_count = int(diff_count)
775
776 # If diff_count == 0 this is a removal we can ignore.
777 line_diffs[curr_file].append((diff_start, diff_count))
778
779 return line_diffs
780
781
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000782def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000783 """Checks if a yapf file is in any parent directory of fpath until top_dir.
784
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000785 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000786 is found returns None. Uses yapf_config_cache as a cache for previously found
787 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000788 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000789 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000790 # Return result if we've already computed it.
791 if fpath in yapf_config_cache:
792 return yapf_config_cache[fpath]
793
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000794 parent_dir = os.path.dirname(fpath)
795 if os.path.isfile(fpath):
796 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000797 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000798 # Otherwise fpath is a directory
799 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
800 if os.path.isfile(yapf_file):
801 ret = yapf_file
802 elif fpath == top_dir or parent_dir == fpath:
803 # If we're at the top level directory, or if we're at root
804 # there is no provided style.
805 ret = None
806 else:
807 # Otherwise recurse on the current directory.
808 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000809 yapf_config_cache[fpath] = ret
810 return ret
811
812
qyearsley53f48a12016-09-01 10:45:13 -0700813def write_try_results_json(output_file, builds):
814 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
815
816 The input |builds| dict is assumed to be generated by Buildbucket.
817 Buildbucket documentation: http://goo.gl/G0s101
818 """
819
820 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800821 """Extracts some of the information from one build dict."""
822 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700823 return {
824 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700825 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800826 'builder_name': parameters.get('builder_name'),
827 'created_ts': build.get('created_ts'),
828 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700829 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800830 'result': build.get('result'),
831 'status': build.get('status'),
832 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700833 'url': build.get('url'),
834 }
835
836 converted = []
837 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000838 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700839 write_json(output_file, converted)
840
841
Aaron Gable13101a62018-02-09 13:20:41 -0800842def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000843 """Prints statistics about the change to the user."""
844 # --no-ext-diff is broken in some versions of Git, so try to work around
845 # this by overriding the environment (but there is still a problem if the
846 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000847 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000848 if 'GIT_EXTERNAL_DIFF' in env:
849 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000850
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000851 try:
852 stdout = sys.stdout.fileno()
853 except AttributeError:
854 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000855 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800856 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000857 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000858
859
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000860class BuildbucketResponseException(Exception):
861 pass
862
863
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000864class Settings(object):
865 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000866 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000867 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000868 self.tree_status_url = None
869 self.viewvc_url = None
870 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000871 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000872 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000873 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875
876 def LazyUpdateIfNeeded(self):
877 """Updates the settings from a codereview.settings file, if available."""
878 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000879 # The only value that actually changes the behavior is
880 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000881 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000882 error_ok=True
883 ).strip().lower()
884
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000885 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000886 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000887 LoadCodereviewSettingsFromFile(cr_settings_file)
888 self.updated = True
889
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000890 @staticmethod
891 def GetRelativeRoot():
892 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000893
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000894 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000895 if self.root is None:
896 self.root = os.path.abspath(self.GetRelativeRoot())
897 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000898
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899 def GetTreeStatusUrl(self, error_ok=False):
900 if not self.tree_status_url:
901 error_message = ('You must configure your tree status URL by running '
902 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000903 self.tree_status_url = self._GetConfig(
904 'rietveld.tree-status-url', error_ok=error_ok,
905 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000906 return self.tree_status_url
907
908 def GetViewVCUrl(self):
909 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000910 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000911 return self.viewvc_url
912
rmistry@google.com90752582014-01-14 21:04:50 +0000913 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000914 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000915
rmistry@google.com5626a922015-02-26 14:03:30 +0000916 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000917 run_post_upload_hook = self._GetConfig(
918 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000919 return run_post_upload_hook == "True"
920
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000921 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000922 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000923
ukai@chromium.orge8077812012-02-03 03:41:46 +0000924 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000925 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000926 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700927 self.is_gerrit = (
928 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000929 return self.is_gerrit
930
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000931 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000932 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000933 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700934 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
935 if self.squash_gerrit_uploads is None:
936 # Default is squash now (http://crbug.com/611892#c23).
937 self.squash_gerrit_uploads = not (
938 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
939 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000940 return self.squash_gerrit_uploads
941
tandriia60502f2016-06-20 02:01:53 -0700942 def GetSquashGerritUploadsOverride(self):
943 """Return True or False if codereview.settings should be overridden.
944
945 Returns None if no override has been defined.
946 """
947 # See also http://crbug.com/611892#c23
948 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
949 error_ok=True).strip()
950 if result == 'true':
951 return True
952 if result == 'false':
953 return False
954 return None
955
tandrii@chromium.org28253532016-04-14 13:46:56 +0000956 def GetGerritSkipEnsureAuthenticated(self):
957 """Return True if EnsureAuthenticated should not be done for Gerrit
958 uploads."""
959 if self.gerrit_skip_ensure_authenticated is None:
960 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000961 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000962 error_ok=True).strip() == 'true')
963 return self.gerrit_skip_ensure_authenticated
964
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000965 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000966 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000967 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000968 # Git requires single quotes for paths with spaces. We need to replace
969 # them with double quotes for Windows to treat such paths as a single
970 # path.
971 self.git_editor = self._GetConfig(
972 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000973 return self.git_editor or None
974
thestig@chromium.org44202a22014-03-11 19:22:18 +0000975 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000976 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000977 DEFAULT_LINT_REGEX)
978
979 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000980 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000981 DEFAULT_LINT_IGNORE_REGEX)
982
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000983 def _GetConfig(self, param, **kwargs):
984 self.LazyUpdateIfNeeded()
985 return RunGit(['config', param], **kwargs).strip()
986
987
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988def ShortBranchName(branch):
989 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000990 return branch.replace('refs/heads/', '', 1)
991
992
993def GetCurrentBranchRef():
994 """Returns branch ref (e.g., refs/heads/master) or None."""
995 return RunGit(['symbolic-ref', 'HEAD'],
996 stderr=subprocess2.VOID, error_ok=True).strip() or None
997
998
999def GetCurrentBranch():
1000 """Returns current branch or None.
1001
1002 For refs/heads/* branches, returns just last part. For others, full ref.
1003 """
1004 branchref = GetCurrentBranchRef()
1005 if branchref:
1006 return ShortBranchName(branchref)
1007 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008
1009
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001010class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001011 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001012 NONE = 'none'
1013 DRY_RUN = 'dry_run'
1014 COMMIT = 'commit'
1015
1016 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1017
1018
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001019class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001020 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001021 self.issue = issue
1022 self.patchset = patchset
1023 self.hostname = hostname
1024
1025 @property
1026 def valid(self):
1027 return self.issue is not None
1028
1029
Edward Lemurf38bc172019-09-03 21:02:13 +00001030def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001031 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1032 fail_result = _ParsedIssueNumberArgument()
1033
Edward Lemur678a6842019-10-03 22:25:05 +00001034 if isinstance(arg, int):
1035 return _ParsedIssueNumberArgument(issue=arg)
1036 if not isinstance(arg, basestring):
1037 return fail_result
1038
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001039 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001040 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001041 if not arg.startswith('http'):
1042 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001043
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001044 url = gclient_utils.UpgradeToHttps(arg)
1045 try:
1046 parsed_url = urlparse.urlparse(url)
1047 except ValueError:
1048 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001049
Edward Lemur678a6842019-10-03 22:25:05 +00001050 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1051 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1052 # Short urls like https://domain/<issue_number> can be used, but don't allow
1053 # specifying the patchset (you'd 404), but we allow that here.
1054 if parsed_url.path == '/':
1055 part = parsed_url.fragment
1056 else:
1057 part = parsed_url.path
1058
1059 match = re.match(
1060 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1061 if not match:
1062 return fail_result
1063
1064 issue = int(match.group('issue'))
1065 patchset = match.group('patchset')
1066 return _ParsedIssueNumberArgument(
1067 issue=issue,
1068 patchset=int(patchset) if patchset else None,
1069 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001070
1071
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001072def _create_description_from_log(args):
1073 """Pulls out the commit log to use as a base for the CL description."""
1074 log_args = []
1075 if len(args) == 1 and not args[0].endswith('.'):
1076 log_args = [args[0] + '..']
1077 elif len(args) == 1 and args[0].endswith('...'):
1078 log_args = [args[0][:-1]]
1079 elif len(args) == 2:
1080 log_args = [args[0] + '..' + args[1]]
1081 else:
1082 log_args = args[:] # Hope for the best!
1083 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1084
1085
Aaron Gablea45ee112016-11-22 15:14:38 -08001086class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001087 def __init__(self, issue, url):
1088 self.issue = issue
1089 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001090 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001091
1092 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001093 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001094 self.issue, self.url)
1095
1096
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001097_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001098 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001099 # TODO(tandrii): these two aren't known in Gerrit.
1100 'approval', 'disapproval'])
1101
1102
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001104 """Changelist works with one changelist in local branch.
1105
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001106 Notes:
1107 * Not safe for concurrent multi-{thread,process} use.
1108 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001109 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001110 """
1111
Edward Lemur125d60a2019-09-13 18:25:41 +00001112 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001113 """Create a new ChangeList instance.
1114
Edward Lemurf38bc172019-09-03 21:02:13 +00001115 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001116 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001118 global settings
1119 if not settings:
1120 # Happens when git_cl.py is used as a utility library.
1121 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001122
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 self.branchref = branchref
1124 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001125 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 self.branch = ShortBranchName(self.branchref)
1127 else:
1128 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001130 self.lookedup_issue = False
1131 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 self.has_description = False
1133 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001134 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001136 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001137 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001138 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001139 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001140
Edward Lemur125d60a2019-09-13 18:25:41 +00001141 # Lazily cached values.
1142 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1143 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1144 # Map from change number (issue) to its detail cache.
1145 self._detail_cache = {}
1146
1147 if codereview_host is not None:
1148 assert not codereview_host.startswith('https://'), codereview_host
1149 self._gerrit_host = codereview_host
1150 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001151
1152 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001153 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001154
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001155 The return value is a string suitable for passing to git cl with the --cc
1156 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001157 """
1158 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001159 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001160 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001161 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1162 return self.cc
1163
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001164 def GetCCListWithoutDefault(self):
1165 """Return the users cc'd on this CL excluding default ones."""
1166 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001167 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001168 return self.cc
1169
Daniel Cheng7227d212017-11-17 08:12:37 -08001170 def ExtendCC(self, more_cc):
1171 """Extends the list of users to cc on this CL based on the changed files."""
1172 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173
1174 def GetBranch(self):
1175 """Returns the short branch name, e.g. 'master'."""
1176 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001177 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001178 if not branchref:
1179 return None
1180 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181 self.branch = ShortBranchName(self.branchref)
1182 return self.branch
1183
1184 def GetBranchRef(self):
1185 """Returns the full branch name, e.g. 'refs/heads/master'."""
1186 self.GetBranch() # Poke the lazy loader.
1187 return self.branchref
1188
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001189 def ClearBranch(self):
1190 """Clears cached branch data of this object."""
1191 self.branch = self.branchref = None
1192
tandrii5d48c322016-08-18 16:19:37 -07001193 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1194 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1195 kwargs['branch'] = self.GetBranch()
1196 return _git_get_branch_config_value(key, default, **kwargs)
1197
1198 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1199 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1200 assert self.GetBranch(), (
1201 'this CL must have an associated branch to %sset %s%s' %
1202 ('un' if value is None else '',
1203 key,
1204 '' if value is None else ' to %r' % value))
1205 kwargs['branch'] = self.GetBranch()
1206 return _git_set_branch_config_value(key, value, **kwargs)
1207
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001208 @staticmethod
1209 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001210 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001211 e.g. 'origin', 'refs/heads/master'
1212 """
1213 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001214 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1215
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001216 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001217 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001219 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1220 error_ok=True).strip()
1221 if upstream_branch:
1222 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001224 # Else, try to guess the origin remote.
1225 remote_branches = RunGit(['branch', '-r']).split()
1226 if 'origin/master' in remote_branches:
1227 # Fall back on origin/master if it exits.
1228 remote = 'origin'
1229 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001231 DieWithError(
1232 'Unable to determine default branch to diff against.\n'
1233 'Either pass complete "git diff"-style arguments, like\n'
1234 ' git cl upload origin/master\n'
1235 'or verify this branch is set up to track another \n'
1236 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
1238 return remote, upstream_branch
1239
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001240 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001241 upstream_branch = self.GetUpstreamBranch()
1242 if not BranchExists(upstream_branch):
1243 DieWithError('The upstream for the current branch (%s) does not exist '
1244 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001245 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001246 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001247
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248 def GetUpstreamBranch(self):
1249 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001250 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001251 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001252 upstream_branch = upstream_branch.replace('refs/heads/',
1253 'refs/remotes/%s/' % remote)
1254 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1255 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256 self.upstream_branch = upstream_branch
1257 return self.upstream_branch
1258
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001259 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001260 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001261 remote, branch = None, self.GetBranch()
1262 seen_branches = set()
1263 while branch not in seen_branches:
1264 seen_branches.add(branch)
1265 remote, branch = self.FetchUpstreamTuple(branch)
1266 branch = ShortBranchName(branch)
1267 if remote != '.' or branch.startswith('refs/remotes'):
1268 break
1269 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001270 remotes = RunGit(['remote'], error_ok=True).split()
1271 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001272 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001273 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001275 logging.warn('Could not determine which remote this change is '
1276 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001277 else:
1278 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001279 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001280 branch = 'HEAD'
1281 if branch.startswith('refs/remotes'):
1282 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001283 elif branch.startswith('refs/branch-heads/'):
1284 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 else:
1286 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001287 return self._remote
1288
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001289 def GitSanityChecks(self, upstream_git_obj):
1290 """Checks git repo status and ensures diff is from local commits."""
1291
sbc@chromium.org79706062015-01-14 21:18:12 +00001292 if upstream_git_obj is None:
1293 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001294 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001295 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001296 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001297 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001298 return False
1299
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 # Verify the commit we're diffing against is in our current branch.
1301 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1302 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1303 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001304 print('ERROR: %s is not in the current branch. You may need to rebase '
1305 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 return False
1307
1308 # List the commits inside the diff, and verify they are all local.
1309 commits_in_diff = RunGit(
1310 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1311 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1312 remote_branch = remote_branch.strip()
1313 if code != 0:
1314 _, remote_branch = self.GetRemoteBranch()
1315
1316 commits_in_remote = RunGit(
1317 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1318
1319 common_commits = set(commits_in_diff) & set(commits_in_remote)
1320 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001321 print('ERROR: Your diff contains %d commits already in %s.\n'
1322 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1323 'the diff. If you are using a custom git flow, you can override'
1324 ' the reference used for this check with "git config '
1325 'gitcl.remotebranch <git-ref>".' % (
1326 len(common_commits), remote_branch, upstream_git_obj),
1327 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001328 return False
1329 return True
1330
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001331 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001332 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001333
1334 Returns None if it is not set.
1335 """
tandrii5d48c322016-08-18 16:19:37 -07001336 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001337
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001338 def GetRemoteUrl(self):
1339 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1340
1341 Returns None if there is no remote.
1342 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001343 is_cached, value = self._cached_remote_url
1344 if is_cached:
1345 return value
1346
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001347 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001348 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1349
Edward Lemur298f2cf2019-02-22 21:40:39 +00001350 # Check if the remote url can be parsed as an URL.
1351 host = urlparse.urlparse(url).netloc
1352 if host:
1353 self._cached_remote_url = (True, url)
1354 return url
1355
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001356 # If it cannot be parsed as an url, assume it is a local directory,
1357 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001358 logging.warning('"%s" doesn\'t appear to point to a git host. '
1359 'Interpreting it as a local directory.', url)
1360 if not os.path.isdir(url):
1361 logging.error(
1362 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001363 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001364 return None
1365
1366 cache_path = url
1367 url = RunGit(['config', 'remote.%s.url' % remote],
1368 error_ok=True,
1369 cwd=url).strip()
1370
1371 host = urlparse.urlparse(url).netloc
1372 if not host:
1373 logging.error(
1374 'Remote "%(remote)s" for branch "%(branch)s" points to '
1375 '"%(cache_path)s", but it is misconfigured.\n'
1376 '"%(cache_path)s" must be a git repo and must have a remote named '
1377 '"%(remote)s" pointing to the git host.', {
1378 'remote': remote,
1379 'cache_path': cache_path,
1380 'branch': self.GetBranch()})
1381 return None
1382
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001383 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001384 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001386 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001387 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001388 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001389 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001390 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001391 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001392 return self.issue
1393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 def GetIssueURL(self):
1395 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001396 issue = self.GetIssue()
1397 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001398 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001399 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001401 def GetDescription(self, pretty=False, force=False):
1402 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001404 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001405 self.has_description = True
1406 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001407 # Set width to 72 columns + 2 space indent.
1408 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001410 lines = self.description.splitlines()
1411 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 return self.description
1413
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001414 def GetDescriptionFooters(self):
1415 """Returns (non_footer_lines, footers) for the commit message.
1416
1417 Returns:
1418 non_footer_lines (list(str)) - Simple list of description lines without
1419 any footer. The lines do not contain newlines, nor does the list contain
1420 the empty line between the message and the footers.
1421 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1422 [("Change-Id", "Ideadbeef...."), ...]
1423 """
1424 raw_description = self.GetDescription()
1425 msg_lines, _, footers = git_footers.split_footers(raw_description)
1426 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001427 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001428 return msg_lines, footers
1429
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001430 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001431 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001432 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001433 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001434 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001435 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001436 return self.patchset
1437
1438 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001439 """Set this branch's patchset. If patchset=0, clears the patchset."""
1440 assert self.GetBranch()
1441 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001442 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001443 else:
1444 self.patchset = int(patchset)
1445 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001446 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001447
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001448 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001449 """Set this branch's issue. If issue isn't given, clears the issue."""
1450 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001451 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001452 issue = int(issue)
1453 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001454 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001455 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001456 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001457 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001458 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001459 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001460 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001461 else:
tandrii5d48c322016-08-18 16:19:37 -07001462 # Reset all of these just to be clean.
1463 reset_suffixes = [
1464 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001465 self.IssueConfigKey(),
1466 self.PatchsetConfigKey(),
1467 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001468 ] + self._PostUnsetIssueProperties()
1469 for prop in reset_suffixes:
1470 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001471 msg = RunGit(['log', '-1', '--format=%B']).strip()
1472 if msg and git_footers.get_footer_change_id(msg):
1473 print('WARNING: The change patched into this branch has a Change-Id. '
1474 'Removing it.')
1475 RunGit(['commit', '--amend', '-m',
1476 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001477 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001478 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001479 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001480
dnjba1b0f32016-09-02 12:37:42 -07001481 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001482 if not self.GitSanityChecks(upstream_branch):
1483 DieWithError('\nGit sanity check failure')
1484
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001485 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001486 if not root:
1487 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001488 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001489
1490 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001491 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001492 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001493 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001494 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001495 except subprocess2.CalledProcessError:
1496 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001497 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001498 'This branch probably doesn\'t exist anymore. To reset the\n'
1499 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001500 ' git branch --set-upstream-to origin/master %s\n'
1501 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001502 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001503
maruel@chromium.org52424302012-08-29 15:14:30 +00001504 issue = self.GetIssue()
1505 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001506 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001507 description = self.GetDescription()
1508 else:
1509 # If the change was never uploaded, use the log messages of all commits
1510 # up to the branch point, as git cl upload will prefill the description
1511 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001512 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1513 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001514
1515 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001516 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001517 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001518 name,
1519 description,
1520 absroot,
1521 files,
1522 issue,
1523 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001524 author,
1525 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001526
dsansomee2d6fd92016-09-08 00:10:47 -07001527 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001528 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001529 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001530 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001532 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1533 """Sets the description for this CL remotely.
1534
1535 You can get description_lines and footers with GetDescriptionFooters.
1536
1537 Args:
1538 description_lines (list(str)) - List of CL description lines without
1539 newline characters.
1540 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1541 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1542 `List-Of-Tokens`). It will be case-normalized so that each token is
1543 title-cased.
1544 """
1545 new_description = '\n'.join(description_lines)
1546 if footers:
1547 new_description += '\n'
1548 for k, v in footers:
1549 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1550 if not git_footers.FOOTER_PATTERN.match(foot):
1551 raise ValueError('Invalid footer %r' % foot)
1552 new_description += foot + '\n'
1553 self.UpdateDescription(new_description, force)
1554
Edward Lesmes8e282792018-04-03 18:50:29 -04001555 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001556 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1557 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001558 start = time_time()
1559 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001560 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1561 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001562 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001563 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001564 metrics.collector.add_repeated('sub_commands', {
1565 'command': 'presubmit',
1566 'execution_time': time_time() - start,
1567 'exit_code': 0 if result.should_continue() else 1,
1568 })
1569 return result
vapierfd77ac72016-06-16 08:33:57 -07001570 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001571 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001572
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573 def CMDUpload(self, options, git_diff_args, orig_args):
1574 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001575 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001577 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001578 else:
1579 if self.GetBranch() is None:
1580 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1581
1582 # Default to diffing against common ancestor of upstream branch
1583 base_branch = self.GetCommonAncestorWithUpstream()
1584 git_diff_args = [base_branch, 'HEAD']
1585
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001586 # Fast best-effort checks to abort before running potentially expensive
1587 # hooks if uploading is likely to fail anyway. Passing these checks does
1588 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001589 self.EnsureAuthenticated(force=options.force)
1590 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591
1592 # Apply watchlists on upload.
1593 change = self.GetChange(base_branch, None)
1594 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1595 files = [f.LocalPath() for f in change.AffectedFiles()]
1596 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001597 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598
1599 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001600 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 # Set the reviewer list now so that presubmit checks can access it.
1602 change_description = ChangeDescription(change.FullDescriptionText())
1603 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001604 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001605 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606 change)
1607 change.SetDescriptionText(change_description.description)
1608 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001609 may_prompt=not options.force,
1610 verbose=options.verbose,
1611 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001612 if not hook_results.should_continue():
1613 return 1
1614 if not options.reviewers and hook_results.reviewers:
1615 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001616 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001617
Aaron Gable13101a62018-02-09 13:20:41 -08001618 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001619 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001621 _git_set_branch_config_value('last-upload-hash',
1622 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001623 # Run post upload hooks, if specified.
1624 if settings.GetRunPostUploadHook():
1625 presubmit_support.DoPostUploadExecuter(
1626 change,
1627 self,
1628 settings.GetRoot(),
1629 options.verbose,
1630 sys.stdout)
1631
1632 # Upload all dependencies if specified.
1633 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001634 print()
1635 print('--dependencies has been specified.')
1636 print('All dependent local branches will be re-uploaded.')
1637 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001638 # Remove the dependencies flag from args so that we do not end up in a
1639 # loop.
1640 orig_args.remove('--dependencies')
1641 ret = upload_branch_deps(self, orig_args)
1642 return ret
1643
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001644 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001645 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001646
1647 Issue must have been already uploaded and known.
1648 """
1649 assert new_state in _CQState.ALL_STATES
1650 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001651 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001652 vote_map = {
1653 _CQState.NONE: 0,
1654 _CQState.DRY_RUN: 1,
1655 _CQState.COMMIT: 2,
1656 }
1657 labels = {'Commit-Queue': vote_map[new_state]}
1658 notify = False if new_state == _CQState.DRY_RUN else None
1659 gerrit_util.SetReview(
1660 self._GetGerritHost(), self._GerritChangeIdentifier(),
1661 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001662 return 0
1663 except KeyboardInterrupt:
1664 raise
1665 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001666 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001667 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001668 ' * Your project has no CQ,\n'
1669 ' * You don\'t have permission to change the CQ state,\n'
1670 ' * There\'s a bug in this code (see stack trace below).\n'
1671 'Consider specifying which bots to trigger manually or asking your '
1672 'project owners for permissions or contacting Chrome Infra at:\n'
1673 'https://www.chromium.org/infra\n\n' %
1674 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001675 # Still raise exception so that stack trace is printed.
1676 raise
1677
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001678 def _GetGerritHost(self):
1679 # Lazy load of configs.
1680 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001681 if self._gerrit_host and '.' not in self._gerrit_host:
1682 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1683 # This happens for internal stuff http://crbug.com/614312.
1684 parsed = urlparse.urlparse(self.GetRemoteUrl())
1685 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001686 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001687 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001688 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1689 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001690 return self._gerrit_host
1691
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001692 def _GetGitHost(self):
1693 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001694 remote_url = self.GetRemoteUrl()
1695 if not remote_url:
1696 return None
1697 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001699 def GetCodereviewServer(self):
1700 if not self._gerrit_server:
1701 # If we're on a branch then get the server potentially associated
1702 # with that branch.
1703 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001704 self._gerrit_server = self._GitGetBranchConfigValue(
1705 self.CodereviewServerConfigKey())
1706 if self._gerrit_server:
1707 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001708 if not self._gerrit_server:
1709 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1710 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001711 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001712 parts[0] = parts[0] + '-review'
1713 self._gerrit_host = '.'.join(parts)
1714 self._gerrit_server = 'https://%s' % self._gerrit_host
1715 return self._gerrit_server
1716
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001717 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001718 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001719 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001720 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001721 logging.warn('can\'t detect Gerrit project.')
1722 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001723 project = urlparse.urlparse(remote_url).path.strip('/')
1724 if project.endswith('.git'):
1725 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001726 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1727 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1728 # gitiles/git-over-https protocol. E.g.,
1729 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1730 # as
1731 # https://chromium.googlesource.com/v8/v8
1732 if project.startswith('a/'):
1733 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001734 return project
1735
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001736 def _GerritChangeIdentifier(self):
1737 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1738
1739 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001740 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001741 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001742 project = self._GetGerritProject()
1743 if project:
1744 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1745 # Fall back on still unique, but less efficient change number.
1746 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001747
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001748 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001749 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001750 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001751
tandrii5d48c322016-08-18 16:19:37 -07001752 @classmethod
1753 def PatchsetConfigKey(cls):
1754 return 'gerritpatchset'
1755
1756 @classmethod
1757 def CodereviewServerConfigKey(cls):
1758 return 'gerritserver'
1759
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001760 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001761 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001762 if settings.GetGerritSkipEnsureAuthenticated():
1763 # For projects with unusual authentication schemes.
1764 # See http://crbug.com/603378.
1765 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001766
1767 # Check presence of cookies only if using cookies-based auth method.
1768 cookie_auth = gerrit_util.Authenticator.get()
1769 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001770 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001771
Daniel Chengcf6269b2019-05-18 01:02:12 +00001772 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1773 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001774 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001775 return
1776
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001777 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001778 self.GetCodereviewServer()
1779 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001780 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001781
1782 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1783 git_auth = cookie_auth.get_auth_header(git_host)
1784 if gerrit_auth and git_auth:
1785 if gerrit_auth == git_auth:
1786 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001787 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001788 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001789 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001790 ' %s\n'
1791 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001792 ' Consider running the following command:\n'
1793 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001794 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001795 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001796 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001797 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001798 cookie_auth.get_new_password_message(git_host)))
1799 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001800 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001801 return
1802 else:
1803 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001804 ([] if gerrit_auth else [self._gerrit_host]) +
1805 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001806 DieWithError('Credentials for the following hosts are required:\n'
1807 ' %s\n'
1808 'These are read from %s (or legacy %s)\n'
1809 '%s' % (
1810 '\n '.join(missing),
1811 cookie_auth.get_gitcookies_path(),
1812 cookie_auth.get_netrc_path(),
1813 cookie_auth.get_new_password_message(git_host)))
1814
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001815 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001816 if not self.GetIssue():
1817 return
1818
1819 # Warm change details cache now to avoid RPCs later, reducing latency for
1820 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001821 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001822 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001823
1824 status = self._GetChangeDetail()['status']
1825 if status in ('MERGED', 'ABANDONED'):
1826 DieWithError('Change %s has been %s, new uploads are not allowed' %
1827 (self.GetIssueURL(),
1828 'submitted' if status == 'MERGED' else 'abandoned'))
1829
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001830 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1831 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1832 # Apparently this check is not very important? Otherwise get_auth_email
1833 # could have been added to other implementations of Authenticator.
1834 cookies_auth = gerrit_util.Authenticator.get()
1835 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001836 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001837
1838 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001839 if self.GetIssueOwner() == cookies_user:
1840 return
1841 logging.debug('change %s owner is %s, cookies user is %s',
1842 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001843 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001844 # so ask what Gerrit thinks of this user.
1845 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1846 if details['email'] == self.GetIssueOwner():
1847 return
1848 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001849 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001850 'as %s.\n'
1851 'Uploading may fail due to lack of permissions.' %
1852 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1853 confirm_or_exit(action='upload')
1854
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001855 def _PostUnsetIssueProperties(self):
1856 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001857 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001858
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001859 def GetGerritObjForPresubmit(self):
1860 return presubmit_support.GerritAccessor(self._GetGerritHost())
1861
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001862 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001863 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864 or CQ status, assuming adherence to a common workflow.
1865
1866 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 * 'error' - error from review tool (including deleted issues)
1868 * 'unsent' - no reviewers added
1869 * 'waiting' - waiting for review
1870 * 'reply' - waiting for uploader to reply to review
1871 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001872 * 'dry-run' - dry-running in the CQ
1873 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001874 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001875 """
1876 if not self.GetIssue():
1877 return None
1878
1879 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001880 data = self._GetChangeDetail([
1881 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001882 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001883 return 'error'
1884
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001885 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001886 return 'closed'
1887
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001888 cq_label = data['labels'].get('Commit-Queue', {})
1889 max_cq_vote = 0
1890 for vote in cq_label.get('all', []):
1891 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1892 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001893 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001894 if max_cq_vote == 1:
1895 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001896
Aaron Gable9ab38c62017-04-06 14:36:33 -07001897 if data['labels'].get('Code-Review', {}).get('approved'):
1898 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001899
1900 if not data.get('reviewers', {}).get('REVIEWER', []):
1901 return 'unsent'
1902
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001903 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001904 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1905 last_message_author = messages.pop().get('author', {})
1906 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001907 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1908 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001909 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001910 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001911 if last_message_author.get('_account_id') == owner:
1912 # Most recent message was by owner.
1913 return 'waiting'
1914 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001915 # Some reply from non-owner.
1916 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001917
1918 # Somehow there are no messages even though there are reviewers.
1919 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001920
1921 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001922 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001923 patchset = data['revisions'][data['current_revision']]['_number']
1924 self.SetPatchset(patchset)
1925 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001926
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001927 def FetchDescription(self, force=False):
1928 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1929 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001930 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001931 return data['revisions'][current_rev]['commit']['message'].encode(
1932 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001933
dsansomee2d6fd92016-09-08 00:10:47 -07001934 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001935 if gerrit_util.HasPendingChangeEdit(
1936 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001937 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001938 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001939 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001940 'unpublished edit. Either publish the edit in the Gerrit web UI '
1941 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001942
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001943 gerrit_util.DeletePendingChangeEdit(
1944 self._GetGerritHost(), self._GerritChangeIdentifier())
1945 gerrit_util.SetCommitMessage(
1946 self._GetGerritHost(), self._GerritChangeIdentifier(),
1947 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948
Aaron Gable636b13f2017-07-14 10:42:48 -07001949 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001950 gerrit_util.SetReview(
1951 self._GetGerritHost(), self._GerritChangeIdentifier(),
1952 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001953
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001954 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001955 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001956 # CURRENT_REVISION is included to get the latest patchset so that
1957 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001958 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001959 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1960 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001961 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001962 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001963 robot_file_comments = gerrit_util.GetChangeRobotComments(
1964 self._GetGerritHost(), self._GerritChangeIdentifier())
1965
1966 # Add the robot comments onto the list of comments, but only
1967 # keep those that are from the latest pachset.
1968 latest_patch_set = self.GetMostRecentPatchset()
1969 for path, robot_comments in robot_file_comments.iteritems():
1970 line_comments = file_comments.setdefault(path, [])
1971 line_comments.extend(
1972 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001973
1974 # Build dictionary of file comments for easy access and sorting later.
1975 # {author+date: {path: {patchset: {line: url+message}}}}
1976 comments = collections.defaultdict(
1977 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1978 for path, line_comments in file_comments.iteritems():
1979 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001980 tag = comment.get('tag', '')
1981 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001982 continue
1983 key = (comment['author']['email'], comment['updated'])
1984 if comment.get('side', 'REVISION') == 'PARENT':
1985 patchset = 'Base'
1986 else:
1987 patchset = 'PS%d' % comment['patch_set']
1988 line = comment.get('line', 0)
1989 url = ('https://%s/c/%s/%s/%s#%s%s' %
1990 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1991 'b' if comment.get('side') == 'PARENT' else '',
1992 str(line) if line else ''))
1993 comments[key][path][patchset][line] = (url, comment['message'])
1994
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001995 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001996 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001997 summary = self._BuildCommentSummary(msg, comments, readable)
1998 if summary:
1999 summaries.append(summary)
2000 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002001
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002002 @staticmethod
2003 def _BuildCommentSummary(msg, comments, readable):
2004 key = (msg['author']['email'], msg['date'])
2005 # Don't bother showing autogenerated messages that don't have associated
2006 # file or line comments. this will filter out most autogenerated
2007 # messages, but will keep robot comments like those from Tricium.
2008 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2009 if is_autogenerated and not comments.get(key):
2010 return None
2011 message = msg['message']
2012 # Gerrit spits out nanoseconds.
2013 assert len(msg['date'].split('.')[-1]) == 9
2014 date = datetime.datetime.strptime(msg['date'][:-3],
2015 '%Y-%m-%d %H:%M:%S.%f')
2016 if key in comments:
2017 message += '\n'
2018 for path, patchsets in sorted(comments.get(key, {}).items()):
2019 if readable:
2020 message += '\n%s' % path
2021 for patchset, lines in sorted(patchsets.items()):
2022 for line, (url, content) in sorted(lines.items()):
2023 if line:
2024 line_str = 'Line %d' % line
2025 path_str = '%s:%d:' % (path, line)
2026 else:
2027 line_str = 'File comment'
2028 path_str = '%s:0:' % path
2029 if readable:
2030 message += '\n %s, %s: %s' % (patchset, line_str, url)
2031 message += '\n %s\n' % content
2032 else:
2033 message += '\n%s ' % path_str
2034 message += '\n%s\n' % content
2035
2036 return _CommentSummary(
2037 date=date,
2038 message=message,
2039 sender=msg['author']['email'],
2040 autogenerated=is_autogenerated,
2041 # These could be inferred from the text messages and correlated with
2042 # Code-Review label maximum, however this is not reliable.
2043 # Leaving as is until the need arises.
2044 approval=False,
2045 disapproval=False,
2046 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002047
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002048 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002049 gerrit_util.AbandonChange(
2050 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002051
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002052 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002053 gerrit_util.SubmitChange(
2054 self._GetGerritHost(), self._GerritChangeIdentifier(),
2055 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002056
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002057 def _GetChangeDetail(self, options=None, no_cache=False):
2058 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002059
2060 If fresh data is needed, set no_cache=True which will clear cache and
2061 thus new data will be fetched from Gerrit.
2062 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002063 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002064 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002065
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002066 # Optimization to avoid multiple RPCs:
2067 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2068 'CURRENT_COMMIT' not in options):
2069 options.append('CURRENT_COMMIT')
2070
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002071 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002072 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002073 options = [o.upper() for o in options]
2074
2075 # Check in cache first unless no_cache is True.
2076 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002077 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002078 else:
2079 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002080 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002081 # Assumption: data fetched before with extra options is suitable
2082 # for return for a smaller set of options.
2083 # For example, if we cached data for
2084 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2085 # and request is for options=[CURRENT_REVISION],
2086 # THEN we can return prior cached data.
2087 if options_set.issubset(cached_options_set):
2088 return data
2089
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002090 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002091 data = gerrit_util.GetChangeDetail(
2092 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002093 except gerrit_util.GerritError as e:
2094 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002095 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002096 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002097
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002098 self._detail_cache.setdefault(cache_key, []).append(
2099 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002100 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002101
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002102 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002103 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002104 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002105 data = gerrit_util.GetChangeCommit(
2106 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002107 except gerrit_util.GerritError as e:
2108 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002109 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002110 raise
agable32978d92016-11-01 12:55:02 -07002111 return data
2112
Karen Qian40c19422019-03-13 21:28:29 +00002113 def _IsCqConfigured(self):
2114 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002115 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002116 return False
2117 # TODO(crbug/753213): Remove temporary hack
2118 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002119 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002120 detail['branch'].startswith('refs/branch-heads/')):
2121 return False
2122 return True
2123
Olivier Robin75ee7252018-04-13 10:02:56 +02002124 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002125 if git_common.is_dirty_git_tree('land'):
2126 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002127
tandriid60367b2016-06-22 05:25:12 -07002128 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002129 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002130 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002131 'which can test and land changes for you. '
2132 'Are you sure you wish to bypass it?\n',
2133 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002134 differs = True
tandriic4344b52016-08-29 06:04:54 -07002135 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002136 # Note: git diff outputs nothing if there is no diff.
2137 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002138 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002139 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002140 if detail['current_revision'] == last_upload:
2141 differs = False
2142 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002143 print('WARNING: Local branch contents differ from latest uploaded '
2144 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002145 if differs:
2146 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002147 confirm_or_exit(
2148 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2149 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002150 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002151 elif not bypass_hooks:
2152 hook_results = self.RunHook(
2153 committing=True,
2154 may_prompt=not force,
2155 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002156 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2157 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002158 if not hook_results.should_continue():
2159 return 1
2160
2161 self.SubmitIssue(wait_for_merge=True)
2162 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002163 links = self._GetChangeCommit().get('web_links', [])
2164 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002165 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002166 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002167 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002168 return 0
2169
Edward Lemurf38bc172019-09-03 21:02:13 +00002170 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 assert parsed_issue_arg.valid
2172
Edward Lemur125d60a2019-09-13 18:25:41 +00002173 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002174
2175 if parsed_issue_arg.hostname:
2176 self._gerrit_host = parsed_issue_arg.hostname
2177 self._gerrit_server = 'https://%s' % self._gerrit_host
2178
tandriic2405f52016-10-10 08:13:15 -07002179 try:
2180 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002181 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002182 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183
2184 if not parsed_issue_arg.patchset:
2185 # Use current revision by default.
2186 revision_info = detail['revisions'][detail['current_revision']]
2187 patchset = int(revision_info['_number'])
2188 else:
2189 patchset = parsed_issue_arg.patchset
2190 for revision_info in detail['revisions'].itervalues():
2191 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2192 break
2193 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002194 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002195 (parsed_issue_arg.patchset, self.GetIssue()))
2196
Edward Lemur125d60a2019-09-13 18:25:41 +00002197 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002198 if remote_url.endswith('.git'):
2199 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002200 remote_url = remote_url.rstrip('/')
2201
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002203 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002204
2205 if remote_url != fetch_info['url']:
2206 DieWithError('Trying to patch a change from %s but this repo appears '
2207 'to be %s.' % (fetch_info['url'], remote_url))
2208
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002210
Aaron Gable62619a32017-06-16 08:22:09 -07002211 if force:
2212 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2213 print('Checked out commit for change %i patchset %i locally' %
2214 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002215 elif nocommit:
2216 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2217 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002218 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002219 RunGit(['cherry-pick', 'FETCH_HEAD'])
2220 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002221 (parsed_issue_arg.issue, patchset))
2222 print('Note: this created a local commit which does not have '
2223 'the same hash as the one uploaded for review. This will make '
2224 'uploading changes based on top of this branch difficult.\n'
2225 'If you want to do that, use "git cl patch --force" instead.')
2226
Stefan Zagerd08043c2017-10-12 12:07:02 -07002227 if self.GetBranch():
2228 self.SetIssue(parsed_issue_arg.issue)
2229 self.SetPatchset(patchset)
2230 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2231 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2232 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2233 else:
2234 print('WARNING: You are in detached HEAD state.\n'
2235 'The patch has been applied to your checkout, but you will not be '
2236 'able to upload a new patch set to the gerrit issue.\n'
2237 'Try using the \'-b\' option if you would like to work on a '
2238 'branch and/or upload a new patch set.')
2239
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002240 return 0
2241
tandrii16e0b4e2016-06-07 10:34:28 -07002242 def _GerritCommitMsgHookCheck(self, offer_removal):
2243 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2244 if not os.path.exists(hook):
2245 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002246 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2247 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002248 data = gclient_utils.FileRead(hook)
2249 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2250 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002251 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002252 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002253 'and may interfere with it in subtle ways.\n'
2254 'We recommend you remove the commit-msg hook.')
2255 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002256 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002257 gclient_utils.rm_file_or_tree(hook)
2258 print('Gerrit commit-msg hook removed.')
2259 else:
2260 print('OK, will keep Gerrit commit-msg hook in place.')
2261
Edward Lemur1b52d872019-05-09 21:12:12 +00002262 def _CleanUpOldTraces(self):
2263 """Keep only the last |MAX_TRACES| traces."""
2264 try:
2265 traces = sorted([
2266 os.path.join(TRACES_DIR, f)
2267 for f in os.listdir(TRACES_DIR)
2268 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2269 and not f.startswith('tmp'))
2270 ])
2271 traces_to_delete = traces[:-MAX_TRACES]
2272 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002273 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002274 except OSError:
2275 print('WARNING: Failed to remove old git traces from\n'
2276 ' %s'
2277 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002278
Edward Lemur5737f022019-05-17 01:24:00 +00002279 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002280 """Zip and write the git push traces stored in traces_dir."""
2281 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002282 traces_zip = trace_name + '-traces'
2283 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002284 # Create a temporary dir to store git config and gitcookies in. It will be
2285 # compressed and stored next to the traces.
2286 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002287 git_info_zip = trace_name + '-git-info'
2288
Edward Lemur5737f022019-05-17 01:24:00 +00002289 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002290 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002291 git_push_metadata['now'] = git_push_metadata['now'].decode(
2292 sys.stdin.encoding)
2293
Edward Lemur1b52d872019-05-09 21:12:12 +00002294 git_push_metadata['trace_name'] = trace_name
2295 gclient_utils.FileWrite(
2296 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2297
2298 # Keep only the first 6 characters of the git hashes on the packet
2299 # trace. This greatly decreases size after compression.
2300 packet_traces = os.path.join(traces_dir, 'trace-packet')
2301 if os.path.isfile(packet_traces):
2302 contents = gclient_utils.FileRead(packet_traces)
2303 gclient_utils.FileWrite(
2304 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2305 shutil.make_archive(traces_zip, 'zip', traces_dir)
2306
2307 # Collect and compress the git config and gitcookies.
2308 git_config = RunGit(['config', '-l'])
2309 gclient_utils.FileWrite(
2310 os.path.join(git_info_dir, 'git-config'),
2311 git_config)
2312
2313 cookie_auth = gerrit_util.Authenticator.get()
2314 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2315 gitcookies_path = cookie_auth.get_gitcookies_path()
2316 if os.path.isfile(gitcookies_path):
2317 gitcookies = gclient_utils.FileRead(gitcookies_path)
2318 gclient_utils.FileWrite(
2319 os.path.join(git_info_dir, 'gitcookies'),
2320 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2321 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2322
Edward Lemur1b52d872019-05-09 21:12:12 +00002323 gclient_utils.rmtree(git_info_dir)
2324
2325 def _RunGitPushWithTraces(
2326 self, change_desc, refspec, refspec_opts, git_push_metadata):
2327 """Run git push and collect the traces resulting from the execution."""
2328 # Create a temporary directory to store traces in. Traces will be compressed
2329 # and stored in a 'traces' dir inside depot_tools.
2330 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002331 trace_name = os.path.join(
2332 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002333
2334 env = os.environ.copy()
2335 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2336 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002337 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002338 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2339 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2340 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2341
2342 try:
2343 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002344 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002345 before_push = time_time()
2346 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002347 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002348 env=env,
2349 print_stdout=True,
2350 # Flush after every line: useful for seeing progress when running as
2351 # recipe.
2352 filter_fn=lambda _: sys.stdout.flush())
2353 except subprocess2.CalledProcessError as e:
2354 push_returncode = e.returncode
2355 DieWithError('Failed to create a change. Please examine output above '
2356 'for the reason of the failure.\n'
2357 'Hint: run command below to diagnose common Git/Gerrit '
2358 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002359 ' git cl creds-check\n'
2360 '\n'
2361 'If git-cl is not working correctly, file a bug under the '
2362 'Infra>SDK component including the files below.\n'
2363 'Review the files before upload, since they might contain '
2364 'sensitive information.\n'
2365 'Set the Restrict-View-Google label so that they are not '
2366 'publicly accessible.\n'
2367 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002368 change_desc)
2369 finally:
2370 execution_time = time_time() - before_push
2371 metrics.collector.add_repeated('sub_commands', {
2372 'command': 'git push',
2373 'execution_time': execution_time,
2374 'exit_code': push_returncode,
2375 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2376 })
2377
Edward Lemur1b52d872019-05-09 21:12:12 +00002378 git_push_metadata['execution_time'] = execution_time
2379 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002380 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002381
Edward Lemur1b52d872019-05-09 21:12:12 +00002382 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002383 gclient_utils.rmtree(traces_dir)
2384
2385 return push_stdout
2386
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002387 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002389 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002390 # Load default for user, repo, squash=true, in this order.
2391 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002392
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002394 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002395 # This may be None; default fallback value is determined in logic below.
2396 title = options.title
2397
Dominic Battre7d1c4842017-10-27 09:17:28 +02002398 # Extract bug number from branch name.
2399 bug = options.bug
2400 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2401 if not bug and match:
2402 bug = match.group(1)
2403
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002404 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002405 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 if self.GetIssue():
2407 # Try to get the message from a previous upload.
2408 message = self.GetDescription()
2409 if not message:
2410 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002411 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002412 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002413 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002414 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002415 # When uploading a subsequent patchset, -m|--message is taken
2416 # as the patchset title if --title was not provided.
2417 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002418 else:
2419 default_title = RunGit(
2420 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002421 if options.force:
2422 title = default_title
2423 else:
2424 title = ask_for_data(
2425 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 change_id = self._GetChangeDetail()['change_id']
2427 while True:
2428 footer_change_ids = git_footers.get_footer_change_id(message)
2429 if footer_change_ids == [change_id]:
2430 break
2431 if not footer_change_ids:
2432 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002433 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002434 continue
2435 # There is already a valid footer but with different or several ids.
2436 # Doing this automatically is non-trivial as we don't want to lose
2437 # existing other footers, yet we want to append just 1 desired
2438 # Change-Id. Thus, just create a new footer, but let user verify the
2439 # new description.
2440 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002441 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002442 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002443 print(
2444 'WARNING: change %s has Change-Id footer(s):\n'
2445 ' %s\n'
2446 'but change has Change-Id %s, according to Gerrit.\n'
2447 'Please, check the proposed correction to the description, '
2448 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2449 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2450 change_id))
2451 confirm_or_exit(action='edit')
2452 change_desc.prompt()
2453
2454 message = change_desc.description
2455 if not message:
2456 DieWithError("Description is empty. Aborting...")
2457
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002458 # Continue the while loop.
2459 # Sanity check of this code - we should end up with proper message
2460 # footer.
2461 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002462 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002463 else: # if not self.GetIssue()
2464 if options.message:
2465 message = options.message
2466 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002467 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002468 if options.title:
2469 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002470 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002471 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002472 change_desc.prompt()
2473
Aaron Gableb56ad332017-01-06 15:24:31 -08002474 # On first upload, patchset title is always this string, while
2475 # --title flag gets converted to first line of message.
2476 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002477 if not change_desc.description:
2478 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002479 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002480 if len(change_ids) > 1:
2481 DieWithError('too many Change-Id footers, at most 1 allowed.')
2482 if not change_ids:
2483 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002484 change_desc.set_description(git_footers.add_footer_change_id(
2485 change_desc.description,
2486 GenerateGerritChangeId(change_desc.description)))
2487 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002488 assert len(change_ids) == 1
2489 change_id = change_ids[0]
2490
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002491 if options.reviewers or options.tbrs or options.add_owners_to:
2492 change_desc.update_reviewers(options.reviewers, options.tbrs,
2493 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002494 if options.preserve_tryjobs:
2495 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002496
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002497 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002498 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2499 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002500 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002501 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2502 desc_tempfile.write(change_desc.description)
2503 desc_tempfile.close()
2504 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2505 '-F', desc_tempfile.name]).strip()
2506 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002507 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002509 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002510 if not change_desc.description:
2511 DieWithError("Description is empty. Aborting...")
2512
2513 if not git_footers.get_footer_change_id(change_desc.description):
2514 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002515 change_desc.set_description(
2516 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002517 if options.reviewers or options.tbrs or options.add_owners_to:
2518 change_desc.update_reviewers(options.reviewers, options.tbrs,
2519 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002520 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002521 # For no-squash mode, we assume the remote called "origin" is the one we
2522 # want. It is not worthwhile to support different workflows for
2523 # no-squash mode.
2524 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002525 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2526
2527 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002528 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002529 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2530 ref_to_push)]).splitlines()
2531 if len(commits) > 1:
2532 print('WARNING: This will upload %d commits. Run the following command '
2533 'to see which commits will be uploaded: ' % len(commits))
2534 print('git log %s..%s' % (parent, ref_to_push))
2535 print('You can also use `git squash-branch` to squash these into a '
2536 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002537 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002538
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002539 if options.reviewers or options.tbrs or options.add_owners_to:
2540 change_desc.update_reviewers(options.reviewers, options.tbrs,
2541 options.add_owners_to, change)
2542
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002543 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002544 cc = []
2545 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2546 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2547 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002548 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002549 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002550 if options.cc:
2551 cc.extend(options.cc)
2552 cc = filter(None, [email.strip() for email in cc])
2553 if change_desc.get_cced():
2554 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002555 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2556 valid_accounts = set(reviewers + cc)
2557 # TODO(crbug/877717): relax this for all hosts.
2558 else:
2559 valid_accounts = gerrit_util.ValidAccounts(
2560 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002561 logging.info('accounts %s are recognized, %s invalid',
2562 sorted(valid_accounts),
2563 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002564
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002565 # Extra options that can be specified at push time. Doc:
2566 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002567 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002568
Aaron Gable844cf292017-06-28 11:32:59 -07002569 # By default, new changes are started in WIP mode, and subsequent patchsets
2570 # don't send email. At any time, passing --send-mail will mark the change
2571 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002572 if options.send_mail:
2573 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002574 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002575 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002576 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002577 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002578 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002579
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002580 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002581 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002582
Aaron Gable9b713dd2016-12-14 16:04:21 -08002583 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002584 # Punctuation and whitespace in |title| must be percent-encoded.
2585 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002586
agablec6787972016-09-09 16:13:34 -07002587 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002588 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002589
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002590 for r in sorted(reviewers):
2591 if r in valid_accounts:
2592 refspec_opts.append('r=%s' % r)
2593 reviewers.remove(r)
2594 else:
2595 # TODO(tandrii): this should probably be a hard failure.
2596 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2597 % r)
2598 for c in sorted(cc):
2599 # refspec option will be rejected if cc doesn't correspond to an
2600 # account, even though REST call to add such arbitrary cc may succeed.
2601 if c in valid_accounts:
2602 refspec_opts.append('cc=%s' % c)
2603 cc.remove(c)
2604
rmistry9eadede2016-09-19 11:22:43 -07002605 if options.topic:
2606 # Documentation on Gerrit topics is here:
2607 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002608 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002609
Edward Lemur687ca902018-12-05 02:30:30 +00002610 if options.enable_auto_submit:
2611 refspec_opts.append('l=Auto-Submit+1')
2612 if options.use_commit_queue:
2613 refspec_opts.append('l=Commit-Queue+2')
2614 elif options.cq_dry_run:
2615 refspec_opts.append('l=Commit-Queue+1')
2616
2617 if change_desc.get_reviewers(tbr_only=True):
2618 score = gerrit_util.GetCodeReviewTbrScore(
2619 self._GetGerritHost(),
2620 self._GetGerritProject())
2621 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002622
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002623 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002624 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002625 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002626 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002627 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2628
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002629 refspec_suffix = ''
2630 if refspec_opts:
2631 refspec_suffix = '%' + ','.join(refspec_opts)
2632 assert ' ' not in refspec_suffix, (
2633 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2634 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2635
Edward Lemur1b52d872019-05-09 21:12:12 +00002636 git_push_metadata = {
2637 'gerrit_host': self._GetGerritHost(),
2638 'title': title or '<untitled>',
2639 'change_id': change_id,
2640 'description': change_desc.description,
2641 }
2642 push_stdout = self._RunGitPushWithTraces(
2643 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002644
2645 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002646 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002647 change_numbers = [m.group(1)
2648 for m in map(regex.match, push_stdout.splitlines())
2649 if m]
2650 if len(change_numbers) != 1:
2651 DieWithError(
2652 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002653 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002654 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002655 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002656
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002657 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002658 # GetIssue() is not set in case of non-squash uploads according to tests.
2659 # TODO(agable): non-squash uploads in git cl should be removed.
2660 gerrit_util.AddReviewers(
2661 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002662 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002663 reviewers, cc,
2664 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002665
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002666 return 0
2667
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002668 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2669 change_desc):
2670 """Computes parent of the generated commit to be uploaded to Gerrit.
2671
2672 Returns revision or a ref name.
2673 """
2674 if custom_cl_base:
2675 # Try to avoid creating additional unintended CLs when uploading, unless
2676 # user wants to take this risk.
2677 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2678 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2679 local_ref_of_target_remote])
2680 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002681 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002682 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2683 'If you proceed with upload, more than 1 CL may be created by '
2684 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2685 'If you are certain that specified base `%s` has already been '
2686 'uploaded to Gerrit as another CL, you may proceed.\n' %
2687 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2688 if not force:
2689 confirm_or_exit(
2690 'Do you take responsibility for cleaning up potential mess '
2691 'resulting from proceeding with upload?',
2692 action='upload')
2693 return custom_cl_base
2694
Aaron Gablef97e33d2017-03-30 15:44:27 -07002695 if remote != '.':
2696 return self.GetCommonAncestorWithUpstream()
2697
2698 # If our upstream branch is local, we base our squashed commit on its
2699 # squashed version.
2700 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2701
Aaron Gablef97e33d2017-03-30 15:44:27 -07002702 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002703 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002704
2705 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002706 # TODO(tandrii): consider checking parent change in Gerrit and using its
2707 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2708 # the tree hash of the parent branch. The upside is less likely bogus
2709 # requests to reupload parent change just because it's uploadhash is
2710 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002711 parent = RunGit(['config',
2712 'branch.%s.gerritsquashhash' % upstream_branch_name],
2713 error_ok=True).strip()
2714 # Verify that the upstream branch has been uploaded too, otherwise
2715 # Gerrit will create additional CLs when uploading.
2716 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2717 RunGitSilent(['rev-parse', parent + ':'])):
2718 DieWithError(
2719 '\nUpload upstream branch %s first.\n'
2720 'It is likely that this branch has been rebased since its last '
2721 'upload, so you just need to upload it again.\n'
2722 '(If you uploaded it with --no-squash, then branch dependencies '
2723 'are not supported, and you should reupload with --squash.)'
2724 % upstream_branch_name,
2725 change_desc)
2726 return parent
2727
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002728 def _AddChangeIdToCommitMessage(self, options, args):
2729 """Re-commits using the current message, assumes the commit hook is in
2730 place.
2731 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002732 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002733 git_command = ['commit', '--amend', '-m', log_desc]
2734 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002735 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002736 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002737 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002738 return new_log_desc
2739 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002740 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002741
tandriie113dfd2016-10-11 10:20:12 -07002742 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002743 try:
2744 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002745 except GerritChangeNotExists:
2746 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002747
2748 if data['status'] in ('ABANDONED', 'MERGED'):
2749 return 'CL %s is closed' % self.GetIssue()
2750
Edward Lemurf0faf482019-09-25 20:40:17 +00002751 # TODO(1004447): Remove on Oct 9th, 2019.
2752 def GetLegacyProperties(self, patchset=None):
2753 host = self.GetCodereviewServer()
2754 issue = self.GetIssue()
2755 patchset = int(patchset or self.GetPatchset())
2756 data = self._GetChangeDetail(['ALL_REVISIONS'])
2757
2758 assert host and issue and patchset, 'CL must be uploaded first'
2759
2760 revision_data = None # Pylint wants it to be defined.
2761 for revision_data in data['revisions'].itervalues():
2762 if int(revision_data['_number']) == patchset:
2763 break
2764 else:
2765 raise Exception('Patchset %d is not known in Gerrit change %d' %
2766 (patchset, issue))
2767
2768 return {
2769 'patch_issue': issue,
2770 'patch_set': patchset,
2771 'patch_project': data['project'],
2772 'patch_storage': 'gerrit',
2773 'patch_ref': revision_data['fetch']['http']['ref'],
2774 'patch_repository_url': revision_data['fetch']['http']['url'],
2775 'patch_gerrit_url': host,
2776 }
2777
2778
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002779 def GetGerritChange(self, patchset=None):
2780 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2781 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2782 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002783 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002784 data = self._GetChangeDetail(['ALL_REVISIONS'])
2785
2786 assert host and issue and patchset, 'CL must be uploaded first'
2787
2788 has_patchset = any(
2789 int(revision_data['_number']) == patchset
2790 for revision_data in data['revisions'].itervalues())
2791 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002792 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002793 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002794
tandrii8c5a3532016-11-04 07:52:02 -07002795 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002796 'host': host,
2797 'change': issue,
2798 'project': data['project'],
2799 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002800 }
tandriie113dfd2016-10-11 10:20:12 -07002801
tandriide281ae2016-10-12 06:02:30 -07002802 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002803 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002804
Edward Lemur707d70b2018-02-07 00:50:14 +01002805 def GetReviewers(self):
2806 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002807 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002808
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002809
2810_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002811 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002812}
2813
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002814
iannuccie53c9352016-08-17 14:40:40 -07002815def _add_codereview_issue_select_options(parser, extra=""):
2816 _add_codereview_select_options(parser)
2817
2818 text = ('Operate on this issue number instead of the current branch\'s '
2819 'implicit issue.')
2820 if extra:
2821 text += ' '+extra
2822 parser.add_option('-i', '--issue', type=int, help=text)
2823
2824
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002825def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002826 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002827 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002828 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002829 parser.add_option_group(parser.codereview_group)
2830 parser.codereview_group.add_option(
2831 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002832 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002833
2834
tandriif9aefb72016-07-01 09:06:51 -07002835def _get_bug_line_values(default_project, bugs):
2836 """Given default_project and comma separated list of bugs, yields bug line
2837 values.
2838
2839 Each bug can be either:
2840 * a number, which is combined with default_project
2841 * string, which is left as is.
2842
2843 This function may produce more than one line, because bugdroid expects one
2844 project per line.
2845
2846 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2847 ['v8:123', 'chromium:789']
2848 """
2849 default_bugs = []
2850 others = []
2851 for bug in bugs.split(','):
2852 bug = bug.strip()
2853 if bug:
2854 try:
2855 default_bugs.append(int(bug))
2856 except ValueError:
2857 others.append(bug)
2858
2859 if default_bugs:
2860 default_bugs = ','.join(map(str, default_bugs))
2861 if default_project:
2862 yield '%s:%s' % (default_project, default_bugs)
2863 else:
2864 yield default_bugs
2865 for other in sorted(others):
2866 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2867 yield other
2868
2869
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002870class ChangeDescription(object):
2871 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002872 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002873 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002874 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002875 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002876 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2877 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2878 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2879 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002880
Anthony Polito8b955342019-09-24 19:01:36 +00002881 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002882 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002883 if bug:
2884 regexp = re.compile(self.BUG_LINE)
2885 prefix = settings.GetBugPrefix()
2886 if not any((regexp.match(line) for line in self._description_lines)):
2887 values = list(_get_bug_line_values(prefix, bug))
2888 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002889
agable@chromium.org42c20792013-09-12 17:34:49 +00002890 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002891 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002892 return '\n'.join(self._description_lines)
2893
2894 def set_description(self, desc):
2895 if isinstance(desc, basestring):
2896 lines = desc.splitlines()
2897 else:
2898 lines = [line.rstrip() for line in desc]
2899 while lines and not lines[0]:
2900 lines.pop(0)
2901 while lines and not lines[-1]:
2902 lines.pop(-1)
2903 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002904
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002905 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2906 """Rewrites the R=/TBR= line(s) as a single line each.
2907
2908 Args:
2909 reviewers (list(str)) - list of additional emails to use for reviewers.
2910 tbrs (list(str)) - list of additional emails to use for TBRs.
2911 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2912 the change that are missing OWNER coverage. If this is not None, you
2913 must also pass a value for `change`.
2914 change (Change) - The Change that should be used for OWNERS lookups.
2915 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002916 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002917 assert isinstance(tbrs, list), tbrs
2918
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002919 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002920 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002921
2922 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002923 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002924
2925 reviewers = set(reviewers)
2926 tbrs = set(tbrs)
2927 LOOKUP = {
2928 'TBR': tbrs,
2929 'R': reviewers,
2930 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002931
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002932 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002933 regexp = re.compile(self.R_LINE)
2934 matches = [regexp.match(line) for line in self._description_lines]
2935 new_desc = [l for i, l in enumerate(self._description_lines)
2936 if not matches[i]]
2937 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002938
agable@chromium.org42c20792013-09-12 17:34:49 +00002939 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002940
2941 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002942 for match in matches:
2943 if not match:
2944 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002945 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2946
2947 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002948 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002949 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002950 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002951 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002952 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002953 LOOKUP[add_owners_to].update(
2954 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002955
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002956 # If any folks ended up in both groups, remove them from tbrs.
2957 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002958
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002959 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2960 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002961
2962 # Put the new lines in the description where the old first R= line was.
2963 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2964 if 0 <= line_loc < len(self._description_lines):
2965 if new_tbr_line:
2966 self._description_lines.insert(line_loc, new_tbr_line)
2967 if new_r_line:
2968 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002969 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002970 if new_r_line:
2971 self.append_footer(new_r_line)
2972 if new_tbr_line:
2973 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002974
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002975 def set_preserve_tryjobs(self):
2976 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2977 footers = git_footers.parse_footers(self.description)
2978 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2979 if v.lower() == 'true':
2980 return
2981 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2982
Anthony Polito8b955342019-09-24 19:01:36 +00002983 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002984 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002985 self.set_description([
2986 '# Enter a description of the change.',
2987 '# This will be displayed on the codereview site.',
2988 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002989 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002990 '--------------------',
2991 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002992 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002993 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002994 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002995 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002996
agable@chromium.org42c20792013-09-12 17:34:49 +00002997 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002998 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002999 if not content:
3000 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003001 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003002
Bruce Dawson2377b012018-01-11 16:46:49 -08003003 # Strip off comments and default inserted "Bug:" line.
3004 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003005 (line.startswith('#') or
3006 line.rstrip() == "Bug:" or
3007 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003008 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003009 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003010 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003011
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003012 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003013 """Adds a footer line to the description.
3014
3015 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3016 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3017 that Gerrit footers are always at the end.
3018 """
3019 parsed_footer_line = git_footers.parse_footer(line)
3020 if parsed_footer_line:
3021 # Line is a gerrit footer in the form: Footer-Key: any value.
3022 # Thus, must be appended observing Gerrit footer rules.
3023 self.set_description(
3024 git_footers.add_footer(self.description,
3025 key=parsed_footer_line[0],
3026 value=parsed_footer_line[1]))
3027 return
3028
3029 if not self._description_lines:
3030 self._description_lines.append(line)
3031 return
3032
3033 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3034 if gerrit_footers:
3035 # git_footers.split_footers ensures that there is an empty line before
3036 # actual (gerrit) footers, if any. We have to keep it that way.
3037 assert top_lines and top_lines[-1] == ''
3038 top_lines, separator = top_lines[:-1], top_lines[-1:]
3039 else:
3040 separator = [] # No need for separator if there are no gerrit_footers.
3041
3042 prev_line = top_lines[-1] if top_lines else ''
3043 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3044 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3045 top_lines.append('')
3046 top_lines.append(line)
3047 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003048
tandrii99a72f22016-08-17 14:33:24 -07003049 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003050 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003051 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003052 reviewers = [match.group(2).strip()
3053 for match in matches
3054 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003055 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003056
bradnelsond975b302016-10-23 12:20:23 -07003057 def get_cced(self):
3058 """Retrieves the list of reviewers."""
3059 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3060 cced = [match.group(2).strip() for match in matches if match]
3061 return cleanup_list(cced)
3062
Nodir Turakulov23b82142017-11-16 11:04:25 -08003063 def get_hash_tags(self):
3064 """Extracts and sanitizes a list of Gerrit hashtags."""
3065 subject = (self._description_lines or ('',))[0]
3066 subject = re.sub(
3067 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3068
3069 tags = []
3070 start = 0
3071 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3072 while True:
3073 m = bracket_exp.match(subject, start)
3074 if not m:
3075 break
3076 tags.append(self.sanitize_hash_tag(m.group(1)))
3077 start = m.end()
3078
3079 if not tags:
3080 # Try "Tag: " prefix.
3081 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3082 if m:
3083 tags.append(self.sanitize_hash_tag(m.group(1)))
3084 return tags
3085
3086 @classmethod
3087 def sanitize_hash_tag(cls, tag):
3088 """Returns a sanitized Gerrit hash tag.
3089
3090 A sanitized hashtag can be used as a git push refspec parameter value.
3091 """
3092 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3093
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003094 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3095 """Updates this commit description given the parent.
3096
3097 This is essentially what Gnumbd used to do.
3098 Consult https://goo.gl/WMmpDe for more details.
3099 """
3100 assert parent_msg # No, orphan branch creation isn't supported.
3101 assert parent_hash
3102 assert dest_ref
3103 parent_footer_map = git_footers.parse_footers(parent_msg)
3104 # This will also happily parse svn-position, which GnumbD is no longer
3105 # supporting. While we'd generate correct footers, the verifier plugin
3106 # installed in Gerrit will block such commit (ie git push below will fail).
3107 parent_position = git_footers.get_position(parent_footer_map)
3108
3109 # Cherry-picks may have last line obscuring their prior footers,
3110 # from git_footers perspective. This is also what Gnumbd did.
3111 cp_line = None
3112 if (self._description_lines and
3113 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3114 cp_line = self._description_lines.pop()
3115
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003116 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003117
3118 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3119 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003120 for i, line in enumerate(footer_lines):
3121 k, v = git_footers.parse_footer(line) or (None, None)
3122 if k and k.startswith('Cr-'):
3123 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003124
3125 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003126 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003127 if parent_position[0] == dest_ref:
3128 # Same branch as parent.
3129 number = int(parent_position[1]) + 1
3130 else:
3131 number = 1 # New branch, and extra lineage.
3132 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3133 int(parent_position[1])))
3134
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003135 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3136 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003137
3138 self._description_lines = top_lines
3139 if cp_line:
3140 self._description_lines.append(cp_line)
3141 if self._description_lines[-1] != '':
3142 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003143 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003144
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003145
Aaron Gablea1bab272017-04-11 16:38:18 -07003146def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003147 """Retrieves the reviewers that approved a CL from the issue properties with
3148 messages.
3149
3150 Note that the list may contain reviewers that are not committer, thus are not
3151 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003152
3153 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003154 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003155 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003156 return sorted(
3157 set(
3158 message['sender']
3159 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003160 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003161 )
3162 )
3163
3164
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003165def FindCodereviewSettingsFile(filename='codereview.settings'):
3166 """Finds the given file starting in the cwd and going up.
3167
3168 Only looks up to the top of the repository unless an
3169 'inherit-review-settings-ok' file exists in the root of the repository.
3170 """
3171 inherit_ok_file = 'inherit-review-settings-ok'
3172 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003173 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003174 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3175 root = '/'
3176 while True:
3177 if filename in os.listdir(cwd):
3178 if os.path.isfile(os.path.join(cwd, filename)):
3179 return open(os.path.join(cwd, filename))
3180 if cwd == root:
3181 break
3182 cwd = os.path.dirname(cwd)
3183
3184
3185def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003186 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003187 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003188
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003189 def SetProperty(name, setting, unset_error_ok=False):
3190 fullname = 'rietveld.' + name
3191 if setting in keyvals:
3192 RunGit(['config', fullname, keyvals[setting]])
3193 else:
3194 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3195
tandrii48df5812016-10-17 03:55:37 -07003196 if not keyvals.get('GERRIT_HOST', False):
3197 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003198 # Only server setting is required. Other settings can be absent.
3199 # In that case, we ignore errors raised during option deletion attempt.
3200 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3201 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3202 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003203 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003204 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3205 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003206 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3207 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003208
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003209 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003210 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003211
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003212 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003213 RunGit(['config', 'gerrit.squash-uploads',
3214 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003215
tandrii@chromium.org28253532016-04-14 13:46:56 +00003216 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003217 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003218 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3219
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003220 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003221 # should be of the form
3222 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3223 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003224 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3225 keyvals['ORIGIN_URL_CONFIG']])
3226
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003227
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003228def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003229 """Downloads a network object to a local file, like urllib.urlretrieve.
3230
3231 This is necessary because urllib is broken for SSL connections via a proxy.
3232 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003233 with open(destination, 'w') as f:
3234 f.write(urllib2.urlopen(source).read())
3235
3236
ukai@chromium.org712d6102013-11-27 00:52:58 +00003237def hasSheBang(fname):
3238 """Checks fname is a #! script."""
3239 with open(fname) as f:
3240 return f.read(2).startswith('#!')
3241
3242
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003243# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3244def DownloadHooks(*args, **kwargs):
3245 pass
3246
3247
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003248def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003249 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003250
3251 Args:
3252 force: True to update hooks. False to install hooks if not present.
3253 """
3254 if not settings.GetIsGerrit():
3255 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003256 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003257 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3258 if not os.access(dst, os.X_OK):
3259 if os.path.exists(dst):
3260 if not force:
3261 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003262 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003263 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003264 if not hasSheBang(dst):
3265 DieWithError('Not a script: %s\n'
3266 'You need to download from\n%s\n'
3267 'into .git/hooks/commit-msg and '
3268 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003269 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3270 except Exception:
3271 if os.path.exists(dst):
3272 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003273 DieWithError('\nFailed to download hooks.\n'
3274 'You need to download from\n%s\n'
3275 'into .git/hooks/commit-msg and '
3276 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003277
3278
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003279class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003280 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003281
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003282 _GOOGLESOURCE = 'googlesource.com'
3283
3284 def __init__(self):
3285 # Cached list of [host, identity, source], where source is either
3286 # .gitcookies or .netrc.
3287 self._all_hosts = None
3288
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003289 def ensure_configured_gitcookies(self):
3290 """Runs checks and suggests fixes to make git use .gitcookies from default
3291 path."""
3292 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3293 configured_path = RunGitSilent(
3294 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003295 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003296 if configured_path:
3297 self._ensure_default_gitcookies_path(configured_path, default)
3298 else:
3299 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003300
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003301 @staticmethod
3302 def _ensure_default_gitcookies_path(configured_path, default_path):
3303 assert configured_path
3304 if configured_path == default_path:
3305 print('git is already configured to use your .gitcookies from %s' %
3306 configured_path)
3307 return
3308
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003309 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003310 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3311 (configured_path, default_path))
3312
3313 if not os.path.exists(configured_path):
3314 print('However, your configured .gitcookies file is missing.')
3315 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3316 action='reconfigure')
3317 RunGit(['config', '--global', 'http.cookiefile', default_path])
3318 return
3319
3320 if os.path.exists(default_path):
3321 print('WARNING: default .gitcookies file already exists %s' %
3322 default_path)
3323 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3324 default_path)
3325
3326 confirm_or_exit('Move existing .gitcookies to default location?',
3327 action='move')
3328 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003329 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003330 print('Moved and reconfigured git to use .gitcookies from %s' %
3331 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003332
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003333 @staticmethod
3334 def _configure_gitcookies_path(default_path):
3335 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3336 if os.path.exists(netrc_path):
3337 print('You seem to be using outdated .netrc for git credentials: %s' %
3338 netrc_path)
3339 print('This tool will guide you through setting up recommended '
3340 '.gitcookies store for git credentials.\n'
3341 '\n'
3342 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3343 ' git config --global --unset http.cookiefile\n'
3344 ' mv %s %s.backup\n\n' % (default_path, default_path))
3345 confirm_or_exit(action='setup .gitcookies')
3346 RunGit(['config', '--global', 'http.cookiefile', default_path])
3347 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003348
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003349 def get_hosts_with_creds(self, include_netrc=False):
3350 if self._all_hosts is None:
3351 a = gerrit_util.CookiesAuthenticator()
3352 self._all_hosts = [
3353 (h, u, s)
3354 for h, u, s in itertools.chain(
3355 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3356 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3357 )
3358 if h.endswith(self._GOOGLESOURCE)
3359 ]
3360
3361 if include_netrc:
3362 return self._all_hosts
3363 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3364
3365 def print_current_creds(self, include_netrc=False):
3366 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3367 if not hosts:
3368 print('No Git/Gerrit credentials found')
3369 return
3370 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3371 header = [('Host', 'User', 'Which file'),
3372 ['=' * l for l in lengths]]
3373 for row in (header + hosts):
3374 print('\t'.join((('%%+%ds' % l) % s)
3375 for l, s in zip(lengths, row)))
3376
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003377 @staticmethod
3378 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003379 """Parses identity "git-<username>.domain" into <username> and domain."""
3380 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003381 # distinguishable from sub-domains. But we do know typical domains:
3382 if identity.endswith('.chromium.org'):
3383 domain = 'chromium.org'
3384 username = identity[:-len('.chromium.org')]
3385 else:
3386 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003387 if username.startswith('git-'):
3388 username = username[len('git-'):]
3389 return username, domain
3390
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003391 def _canonical_git_googlesource_host(self, host):
3392 """Normalizes Gerrit hosts (with '-review') to Git host."""
3393 assert host.endswith(self._GOOGLESOURCE)
3394 # Prefix doesn't include '.' at the end.
3395 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3396 if prefix.endswith('-review'):
3397 prefix = prefix[:-len('-review')]
3398 return prefix + '.' + self._GOOGLESOURCE
3399
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003400 def _canonical_gerrit_googlesource_host(self, host):
3401 git_host = self._canonical_git_googlesource_host(host)
3402 prefix = git_host.split('.', 1)[0]
3403 return prefix + '-review.' + self._GOOGLESOURCE
3404
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003405 def _get_counterpart_host(self, host):
3406 assert host.endswith(self._GOOGLESOURCE)
3407 git = self._canonical_git_googlesource_host(host)
3408 gerrit = self._canonical_gerrit_googlesource_host(git)
3409 return git if gerrit == host else gerrit
3410
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003411 def has_generic_host(self):
3412 """Returns whether generic .googlesource.com has been configured.
3413
3414 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3415 """
3416 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3417 if host == '.' + self._GOOGLESOURCE:
3418 return True
3419 return False
3420
3421 def _get_git_gerrit_identity_pairs(self):
3422 """Returns map from canonic host to pair of identities (Git, Gerrit).
3423
3424 One of identities might be None, meaning not configured.
3425 """
3426 host_to_identity_pairs = {}
3427 for host, identity, _ in self.get_hosts_with_creds():
3428 canonical = self._canonical_git_googlesource_host(host)
3429 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3430 idx = 0 if canonical == host else 1
3431 pair[idx] = identity
3432 return host_to_identity_pairs
3433
3434 def get_partially_configured_hosts(self):
3435 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003436 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3437 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3438 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003439
3440 def get_conflicting_hosts(self):
3441 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003442 host
3443 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003444 if None not in (i1, i2) and i1 != i2)
3445
3446 def get_duplicated_hosts(self):
3447 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3448 return set(host for host, count in counters.iteritems() if count > 1)
3449
3450 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3451 'chromium.googlesource.com': 'chromium.org',
3452 'chrome-internal.googlesource.com': 'google.com',
3453 }
3454
3455 def get_hosts_with_wrong_identities(self):
3456 """Finds hosts which **likely** reference wrong identities.
3457
3458 Note: skips hosts which have conflicting identities for Git and Gerrit.
3459 """
3460 hosts = set()
3461 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3462 pair = self._get_git_gerrit_identity_pairs().get(host)
3463 if pair and pair[0] == pair[1]:
3464 _, domain = self._parse_identity(pair[0])
3465 if domain != expected:
3466 hosts.add(host)
3467 return hosts
3468
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003469 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003470 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003471 hosts = sorted(hosts)
3472 assert hosts
3473 if extra_column_func is None:
3474 extras = [''] * len(hosts)
3475 else:
3476 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003477 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3478 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003479 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003480 lines.append(tmpl % he)
3481 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003482
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003483 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003484 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003485 yield ('.googlesource.com wildcard record detected',
3486 ['Chrome Infrastructure team recommends to list full host names '
3487 'explicitly.'],
3488 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003489
3490 dups = self.get_duplicated_hosts()
3491 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003492 yield ('The following hosts were defined twice',
3493 self._format_hosts(dups),
3494 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003495
3496 partial = self.get_partially_configured_hosts()
3497 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003498 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3499 'These hosts are missing',
3500 self._format_hosts(partial, lambda host: 'but %s defined' %
3501 self._get_counterpart_host(host)),
3502 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003503
3504 conflicting = self.get_conflicting_hosts()
3505 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003506 yield ('The following Git hosts have differing credentials from their '
3507 'Gerrit counterparts',
3508 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3509 tuple(self._get_git_gerrit_identity_pairs()[host])),
3510 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003511
3512 wrong = self.get_hosts_with_wrong_identities()
3513 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003514 yield ('These hosts likely use wrong identity',
3515 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3516 (self._get_git_gerrit_identity_pairs()[host][0],
3517 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3518 wrong)
3519
3520 def find_and_report_problems(self):
3521 """Returns True if there was at least one problem, else False."""
3522 found = False
3523 bad_hosts = set()
3524 for title, sublines, hosts in self._find_problems():
3525 if not found:
3526 found = True
3527 print('\n\n.gitcookies problem report:\n')
3528 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003529 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003530 if sublines:
3531 print()
3532 print(' %s' % '\n '.join(sublines))
3533 print()
3534
3535 if bad_hosts:
3536 assert found
3537 print(' You can manually remove corresponding lines in your %s file and '
3538 'visit the following URLs with correct account to generate '
3539 'correct credential lines:\n' %
3540 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3541 print(' %s' % '\n '.join(sorted(set(
3542 gerrit_util.CookiesAuthenticator().get_new_password_url(
3543 self._canonical_git_googlesource_host(host))
3544 for host in bad_hosts
3545 ))))
3546 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003547
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003548
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003549@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003550def CMDcreds_check(parser, args):
3551 """Checks credentials and suggests changes."""
3552 _, _ = parser.parse_args(args)
3553
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003554 # Code below checks .gitcookies. Abort if using something else.
3555 authn = gerrit_util.Authenticator.get()
3556 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3557 if isinstance(authn, gerrit_util.GceAuthenticator):
3558 DieWithError(
3559 'This command is not designed for GCE, are you on a bot?\n'
3560 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3561 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003562 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003563 'This command is not designed for bot environment. It checks '
3564 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003565
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003566 checker = _GitCookiesChecker()
3567 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003568
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003569 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003570 checker.print_current_creds(include_netrc=True)
3571
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003572 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003573 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003574 return 0
3575 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003576
3577
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003578@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003579def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003580 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003581 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3582 branch = ShortBranchName(branchref)
3583 _, args = parser.parse_args(args)
3584 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003585 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003586 return RunGit(['config', 'branch.%s.base-url' % branch],
3587 error_ok=False).strip()
3588 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003589 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003590 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3591 error_ok=False).strip()
3592
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003593
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003594def color_for_status(status):
3595 """Maps a Changelist status to color, for CMDstatus and other tools."""
3596 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003597 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003598 'waiting': Fore.BLUE,
3599 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003600 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003601 'lgtm': Fore.GREEN,
3602 'commit': Fore.MAGENTA,
3603 'closed': Fore.CYAN,
3604 'error': Fore.WHITE,
3605 }.get(status, Fore.WHITE)
3606
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003607
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003608def get_cl_statuses(changes, fine_grained, max_processes=None):
3609 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003610
3611 If fine_grained is true, this will fetch CL statuses from the server.
3612 Otherwise, simply indicate if there's a matching url for the given branches.
3613
3614 If max_processes is specified, it is used as the maximum number of processes
3615 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3616 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003617
3618 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003619 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003620 if not changes:
3621 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003622
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003623 if not fine_grained:
3624 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003625 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003626 for cl in changes:
3627 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003628 return
3629
3630 # First, sort out authentication issues.
3631 logging.debug('ensuring credentials exist')
3632 for cl in changes:
3633 cl.EnsureAuthenticated(force=False, refresh=True)
3634
3635 def fetch(cl):
3636 try:
3637 return (cl, cl.GetStatus())
3638 except:
3639 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003640 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003641 raise
3642
3643 threads_count = len(changes)
3644 if max_processes:
3645 threads_count = max(1, min(threads_count, max_processes))
3646 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3647
3648 pool = ThreadPool(threads_count)
3649 fetched_cls = set()
3650 try:
3651 it = pool.imap_unordered(fetch, changes).__iter__()
3652 while True:
3653 try:
3654 cl, status = it.next(timeout=5)
3655 except multiprocessing.TimeoutError:
3656 break
3657 fetched_cls.add(cl)
3658 yield cl, status
3659 finally:
3660 pool.close()
3661
3662 # Add any branches that failed to fetch.
3663 for cl in set(changes) - fetched_cls:
3664 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003665
rmistry@google.com2dd99862015-06-22 12:22:18 +00003666
3667def upload_branch_deps(cl, args):
3668 """Uploads CLs of local branches that are dependents of the current branch.
3669
3670 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003671
3672 test1 -> test2.1 -> test3.1
3673 -> test3.2
3674 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675
3676 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3677 run on the dependent branches in this order:
3678 test2.1, test3.1, test3.2, test2.2, test3.3
3679
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003680 Note: This function does not rebase your local dependent branches. Use it
3681 when you make a change to the parent branch that will not conflict
3682 with its dependent branches, and you would like their dependencies
3683 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003684 """
3685 if git_common.is_dirty_git_tree('upload-branch-deps'):
3686 return 1
3687
3688 root_branch = cl.GetBranch()
3689 if root_branch is None:
3690 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3691 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003692 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003693 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3694 'patchset dependencies without an uploaded CL.')
3695
3696 branches = RunGit(['for-each-ref',
3697 '--format=%(refname:short) %(upstream:short)',
3698 'refs/heads'])
3699 if not branches:
3700 print('No local branches found.')
3701 return 0
3702
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003703 # Create a dictionary of all local branches to the branches that are
3704 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 tracked_to_dependents = collections.defaultdict(list)
3706 for b in branches.splitlines():
3707 tokens = b.split()
3708 if len(tokens) == 2:
3709 branch_name, tracked = tokens
3710 tracked_to_dependents[tracked].append(branch_name)
3711
vapiera7fbd5a2016-06-16 09:17:49 -07003712 print()
3713 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003714 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003715
rmistry@google.com2dd99862015-06-22 12:22:18 +00003716 def traverse_dependents_preorder(branch, padding=''):
3717 dependents_to_process = tracked_to_dependents.get(branch, [])
3718 padding += ' '
3719 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003721 dependents.append(dependent)
3722 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003723
rmistry@google.com2dd99862015-06-22 12:22:18 +00003724 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003725 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003726
3727 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003729 return 0
3730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003731 confirm_or_exit('This command will checkout all dependent branches and run '
3732 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003733
rmistry@google.com2dd99862015-06-22 12:22:18 +00003734 # Record all dependents that failed to upload.
3735 failures = {}
3736 # Go through all dependents, checkout the branch and upload.
3737 try:
3738 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print()
3740 print('--------------------------------------')
3741 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003742 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003744 try:
3745 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003747 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003748 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003749 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003750 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003751 finally:
3752 # Swap back to the original root branch.
3753 RunGit(['checkout', '-q', root_branch])
3754
vapiera7fbd5a2016-06-16 09:17:49 -07003755 print()
3756 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003757 for dependent_branch in dependents:
3758 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003759 print(' %s : %s' % (dependent_branch, upload_status))
3760 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003761
3762 return 0
3763
3764
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003765@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003766def CMDarchive(parser, args):
3767 """Archives and deletes branches associated with closed changelists."""
3768 parser.add_option(
3769 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003770 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003771 parser.add_option(
3772 '-f', '--force', action='store_true',
3773 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003774 parser.add_option(
3775 '-d', '--dry-run', action='store_true',
3776 help='Skip the branch tagging and removal steps.')
3777 parser.add_option(
3778 '-t', '--notags', action='store_true',
3779 help='Do not tag archived branches. '
3780 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003781
kmarshall3bff56b2016-06-06 18:31:47 -07003782 options, args = parser.parse_args(args)
3783 if args:
3784 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003785
3786 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3787 if not branches:
3788 return 0
3789
vapiera7fbd5a2016-06-16 09:17:49 -07003790 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003791 changes = [Changelist(branchref=b)
3792 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003793 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3794 statuses = get_cl_statuses(changes,
3795 fine_grained=True,
3796 max_processes=options.maxjobs)
3797 proposal = [(cl.GetBranch(),
3798 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3799 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003800 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003801 proposal.sort()
3802
3803 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003804 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003805 return 0
3806
3807 current_branch = GetCurrentBranch()
3808
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003810 if options.notags:
3811 for next_item in proposal:
3812 print(' ' + next_item[0])
3813 else:
3814 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3815 for next_item in proposal:
3816 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003817
kmarshall9249e012016-08-23 12:02:16 -07003818 # Quit now on precondition failure or if instructed by the user, either
3819 # via an interactive prompt or by command line flags.
3820 if options.dry_run:
3821 print('\nNo changes were made (dry run).\n')
3822 return 0
3823 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003824 print('You are currently on a branch \'%s\' which is associated with a '
3825 'closed codereview issue, so archive cannot proceed. Please '
3826 'checkout another branch and run this command again.' %
3827 current_branch)
3828 return 1
kmarshall9249e012016-08-23 12:02:16 -07003829 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003830 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3831 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003833 return 1
3834
3835 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003836 if not options.notags:
3837 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003838 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003839
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003841
3842 return 0
3843
3844
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003845@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003846def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003847 """Show status of changelists.
3848
3849 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003850 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003851 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003852 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003853 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003854 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003855 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003856 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003857
3858 Also see 'git cl comments'.
3859 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003860 parser.add_option(
3861 '--no-branch-color',
3862 action='store_true',
3863 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003864 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003865 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003866 parser.add_option('-f', '--fast', action='store_true',
3867 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003868 parser.add_option(
3869 '-j', '--maxjobs', action='store', type=int,
3870 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003871
iannuccie53c9352016-08-17 14:40:40 -07003872 _add_codereview_issue_select_options(
3873 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003874 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003875 if args:
3876 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003877
iannuccie53c9352016-08-17 14:40:40 -07003878 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003879 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003880
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003881 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003882 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003883 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003885 elif options.field == 'id':
3886 issueid = cl.GetIssue()
3887 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003890 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003891 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003893 elif options.field == 'status':
3894 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003895 elif options.field == 'url':
3896 url = cl.GetIssueURL()
3897 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003899 return 0
3900
3901 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3902 if not branches:
3903 print('No local branch found.')
3904 return 0
3905
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003906 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003907 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003908 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003909 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003910 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003911 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003912 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003913
Daniel McArdlea23bf592019-02-12 00:25:12 +00003914 current_branch = GetCurrentBranch()
3915
3916 def FormatBranchName(branch, colorize=False):
3917 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3918 an asterisk when it is the current branch."""
3919
3920 asterisk = ""
3921 color = Fore.RESET
3922 if branch == current_branch:
3923 asterisk = "* "
3924 color = Fore.GREEN
3925 branch_name = ShortBranchName(branch)
3926
3927 if colorize:
3928 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003929 return asterisk + branch_name
3930
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003931 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003932
3933 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003934 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3935 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003936 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003937 c, status = output.next()
3938 branch_statuses[c.GetBranch()] = status
3939 status = branch_statuses.pop(branch)
3940 url = cl.GetIssueURL()
3941 if url and (not status or status == 'error'):
3942 # The issue probably doesn't exist anymore.
3943 url += ' (broken)'
3944
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003945 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003946 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003947 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003948 color = ''
3949 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003950 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003951
Alan Cuttera3be9a52019-03-04 18:50:33 +00003952 branch_display = FormatBranchName(branch)
3953 padding = ' ' * (alignment - len(branch_display))
3954 if not options.no_branch_color:
3955 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003956
Alan Cuttera3be9a52019-03-04 18:50:33 +00003957 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3958 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003959
vapiera7fbd5a2016-06-16 09:17:49 -07003960 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003961 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003962 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003963 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003964 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003965 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003966 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003967 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003968 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003969 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003970 print('Issue description:')
3971 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003972 return 0
3973
3974
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003975def colorize_CMDstatus_doc():
3976 """To be called once in main() to add colors to git cl status help."""
3977 colors = [i for i in dir(Fore) if i[0].isupper()]
3978
3979 def colorize_line(line):
3980 for color in colors:
3981 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003982 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003983 indent = len(line) - len(line.lstrip(' ')) + 1
3984 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3985 return line
3986
3987 lines = CMDstatus.__doc__.splitlines()
3988 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3989
3990
phajdan.jre328cf92016-08-22 04:12:17 -07003991def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003992 if path == '-':
3993 json.dump(contents, sys.stdout)
3994 else:
3995 with open(path, 'w') as f:
3996 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003997
3998
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003999@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004000@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004001def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004002 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004003
4004 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004005 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004006 parser.add_option('-r', '--reverse', action='store_true',
4007 help='Lookup the branch(es) for the specified issues. If '
4008 'no issues are specified, all branches with mapped '
4009 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004010 parser.add_option('--json',
4011 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004012 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004013 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004014
dnj@chromium.org406c4402015-03-03 17:22:28 +00004015 if options.reverse:
4016 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004017 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004018 # Reverse issue lookup.
4019 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004020
4021 git_config = {}
4022 for config in RunGit(['config', '--get-regexp',
4023 r'branch\..*issue']).splitlines():
4024 name, _space, val = config.partition(' ')
4025 git_config[name] = val
4026
dnj@chromium.org406c4402015-03-03 17:22:28 +00004027 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004028 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4029 config_key = _git_branch_config_key(ShortBranchName(branch),
4030 cls.IssueConfigKey())
4031 issue = git_config.get(config_key)
4032 if issue:
4033 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004034 if not args:
4035 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004036 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004037 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004038 try:
4039 issue_num = int(issue)
4040 except ValueError:
4041 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004042 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004043 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004045 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004046 if options.json:
4047 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004048 return 0
4049
4050 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004051 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004052 if not issue.valid:
4053 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4054 'or no argument to list it.\n'
4055 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004056 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004057 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004058 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004059 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004060 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4061 if options.json:
4062 write_json(options.json, {
4063 'issue': cl.GetIssue(),
4064 'issue_url': cl.GetIssueURL(),
4065 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 return 0
4067
4068
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004069@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004070def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004071 """Shows or posts review comments for any changelist."""
4072 parser.add_option('-a', '--add-comment', dest='comment',
4073 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004074 parser.add_option('-p', '--publish', action='store_true',
4075 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004076 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004077 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004078 parser.add_option('-m', '--machine-readable', dest='readable',
4079 action='store_false', default=True,
4080 help='output comments in a format compatible with '
4081 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004082 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004083 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004084 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004085 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004086
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004087 issue = None
4088 if options.issue:
4089 try:
4090 issue = int(options.issue)
4091 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004092 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004093
Edward Lemur934836a2019-09-09 20:16:54 +00004094 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004095
4096 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004097 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004098 return 0
4099
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004100 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4101 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004102 for comment in summary:
4103 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004104 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004105 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004106 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004107 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004108 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004109 elif comment.autogenerated:
4110 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004111 else:
4112 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004113 print('\n%s%s %s%s\n%s' % (
4114 color,
4115 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4116 comment.sender,
4117 Fore.RESET,
4118 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4119
smut@google.comc85ac942015-09-15 16:34:43 +00004120 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004121 def pre_serialize(c):
4122 dct = c.__dict__.copy()
4123 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4124 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004125 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004126 return 0
4127
4128
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004129@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004130@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004131def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004132 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004133 parser.add_option('-d', '--display', action='store_true',
4134 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004135 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004136 help='New description to set for this issue (- for stdin, '
4137 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004138 parser.add_option('-f', '--force', action='store_true',
4139 help='Delete any unpublished Gerrit edits for this issue '
4140 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004141
4142 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004143 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004144
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004145 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004146 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004147 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004148 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004149 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004150
Edward Lemur934836a2019-09-09 20:16:54 +00004151 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004152 if target_issue_arg:
4153 kwargs['issue'] = target_issue_arg.issue
4154 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004155
4156 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004157 if not cl.GetIssue():
4158 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004159
Edward Lemur678a6842019-10-03 22:25:05 +00004160 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004161 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004162
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004163 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004164
smut@google.com34fb6b12015-07-13 20:03:26 +00004165 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004167 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004168
4169 if options.new_description:
4170 text = options.new_description
4171 if text == '-':
4172 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004173 elif text == '+':
4174 base_branch = cl.GetCommonAncestorWithUpstream()
4175 change = cl.GetChange(base_branch, None, local_description=True)
4176 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004177
4178 description.set_description(text)
4179 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004180 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004181 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004182 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004183 return 0
4184
4185
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004186@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004187def CMDlint(parser, args):
4188 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004189 parser.add_option('--filter', action='append', metavar='-x,+y',
4190 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004191 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004192
4193 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004194 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004195 try:
4196 import cpplint
4197 import cpplint_chromium
4198 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004199 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004200 return 1
4201
4202 # Change the current working directory before calling lint so that it
4203 # shows the correct base.
4204 previous_cwd = os.getcwd()
4205 os.chdir(settings.GetRoot())
4206 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004207 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004208 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4209 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004210 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004212 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004213
4214 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004215 command = args + files
4216 if options.filter:
4217 command = ['--filter=' + ','.join(options.filter)] + command
4218 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004219
4220 white_regex = re.compile(settings.GetLintRegex())
4221 black_regex = re.compile(settings.GetLintIgnoreRegex())
4222 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4223 for filename in filenames:
4224 if white_regex.match(filename):
4225 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004226 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004227 else:
4228 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4229 extra_check_functions)
4230 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004231 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004232 finally:
4233 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004234 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004235 if cpplint._cpplint_state.error_count != 0:
4236 return 1
4237 return 0
4238
4239
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004240@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004241def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004242 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004243 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004244 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004245 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004246 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004247 parser.add_option('--all', action='store_true',
4248 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004249 parser.add_option('--parallel', action='store_true',
4250 help='Run all tests specified by input_api.RunTests in all '
4251 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004252 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004253
sbc@chromium.org71437c02015-04-09 19:29:40 +00004254 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004255 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 return 1
4257
Edward Lemur934836a2019-09-09 20:16:54 +00004258 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004259 if args:
4260 base_branch = args[0]
4261 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004262 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004263 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264
Aaron Gable8076c282017-11-29 14:39:41 -08004265 if options.all:
4266 base_change = cl.GetChange(base_branch, None)
4267 files = [('M', f) for f in base_change.AllFiles()]
4268 change = presubmit_support.GitChange(
4269 base_change.Name(),
4270 base_change.FullDescriptionText(),
4271 base_change.RepositoryRoot(),
4272 files,
4273 base_change.issue,
4274 base_change.patchset,
4275 base_change.author_email,
4276 base_change._upstream)
4277 else:
4278 change = cl.GetChange(base_branch, None)
4279
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004280 cl.RunHook(
4281 committing=not options.upload,
4282 may_prompt=False,
4283 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004284 change=change,
4285 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004286 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004287
4288
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004289def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004290 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004291
4292 Works the same way as
4293 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4294 but can be called on demand on all platforms.
4295
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004296 The basic idea is to generate git hash of a state of the tree, original
4297 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004298 """
4299 lines = []
4300 tree_hash = RunGitSilent(['write-tree'])
4301 lines.append('tree %s' % tree_hash.strip())
4302 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4303 if code == 0:
4304 lines.append('parent %s' % parent.strip())
4305 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4306 lines.append('author %s' % author.strip())
4307 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4308 lines.append('committer %s' % committer.strip())
4309 lines.append('')
4310 # Note: Gerrit's commit-hook actually cleans message of some lines and
4311 # whitespace. This code is not doing this, but it clearly won't decrease
4312 # entropy.
4313 lines.append(message)
4314 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004315 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004316 return 'I%s' % change_hash.strip()
4317
4318
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004319def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004320 """Computes the remote branch ref to use for the CL.
4321
4322 Args:
4323 remote (str): The git remote for the CL.
4324 remote_branch (str): The git remote branch for the CL.
4325 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004326 """
4327 if not (remote and remote_branch):
4328 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004329
wittman@chromium.org455dc922015-01-26 20:15:50 +00004330 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004331 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004332 # refs, which are then translated into the remote full symbolic refs
4333 # below.
4334 if '/' not in target_branch:
4335 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4336 else:
4337 prefix_replacements = (
4338 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4339 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4340 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4341 )
4342 match = None
4343 for regex, replacement in prefix_replacements:
4344 match = re.search(regex, target_branch)
4345 if match:
4346 remote_branch = target_branch.replace(match.group(0), replacement)
4347 break
4348 if not match:
4349 # This is a branch path but not one we recognize; use as-is.
4350 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004351 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4352 # Handle the refs that need to land in different refs.
4353 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004354
wittman@chromium.org455dc922015-01-26 20:15:50 +00004355 # Create the true path to the remote branch.
4356 # Does the following translation:
4357 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4358 # * refs/remotes/origin/master -> refs/heads/master
4359 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4360 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4361 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4362 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4363 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4364 'refs/heads/')
4365 elif remote_branch.startswith('refs/remotes/branch-heads'):
4366 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004367
wittman@chromium.org455dc922015-01-26 20:15:50 +00004368 return remote_branch
4369
4370
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004371def cleanup_list(l):
4372 """Fixes a list so that comma separated items are put as individual items.
4373
4374 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4375 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4376 """
4377 items = sum((i.split(',') for i in l), [])
4378 stripped_items = (i.strip() for i in items)
4379 return sorted(filter(None, stripped_items))
4380
4381
Aaron Gable4db38df2017-11-03 14:59:07 -07004382@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004383@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004384def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004385 """Uploads the current changelist to codereview.
4386
4387 Can skip dependency patchset uploads for a branch by running:
4388 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004389 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004390 git config --unset branch.branch_name.skip-deps-uploads
4391 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004392
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004393 If the name of the checked out branch starts with "bug-" or "fix-" followed
4394 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004395 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004396
4397 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004398 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004399 [git-cl] add support for hashtags
4400 Foo bar: implement foo
4401 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004402 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004403 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4404 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004405 parser.add_option('--bypass-watchlists', action='store_true',
4406 dest='bypass_watchlists',
4407 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004408 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004409 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004410 parser.add_option('--message', '-m', dest='message',
4411 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004412 parser.add_option('-b', '--bug',
4413 help='pre-populate the bug number(s) for this issue. '
4414 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004415 parser.add_option('--message-file', dest='message_file',
4416 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004417 parser.add_option('--title', '-t', dest='title',
4418 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004419 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004420 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004421 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004422 parser.add_option('--tbrs',
4423 action='append', default=[],
4424 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004425 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004426 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004427 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004428 parser.add_option('--hashtag', dest='hashtags',
4429 action='append', default=[],
4430 help=('Gerrit hashtag for new CL; '
4431 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004432 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004433 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004434 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004435 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004436 metavar='TARGET',
4437 help='Apply CL to remote ref TARGET. ' +
4438 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004439 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004440 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004441 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004442 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004443 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004444 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004445 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4446 const='TBR', help='add a set of OWNERS to TBR')
4447 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4448 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004449 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004450 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004451 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004452 'implies --send-mail')
4453 parser.add_option('-d', '--cq-dry-run',
4454 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004455 help='Send the patchset to do a CQ dry run right after '
4456 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004457 parser.add_option('--preserve-tryjobs', action='store_true',
4458 help='instruct the CQ to let tryjobs running even after '
4459 'new patchsets are uploaded instead of canceling '
4460 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004461 parser.add_option('--dependencies', action='store_true',
4462 help='Uploads CLs of all the local branches that depend on '
4463 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004464 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4465 help='Sends your change to the CQ after an approval. Only '
4466 'works on repos that have the Auto-Submit label '
4467 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004468 parser.add_option('--parallel', action='store_true',
4469 help='Run all tests specified by input_api.RunTests in all '
4470 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004471 parser.add_option('--no-autocc', action='store_true',
4472 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004473 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004474 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004475 parser.add_option('-R', '--retry-failed', action='store_true',
4476 help='Retry failed tryjobs from old patchset immediately '
4477 'after uploading new patchset. Cannot be used with '
4478 '--use-commit-queue or --cq-dry-run.')
4479 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4480 help='Host of buildbucket. The default host is %default.')
4481 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004482
rmistry@google.com2dd99862015-06-22 12:22:18 +00004483 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004484 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004485 (options, args) = parser.parse_args(args)
4486
sbc@chromium.org71437c02015-04-09 19:29:40 +00004487 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004488 return 1
4489
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004490 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004491 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004492 options.cc = cleanup_list(options.cc)
4493
tandriib80458a2016-06-23 12:20:07 -07004494 if options.message_file:
4495 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004496 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004497 options.message = gclient_utils.FileRead(options.message_file)
4498 options.message_file = None
4499
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004500 if ([options.cq_dry_run,
4501 options.use_commit_queue,
4502 options.retry_failed].count(True) > 1):
4503 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4504 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004505
Aaron Gableedbc4132017-09-11 13:22:28 -07004506 if options.use_commit_queue:
4507 options.send_mail = True
4508
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004509 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4510 settings.GetIsGerrit()
4511
Edward Lemur934836a2019-09-09 20:16:54 +00004512 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004513 if options.retry_failed and not cl.GetIssue():
4514 print('No previous patchsets, so --retry-failed has no effect.')
4515 options.retry_failed = False
4516 # cl.GetMostRecentPatchset uses cached information, and can return the last
4517 # patchset before upload. Calling it here makes it clear that it's the
4518 # last patchset before upload. Note that GetMostRecentPatchset will fail
4519 # if no CL has been uploaded yet.
4520 if options.retry_failed:
4521 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004522
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004523 ret = cl.CMDUpload(options, args, orig_args)
4524
4525 if options.retry_failed:
4526 if ret != 0:
4527 print('Upload failed, so --retry-failed has no effect.')
4528 return ret
4529 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004530 builds, _ = _fetch_latest_builds(
4531 auth_config, cl, options.buildbucket_host,
4532 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004533 buckets = _filter_failed(builds)
4534 if len(buckets) == 0:
4535 print('No failed tryjobs, so --retry-failed has no effect.')
4536 return ret
4537 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4538
4539 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004540
4541
Francois Dorayd42c6812017-05-30 15:10:20 -04004542@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004543@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004544def CMDsplit(parser, args):
4545 """Splits a branch into smaller branches and uploads CLs.
4546
4547 Creates a branch and uploads a CL for each group of files modified in the
4548 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004549 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004550 the shared OWNERS file.
4551 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004552 parser.add_option('-d', '--description', dest='description_file',
4553 help='A text file containing a CL description in which '
4554 '$directory will be replaced by each CL\'s directory.')
4555 parser.add_option('-c', '--comment', dest='comment_file',
4556 help='A text file containing a CL comment.')
4557 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004558 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004559 help='List the files and reviewers for each CL that would '
4560 'be created, but don\'t create branches or CLs.')
4561 parser.add_option('--cq-dry-run', action='store_true',
4562 help='If set, will do a cq dry run for each uploaded CL. '
4563 'Please be careful when doing this; more than ~10 CLs '
4564 'has the potential to overload our build '
4565 'infrastructure. Try to upload these not during high '
4566 'load times (usually 11-3 Mountain View time). Email '
4567 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004568 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4569 default=True,
4570 help='Sends your change to the CQ after an approval. Only '
4571 'works on repos that have the Auto-Submit label '
4572 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004573 options, _ = parser.parse_args(args)
4574
4575 if not options.description_file:
4576 parser.error('No --description flag specified.')
4577
4578 def WrappedCMDupload(args):
4579 return CMDupload(OptionParser(), args)
4580
4581 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004582 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004583 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004584
4585
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004586@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004587@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004589 """DEPRECATED: Used to commit the current changelist via git-svn."""
4590 message = ('git-cl no longer supports committing to SVN repositories via '
4591 'git-svn. You probably want to use `git cl land` instead.')
4592 print(message)
4593 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004594
4595
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004596@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004597@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004598def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004599 """Commits the current changelist via git.
4600
4601 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4602 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004603 """
4604 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4605 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004606 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004607 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004608 parser.add_option('--parallel', action='store_true',
4609 help='Run all tests specified by input_api.RunTests in all '
4610 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004611 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004612
Edward Lemur934836a2019-09-09 20:16:54 +00004613 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004614
Robert Iannucci2e73d432018-03-14 01:10:47 -07004615 if not cl.GetIssue():
4616 DieWithError('You must upload the change first to Gerrit.\n'
4617 ' If you would rather have `git cl land` upload '
4618 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004619 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004620 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004621
4622
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004623@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004624@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004625def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004626 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004627 parser.add_option('-b', dest='newbranch',
4628 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004629 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004630 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004632 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004633
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004634 group = optparse.OptionGroup(
4635 parser,
4636 'Options for continuing work on the current issue uploaded from a '
4637 'different clone (e.g. different machine). Must be used independently '
4638 'from the other options. No issue number should be specified, and the '
4639 'branch must have an issue number associated with it')
4640 group.add_option('--reapply', action='store_true', dest='reapply',
4641 help='Reset the branch and reapply the issue.\n'
4642 'CAUTION: This will undo any local changes in this '
4643 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004644
4645 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004646 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004647 parser.add_option_group(group)
4648
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004649 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004651
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004652 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004653 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004654 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004655 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004656 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004657
Edward Lemur934836a2019-09-09 20:16:54 +00004658 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004659 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004660 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004661
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004662 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004663 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004664 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004665
4666 RunGit(['reset', '--hard', upstream])
4667 if options.pull:
4668 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004669
Edward Lemur678a6842019-10-03 22:25:05 +00004670 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4671 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004672
4673 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004674 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004675
Edward Lemurf38bc172019-09-03 21:02:13 +00004676 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004677 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004678 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004679
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004680 # We don't want uncommitted changes mixed up with the patch.
4681 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004682 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004684 if options.newbranch:
4685 if options.force:
4686 RunGit(['branch', '-D', options.newbranch],
4687 stderr=subprocess2.PIPE, error_ok=True)
4688 RunGit(['new-branch', options.newbranch])
4689
Edward Lemur678a6842019-10-03 22:25:05 +00004690 cl = Changelist(
4691 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004692
Edward Lemur678a6842019-10-03 22:25:05 +00004693 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004694 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004695
Edward Lemurf38bc172019-09-03 21:02:13 +00004696 return cl.CMDPatchWithParsedIssue(
4697 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004698
4699
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004700def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004701 """Fetches the tree status and returns either 'open', 'closed',
4702 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004703 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004704 if url:
4705 status = urllib2.urlopen(url).read().lower()
4706 if status.find('closed') != -1 or status == '0':
4707 return 'closed'
4708 elif status.find('open') != -1 or status == '1':
4709 return 'open'
4710 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004711 return 'unset'
4712
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004713
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004714def GetTreeStatusReason():
4715 """Fetches the tree status from a json url and returns the message
4716 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004717 url = settings.GetTreeStatusUrl()
4718 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004719 connection = urllib2.urlopen(json_url)
4720 status = json.loads(connection.read())
4721 connection.close()
4722 return status['message']
4723
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004724
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004725@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004726def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004727 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004728 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004729 status = GetTreeStatus()
4730 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004731 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004732 return 2
4733
vapiera7fbd5a2016-06-16 09:17:49 -07004734 print('The tree is %s' % status)
4735 print()
4736 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004737 if status != 'open':
4738 return 1
4739 return 0
4740
4741
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004742@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004743def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004744 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4745 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004746 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004747 '-b', '--bot', action='append',
4748 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4749 'times to specify multiple builders. ex: '
4750 '"-b win_rel -b win_layout". See '
4751 'the try server waterfall for the builders name and the tests '
4752 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004753 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004754 '-B', '--bucket', default='',
4755 help=('Buildbucket bucket to send the try requests.'))
4756 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004757 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004758 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004759 'be determined by the try recipe that builder runs, which usually '
4760 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004761 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004762 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004763 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004764 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004765 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004766 '--category', default='git_cl_try', help='Specify custom build category.')
4767 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004768 '--project',
4769 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004770 'in recipe to determine to which repository or directory to '
4771 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004772 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004773 '-p', '--property', dest='properties', action='append', default=[],
4774 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004775 'key2=value2 etc. The value will be treated as '
4776 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004777 'NOTE: using this may make your tryjob not usable for CQ, '
4778 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004779 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004780 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4781 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004782 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004783 parser.add_option(
4784 '-R', '--retry-failed', action='store_true', default=False,
4785 help='Retry failed jobs from the latest set of tryjobs. '
4786 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004787 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004788 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004789 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004790 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004791
machenbach@chromium.org45453142015-09-15 08:45:22 +00004792 # Make sure that all properties are prop=value pairs.
4793 bad_params = [x for x in options.properties if '=' not in x]
4794 if bad_params:
4795 parser.error('Got properties with missing "=": %s' % bad_params)
4796
maruel@chromium.org15192402012-09-06 12:38:29 +00004797 if args:
4798 parser.error('Unknown arguments: %s' % args)
4799
Edward Lemur934836a2019-09-09 20:16:54 +00004800 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004801 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004802 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004803
Edward Lemurf38bc172019-09-03 21:02:13 +00004804 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004805 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004806
tandriie113dfd2016-10-11 10:20:12 -07004807 error_message = cl.CannotTriggerTryJobReason()
4808 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004809 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004810
Quinten Yearsley983111f2019-09-26 17:18:48 +00004811 if options.retry_failed:
4812 if options.bot or options.bucket:
4813 print('ERROR: The option --retry-failed is not compatible with '
4814 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4815 return 1
4816 print('Searching for failed tryjobs...')
4817 builds, patchset = _fetch_latest_builds(
4818 auth_config, cl, options.buildbucket_host)
4819 if options.verbose:
4820 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4821 buckets = _filter_failed(builds)
4822 if not buckets:
4823 print('There are no failed jobs in the latest set of jobs '
4824 '(patchset #%d), doing nothing.' % patchset)
4825 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004826 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004827 if num_builders > 10:
4828 confirm_or_exit('There are %d builders with failed builds.'
4829 % num_builders, action='continue')
4830 else:
4831 buckets = _get_bucket_map(cl, options, parser)
4832 if buckets and any(b.startswith('master.') for b in buckets):
4833 print('ERROR: Buildbot masters are not supported.')
4834 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004835
qyearsleydd49f942016-10-28 11:57:22 -07004836 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4837 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004838 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004839 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004840 print('git cl try with no bots now defaults to CQ dry run.')
4841 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4842 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004843
borenet6c0efe62016-10-19 08:13:29 -07004844 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004845 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004846 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004847 'of bot requires an initial job from a parent (usually a builder). '
4848 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004849 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004850 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004851
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004852 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004853 try:
4854 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4855 except BuildbucketResponseException as ex:
4856 print('ERROR: %s' % ex)
4857 return 1
4858 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004859
4860
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004861@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004862def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004863 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004864 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004865 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004866 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004867 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004868 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004869 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004870 '--color', action='store_true', default=setup_color.IS_TTY,
4871 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004872 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004873 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4874 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004875 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004876 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004877 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004878 parser.add_option_group(group)
4879 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004880 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004881 options, args = parser.parse_args(args)
4882 if args:
4883 parser.error('Unrecognized args: %s' % ' '.join(args))
4884
4885 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004886 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004887 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004888 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004889
tandrii221ab252016-10-06 08:12:04 -07004890 patchset = options.patchset
4891 if not patchset:
4892 patchset = cl.GetMostRecentPatchset()
4893 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004894 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004895 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004896 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004897 cl.GetIssue())
4898
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004899 try:
tandrii221ab252016-10-06 08:12:04 -07004900 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004901 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004902 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004903 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004904 if options.json:
4905 write_try_results_json(options.json, jobs)
4906 else:
4907 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004908 return 0
4909
4910
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004911@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004912@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004913def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004914 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004915 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004916 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004917 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004918
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004919 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004920 if args:
4921 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004922 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004923 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004924 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004925 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004926
4927 # Clear configured merge-base, if there is one.
4928 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004929 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004930 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004931 return 0
4932
4933
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004934@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004935def CMDweb(parser, args):
4936 """Opens the current CL in the web browser."""
4937 _, args = parser.parse_args(args)
4938 if args:
4939 parser.error('Unrecognized args: %s' % ' '.join(args))
4940
4941 issue_url = Changelist().GetIssueURL()
4942 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004943 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004944 return 1
4945
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004946 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004947 # allows us to hide the "Created new window in existing browser session."
4948 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004949 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004950 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004951 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004952 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004953 os.open(os.devnull, os.O_RDWR)
4954 try:
4955 webbrowser.open(issue_url)
4956 finally:
4957 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004958 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004959 return 0
4960
4961
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004962@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004963def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004964 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004965 parser.add_option('-d', '--dry-run', action='store_true',
4966 help='trigger in dry run mode')
4967 parser.add_option('-c', '--clear', action='store_true',
4968 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004969 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004970 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004971 if args:
4972 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004973 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004974 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004975
Edward Lemur934836a2019-09-09 20:16:54 +00004976 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004977 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004978 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004979 elif options.dry_run:
4980 state = _CQState.DRY_RUN
4981 else:
4982 state = _CQState.COMMIT
4983 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004984 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004985 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004986 return 0
4987
4988
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004989@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004990def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004991 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004992 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004993 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004994 if args:
4995 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004996 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004997 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004998 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004999 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005000 cl.CloseIssue()
5001 return 0
5002
5003
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005004@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005005def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005006 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005007 parser.add_option(
5008 '--stat',
5009 action='store_true',
5010 dest='stat',
5011 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005012 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005013 if args:
5014 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005015
Edward Lemur934836a2019-09-09 20:16:54 +00005016 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005017 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005018 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005019 if not issue:
5020 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005021
Aaron Gablea718c3e2017-08-28 17:47:28 -07005022 base = cl._GitGetBranchConfigValue('last-upload-hash')
5023 if not base:
5024 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5025 if not base:
5026 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5027 revision_info = detail['revisions'][detail['current_revision']]
5028 fetch_info = revision_info['fetch']['http']
5029 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5030 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005031
Aaron Gablea718c3e2017-08-28 17:47:28 -07005032 cmd = ['git', 'diff']
5033 if options.stat:
5034 cmd.append('--stat')
5035 cmd.append(base)
5036 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005037
5038 return 0
5039
5040
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005041@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005042def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005043 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005044 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005045 '--ignore-current',
5046 action='store_true',
5047 help='Ignore the CL\'s current reviewers and start from scratch.')
5048 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005049 '--ignore-self',
5050 action='store_true',
5051 help='Do not consider CL\'s author as an owners.')
5052 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005053 '--no-color',
5054 action='store_true',
5055 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005056 parser.add_option(
5057 '--batch',
5058 action='store_true',
5059 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005060 # TODO: Consider moving this to another command, since other
5061 # git-cl owners commands deal with owners for a given CL.
5062 parser.add_option(
5063 '--show-all',
5064 action='store_true',
5065 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005066 options, args = parser.parse_args(args)
5067
5068 author = RunGit(['config', 'user.email']).strip() or None
5069
Edward Lemur934836a2019-09-09 20:16:54 +00005070 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005071
Yang Guo6e269a02019-06-26 11:17:02 +00005072 if options.show_all:
5073 for arg in args:
5074 base_branch = cl.GetCommonAncestorWithUpstream()
5075 change = cl.GetChange(base_branch, None)
5076 database = owners.Database(change.RepositoryRoot(), file, os.path)
5077 database.load_data_needed_for([arg])
5078 print('Owners for %s:' % arg)
5079 for owner in sorted(database.all_possible_owners([arg], None)):
5080 print(' - %s' % owner)
5081 return 0
5082
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005083 if args:
5084 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005085 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005086 base_branch = args[0]
5087 else:
5088 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005089 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005090
5091 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005092 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5093
5094 if options.batch:
5095 db = owners.Database(change.RepositoryRoot(), file, os.path)
5096 print('\n'.join(db.reviewers_for(affected_files, author)))
5097 return 0
5098
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005099 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005100 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005101 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005102 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005103 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005104 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005105 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005106 override_files=change.OriginalOwnersFiles(),
5107 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005108
5109
Aiden Bennerc08566e2018-10-03 17:52:42 +00005110def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005111 """Generates a diff command."""
5112 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005113 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5114
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005115 if allow_prefix:
5116 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5117 # case that diff.noprefix is set in the user's git config.
5118 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5119 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005120 diff_cmd += ['--no-prefix']
5121
5122 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005123
5124 if args:
5125 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005126 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005127 diff_cmd.append(arg)
5128 else:
5129 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005130
5131 return diff_cmd
5132
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005133
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005134def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005135 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005136 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005137
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005138
enne@chromium.org555cfe42014-01-29 18:21:39 +00005139@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005140@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005141def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005142 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005143 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005144 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005145 parser.add_option('--full', action='store_true',
5146 help='Reformat the full content of all touched files')
5147 parser.add_option('--dry-run', action='store_true',
5148 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005149 parser.add_option(
5150 '--python',
5151 action='store_true',
5152 default=None,
5153 help='Enables python formatting on all python files.')
5154 parser.add_option(
5155 '--no-python',
5156 action='store_true',
5157 dest='python',
5158 help='Disables python formatting on all python files. '
5159 'Takes precedence over --python. '
5160 'If neither --python or --no-python are set, python '
5161 'files that have a .style.yapf file in an ancestor '
5162 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005163 parser.add_option('--js', action='store_true',
5164 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005165 parser.add_option('--diff', action='store_true',
5166 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005167 parser.add_option('--presubmit', action='store_true',
5168 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005169 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005170
Daniel Chengc55eecf2016-12-30 03:11:02 -08005171 # Normalize any remaining args against the current path, so paths relative to
5172 # the current directory are still resolved as expected.
5173 args = [os.path.join(os.getcwd(), arg) for arg in args]
5174
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005175 # git diff generates paths against the root of the repository. Change
5176 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005177 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005178 if rel_base_path:
5179 os.chdir(rel_base_path)
5180
digit@chromium.org29e47272013-05-17 17:01:46 +00005181 # Grab the merge-base commit, i.e. the upstream commit of the current
5182 # branch when it was created or the last time it was rebased. This is
5183 # to cover the case where the user may have called "git fetch origin",
5184 # moving the origin branch to a newer commit, but hasn't rebased yet.
5185 upstream_commit = None
5186 cl = Changelist()
5187 upstream_branch = cl.GetUpstreamBranch()
5188 if upstream_branch:
5189 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5190 upstream_commit = upstream_commit.strip()
5191
5192 if not upstream_commit:
5193 DieWithError('Could not find base commit for this branch. '
5194 'Are you in detached state?')
5195
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005196 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5197 diff_output = RunGit(changed_files_cmd)
5198 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005199 # Filter out files deleted by this CL
5200 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005201
Christopher Lamc5ba6922017-01-24 11:19:14 +11005202 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005203 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005204
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005205 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5206 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5207 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005208 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005209
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005210 top_dir = os.path.normpath(
5211 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5212
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5214 # formatted. This is used to block during the presubmit.
5215 return_value = 0
5216
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005217 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005218 # Locate the clang-format binary in the checkout
5219 try:
5220 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005221 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005222 DieWithError(e)
5223
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005224 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005225 cmd = [clang_format_tool]
5226 if not opts.dry_run and not opts.diff:
5227 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005228 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005229 if opts.diff:
5230 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005231 else:
5232 env = os.environ.copy()
5233 env['PATH'] = str(os.path.dirname(clang_format_tool))
5234 try:
5235 script = clang_format.FindClangFormatScriptInChromiumTree(
5236 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005237 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005238 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005239
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005240 cmd = [sys.executable, script, '-p0']
5241 if not opts.dry_run and not opts.diff:
5242 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005243
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005244 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5245 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005246
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005247 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5248 if opts.diff:
5249 sys.stdout.write(stdout)
5250 if opts.dry_run and len(stdout) > 0:
5251 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005252
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005253 # Similar code to above, but using yapf on .py files rather than clang-format
5254 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005255 py_explicitly_disabled = opts.python is not None and not opts.python
5256 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005257 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5258 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5259 if sys.platform.startswith('win'):
5260 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005261
Aiden Bennerc08566e2018-10-03 17:52:42 +00005262 # If we couldn't find a yapf file we'll default to the chromium style
5263 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005264 chromium_default_yapf_style = os.path.join(depot_tools_path,
5265 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005266 # Used for caching.
5267 yapf_configs = {}
5268 for f in python_diff_files:
5269 # Find the yapf style config for the current file, defaults to depot
5270 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005271 _FindYapfConfigFile(f, yapf_configs, top_dir)
5272
5273 # Turn on python formatting by default if a yapf config is specified.
5274 # This breaks in the case of this repo though since the specified
5275 # style file is also the global default.
5276 if opts.python is None:
5277 filtered_py_files = []
5278 for f in python_diff_files:
5279 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5280 filtered_py_files.append(f)
5281 else:
5282 filtered_py_files = python_diff_files
5283
5284 # Note: yapf still seems to fix indentation of the entire file
5285 # even if line ranges are specified.
5286 # See https://github.com/google/yapf/issues/499
5287 if not opts.full and filtered_py_files:
5288 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5289
5290 for f in filtered_py_files:
5291 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5292 if yapf_config is None:
5293 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005294
5295 cmd = [yapf_tool, '--style', yapf_config, f]
5296
5297 has_formattable_lines = False
5298 if not opts.full:
5299 # Only run yapf over changed line ranges.
5300 for diff_start, diff_len in py_line_diffs[f]:
5301 diff_end = diff_start + diff_len - 1
5302 # Yapf errors out if diff_end < diff_start but this
5303 # is a valid line range diff for a removal.
5304 if diff_end >= diff_start:
5305 has_formattable_lines = True
5306 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5307 # If all line diffs were removals we have nothing to format.
5308 if not has_formattable_lines:
5309 continue
5310
5311 if opts.diff or opts.dry_run:
5312 cmd += ['--diff']
5313 # Will return non-zero exit code if non-empty diff.
5314 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5315 if opts.diff:
5316 sys.stdout.write(stdout)
5317 elif len(stdout) > 0:
5318 return_value = 2
5319 else:
5320 cmd += ['-i']
5321 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005322
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005323 # Dart's formatter does not have the nice property of only operating on
5324 # modified chunks, so hard code full.
5325 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005326 try:
5327 command = [dart_format.FindDartFmtToolInChromiumTree()]
5328 if not opts.dry_run and not opts.diff:
5329 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005330 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005331
ppi@chromium.org6593d932016-03-03 15:41:15 +00005332 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005333 if opts.dry_run and stdout:
5334 return_value = 2
5335 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005336 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5337 'found in this checkout. Files in other languages are still '
5338 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005339
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005340 # Format GN build files. Always run on full build files for canonical form.
5341 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005342 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005343 if opts.dry_run or opts.diff:
5344 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005345 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005346 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5347 shell=sys.platform == 'win32',
5348 cwd=top_dir)
5349 if opts.dry_run and gn_ret == 2:
5350 return_value = 2 # Not formatted.
5351 elif opts.diff and gn_ret == 2:
5352 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005353 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005354 elif gn_ret != 0:
5355 # For non-dry run cases (and non-2 return values for dry-run), a
5356 # nonzero error code indicates a failure, probably because the file
5357 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005358 DieWithError('gn format failed on ' + gn_diff_file +
5359 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005360
Ilya Shermane081cbe2017-08-15 17:51:04 -07005361 # Skip the metrics formatting from the global presubmit hook. These files have
5362 # a separate presubmit hook that issues an error if the files need formatting,
5363 # whereas the top-level presubmit script merely issues a warning. Formatting
5364 # these files is somewhat slow, so it's important not to duplicate the work.
5365 if not opts.presubmit:
5366 for xml_dir in GetDirtyMetricsDirs(diff_files):
5367 tool_dir = os.path.join(top_dir, xml_dir)
5368 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5369 if opts.dry_run or opts.diff:
5370 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005371 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005372 if opts.diff:
5373 sys.stdout.write(stdout)
5374 if opts.dry_run and stdout:
5375 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005376
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005377 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005378
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005379
Steven Holte2e664bf2017-04-21 13:10:47 -07005380def GetDirtyMetricsDirs(diff_files):
5381 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5382 metrics_xml_dirs = [
5383 os.path.join('tools', 'metrics', 'actions'),
5384 os.path.join('tools', 'metrics', 'histograms'),
5385 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005386 os.path.join('tools', 'metrics', 'ukm'),
5387 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005388 for xml_dir in metrics_xml_dirs:
5389 if any(file.startswith(xml_dir) for file in xml_diff_files):
5390 yield xml_dir
5391
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005392
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005393@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005394@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005395def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005396 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005397 _, args = parser.parse_args(args)
5398
5399 if len(args) != 1:
5400 parser.print_help()
5401 return 1
5402
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005403 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005404 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005405 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005406
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005407 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005408
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005409 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005410 output = RunGit(['config', '--local', '--get-regexp',
5411 r'branch\..*\.%s' % issueprefix],
5412 error_ok=True)
5413 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005414 if issue == target_issue:
5415 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005416
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005417 branches = []
5418 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005419 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005420 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005421 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005422 return 1
5423 if len(branches) == 1:
5424 RunGit(['checkout', branches[0]])
5425 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005426 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005427 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005428 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005429 which = raw_input('Choose by index: ')
5430 try:
5431 RunGit(['checkout', branches[int(which)]])
5432 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005433 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005434 return 1
5435
5436 return 0
5437
5438
maruel@chromium.org29404b52014-09-08 22:58:00 +00005439def CMDlol(parser, args):
5440 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005441 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005442 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5443 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5444 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005445 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005446 return 0
5447
5448
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005449class OptionParser(optparse.OptionParser):
5450 """Creates the option parse and add --verbose support."""
5451 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005452 optparse.OptionParser.__init__(
5453 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005454 self.add_option(
5455 '-v', '--verbose', action='count', default=0,
5456 help='Use 2 times for more debugging info')
5457
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005458 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005459 try:
5460 return self._parse_args(args)
5461 finally:
5462 # Regardless of success or failure of args parsing, we want to report
5463 # metrics, but only after logging has been initialized (if parsing
5464 # succeeded).
5465 global settings
5466 settings = Settings()
5467
5468 if not metrics.DISABLE_METRICS_COLLECTION:
5469 # GetViewVCUrl ultimately calls logging method.
5470 project_url = settings.GetViewVCUrl().strip('/+')
5471 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5472 metrics.collector.add('project_urls', [project_url])
5473
5474 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005475 # Create an optparse.Values object that will store only the actual passed
5476 # options, without the defaults.
5477 actual_options = optparse.Values()
5478 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5479 # Create an optparse.Values object with the default options.
5480 options = optparse.Values(self.get_default_values().__dict__)
5481 # Update it with the options passed by the user.
5482 options._update_careful(actual_options.__dict__)
5483 # Store the options passed by the user in an _actual_options attribute.
5484 # We store only the keys, and not the values, since the values can contain
5485 # arbitrary information, which might be PII.
5486 metrics.collector.add('arguments', actual_options.__dict__.keys())
5487
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005488 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005489 logging.basicConfig(
5490 level=levels[min(options.verbose, len(levels) - 1)],
5491 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5492 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005493
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005494 return options, args
5495
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005496
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005497def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005498 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005499 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005500 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005501 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005502
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005503 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005504 dispatcher = subcommand.CommandDispatcher(__name__)
5505 try:
5506 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005507 except auth.AuthenticationError as e:
5508 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005509 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005510 if e.code != 500:
5511 raise
5512 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005513 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005514 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005515 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005516
5517
5518if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005519 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5520 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005521 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005522 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005523 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005524 sys.exit(main(sys.argv[1:]))