blob: 6c06ef4032df7868120e9304911de7d1797ade5f [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):
316 properties = dict(x.split('=', 1) for x in options.properties)
317 for key, val in properties.iteritems():
318 try:
319 properties[key] = json.loads(val)
320 except ValueError:
321 pass # If a value couldn't be evaluated, treat it as a string.
322 return properties
323
324
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325# TODO(crbug.com/976104): Remove this function once git-cl try-results has
326# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000327def _buildbucket_retry(operation_name, http, *args, **kwargs):
328 """Retries requests to buildbucket service and returns parsed json content."""
329 try_count = 0
330 while True:
331 response, content = http.request(*args, **kwargs)
332 try:
333 content_json = json.loads(content)
334 except ValueError:
335 content_json = None
336
337 # Buildbucket could return an error even if status==200.
338 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000339 error = content_json.get('error')
340 if error.get('code') == 403:
341 raise BuildbucketResponseException(
342 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000343 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000344 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000345 raise BuildbucketResponseException(msg)
346
347 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700348 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000349 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000350 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700351 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000352 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000353 content)
354 return content_json
355 if response.status < 500 or try_count >= 2:
356 raise httplib2.HttpLib2Error(content)
357
358 # status >= 500 means transient failures.
359 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000360 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000361 try_count += 1
362 assert False, 'unreachable'
363
364
Edward Lemur4c707a22019-09-24 21:13:43 +0000365def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000366 """Calls a buildbucket v2 method and returns the parsed json response."""
367 headers = {
368 'Accept': 'application/json',
369 'Content-Type': 'application/json',
370 }
371 request = json.dumps(request)
372 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
373
374 logging.info('POST %s with %s' % (url, request))
375
376 attempts = 1
377 time_to_sleep = 1
378 while True:
379 response, content = http.request(url, 'POST', body=request, headers=headers)
380 if response.status == 200:
381 return json.loads(content[4:])
382 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
383 msg = '%s error when calling POST %s with %s: %s' % (
384 response.status, url, request, content)
385 raise BuildbucketResponseException(msg)
386 logging.debug(
387 '%s error when calling POST %s with %s. '
388 'Sleeping for %d seconds and retrying...' % (
389 response.status, url, request, time_to_sleep))
390 time.sleep(time_to_sleep)
391 time_to_sleep *= 2
392 attempts += 1
393
394 assert False, 'unreachable'
395
396
qyearsley1fdfcb62016-10-24 13:22:03 -0700397def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700398 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000399 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 """
qyearsleydd49f942016-10-28 11:57:22 -0700401 # If no bots are listed, we try to get a set of builders and tests based
402 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700403 if not options.bot:
404 change = changelist.GetChange(
405 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700406 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700407 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700408 change=change,
409 changed_files=change.LocalPaths(),
410 repository_root=settings.GetRoot(),
411 default_presubmit=None,
412 project=None,
413 verbose=options.verbose,
414 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700415 if masters is None:
416 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000417 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700418
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 if options.bucket:
420 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000421 option_parser.error(
422 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700423
424
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425def _parse_bucket(bucket):
426 if '/' in bucket:
427 return tuple(bucket.split('/', 1))
428 # Legacy buckets.
429 print('WARNING Please specify buckets as <project>/<bucket>.')
430 # Assume luci.<project>.<bucket>.
431 if bucket.startswith('luci.'):
432 return tuple(bucket[len('luci.'):].split('.', 1))
433 # Otherwise, assume prefix is also the project name.
434 if '.' in bucket:
435 project = bucket.split('.')[0]
436 return project, bucket
437 return None, None
438
439
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800440def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000441 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700442
443 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700444 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000445 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700446 buckets: A nested dict mapping bucket names to builders to tests.
447 options: Command-line options.
448 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449 print('Scheduling jobs on:')
450 for bucket, builders_and_tests in sorted(buckets.iteritems()):
451 print('Bucket:', bucket)
452 print('\n'.join(
453 ' %s: %s' % (builder, tests)
454 for builder, tests in sorted(builders_and_tests.iteritems())))
455 print('To see results here, run: git cl try-results')
456 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700457
Edward Lemurf0faf482019-09-25 20:40:17 +0000458 gerrit_changes = [changelist.GetGerritChange(patchset)]
459 shared_properties = {'category': options.category}
460 shared_properties.update(changelist.GetLegacyProperties(patchset))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 if options.clobber:
462 shared_properties['clobber'] = True
463 shared_properties.update(_get_properties_from_options(options) or {})
464
465 requests = []
466 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
467 project, bucket = _parse_bucket(raw_bucket)
468 if not project or not bucket:
469 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
470 continue
471
472 for builder, tests in sorted(builders_and_tests.iteritems()):
473 properties = shared_properties.copy()
474 if 'presubmit' in builder.lower():
475 properties['dry_run'] = 'true'
476 if tests:
477 properties['testfilter'] = tests
478
479 requests.append({
480 'scheduleBuild': {
481 'requestId': str(uuid.uuid4()),
482 'builder': {
483 'project': options.project or project,
484 'bucket': bucket,
485 'builder': builder,
486 },
487 'gerritChanges': gerrit_changes,
488 'properties': properties,
489 'tags': [
490 {'key': 'builder', 'value': builder},
491 {'key': 'user_agent', 'value': 'git_cl_try'},
492 ],
493 }
494 })
495
496 if not requests:
497 return
498
499 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000500 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000501
Edward Lemur2c210a42019-09-16 23:58:35 +0000502 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
503 http = authenticator.authorize(httplib2.Http())
504 http.force_exception_to_status_code = True
505
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000506 batch_request = {'requests': requests}
507 batch_response = _call_buildbucket(
Edward Lemur4c707a22019-09-24 21:13:43 +0000508 http, options.buildbucket_host, 'Batch', batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000509
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 errors = [
511 ' ' + response['error']['message']
512 for response in batch_response.get('responses', [])
513 if 'error' in response
514 ]
515 if errors:
516 raise BuildbucketResponseException(
517 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000518
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000519
tandrii221ab252016-10-06 08:12:04 -0700520def fetch_try_jobs(auth_config, changelist, buildbucket_host,
521 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000522 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 Returns a map from build ID to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000525 """
tandrii221ab252016-10-06 08:12:04 -0700526 assert buildbucket_host
527 assert changelist.GetIssue(), 'CL must be uploaded first'
528 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
529 patchset = patchset or changelist.GetMostRecentPatchset()
530 assert patchset, 'CL must be uploaded first'
531
532 codereview_url = changelist.GetCodereviewServer()
533 codereview_host = urlparse.urlparse(codereview_url).hostname
534 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 if authenticator.has_cached_credentials():
536 http = authenticator.authorize(httplib2.Http())
537 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700538 print('Warning: Some results might be missing because %s' %
539 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000540 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541 http = httplib2.Http()
542
543 http.force_exception_to_status_code = True
544
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000545 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700546 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000547 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700548 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 params = {'tag': 'buildset:%s' % buildset}
550
551 builds = {}
552 while True:
553 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700554 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000556 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 for build in content.get('builds', []):
558 builds[build['id']] = build
559 if 'next_cursor' in content:
560 params['start_cursor'] = content['next_cursor']
561 else:
562 break
563 return builds
564
565
Quinten Yearsley983111f2019-09-26 17:18:48 +0000566def _fetch_latest_builds(auth_config, changelist, buildbucket_host):
567 """Fetches builds from the latest patchset that has builds (within
568 the last few patchsets).
569
570 Args:
571 auth_config (auth.AuthConfig): Auth info for Buildbucket
572 changelist (Changelist): The CL to fetch builds for
573 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
574
575 Returns:
576 A tuple (builds, patchset) where builds is a dict mapping from build ID to
577 build info from Buildbucket, and patchset is the patchset number where
578 those builds came from.
579 """
580 assert buildbucket_host
581 assert changelist.GetIssue(), 'CL must be uploaded first'
582 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
583 assert changelist.GetMostRecentPatchset()
584 ps = changelist.GetMostRecentPatchset()
585 min_ps = max(1, ps - 5)
586 while ps >= min_ps:
587 builds = fetch_try_jobs(
588 auth_config, changelist, buildbucket_host, patchset=ps)
589 if len(builds):
590 return builds, ps
591 ps -= 1
592 return [], 0
593
594
595def _filter_failed(builds):
596 """Returns a list of buckets/builders that had failed builds.
597
598 Args:
599 builds (dict): Builds, in the format returned by fetch_try_jobs,
600 i.e. a dict mapping build ID to build info dict, which includes
601 the keys status, result, bucket, and builder_name.
602
603 Returns:
604 A dict of bucket to builder to tests (empty list). This is the same format
605 accepted by _trigger_try_jobs and returned by _get_bucket_map.
606 """
607 buckets = collections.defaultdict(dict)
608 for build in builds.values():
609 if build['status'] == 'COMPLETED' and build['result'] == 'FAILURE':
610 project = build['project']
611 bucket = build['bucket']
612 if bucket.startswith('luci.'):
613 # Assume legacy bucket name luci.<project>.<bucket>.
614 bucket = bucket.split('.')[2]
615 builder = _get_builder_from_build(build)
616 buckets[project + '/' + bucket][builder] = []
617 return buckets
618
619
qyearsleyeab3c042016-08-24 09:18:28 -0700620def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621 """Prints nicely result of fetch_try_jobs."""
622 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000623 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624 return
625
626 # Make a copy, because we'll be modifying builds dictionary.
627 builds = builds.copy()
628 builder_names_cache = {}
629
630 def get_builder(b):
631 try:
632 return builder_names_cache[b['id']]
633 except KeyError:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000634 name = _get_builder_from_build(b)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000635 builder_names_cache[b['id']] = name
636 return name
637
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638 if options.print_master:
639 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000640 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641 max(len(str(get_builder(b))) for b in builds.itervalues()))
642 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000643 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000644 else:
645 name_fmt = '%%-%ds' % (
646 max(len(str(get_builder(b))) for b in builds.itervalues()))
647 def get_name(b):
648 return name_fmt % get_builder(b)
649
650 def sort_key(b):
651 return b['status'], b.get('result'), get_name(b), b.get('url')
652
653 def pop(title, f, color=None, **kwargs):
654 """Pop matching builds from `builds` dict and print them."""
655
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000656 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000657 colorize = str
658 else:
659 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
660
661 result = []
662 for b in builds.values():
663 if all(b.get(k) == v for k, v in kwargs.iteritems()):
664 builds.pop(b['id'])
665 result.append(b)
666 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700667 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700669 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000670
671 total = len(builds)
672 pop(status='COMPLETED', result='SUCCESS',
673 title='Successes:', color=Fore.GREEN,
674 f=lambda b: (get_name(b), b.get('url')))
675 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
676 title='Infra Failures:', color=Fore.MAGENTA,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
679 title='Failures:', color=Fore.RED,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='CANCELED',
682 title='Canceled:', color=Fore.MAGENTA,
683 f=lambda b: (get_name(b),))
684 pop(status='COMPLETED', result='FAILURE',
685 failure_reason='INVALID_BUILD_DEFINITION',
686 title='Wrong master/builder name:', color=Fore.MAGENTA,
687 f=lambda b: (get_name(b),))
688 pop(status='COMPLETED', result='FAILURE',
689 title='Other failures:',
690 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
691 pop(status='COMPLETED',
692 title='Other finished:',
693 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
694 pop(status='STARTED',
695 title='Started:', color=Fore.YELLOW,
696 f=lambda b: (get_name(b), b.get('url')))
697 pop(status='SCHEDULED',
698 title='Scheduled:',
699 f=lambda b: (get_name(b), 'id=%s' % b['id']))
700 # The last section is just in case buildbucket API changes OR there is a bug.
701 pop(title='Other:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000704 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000705
706
Quinten Yearsley983111f2019-09-26 17:18:48 +0000707def _get_builder_from_build(build):
708 """Returns a builder name from a BB v1 build info dict."""
709 try:
710 parameters = json.loads(build['parameters_json'])
711 name = parameters['builder_name']
712 except (ValueError, KeyError) as error:
713 print('WARNING: Failed to get builder name for build %s: %s' % (
714 build['id'], error))
715 name = None
716 return name
717
718
Aiden Bennerc08566e2018-10-03 17:52:42 +0000719def _ComputeDiffLineRanges(files, upstream_commit):
720 """Gets the changed line ranges for each file since upstream_commit.
721
722 Parses a git diff on provided files and returns a dict that maps a file name
723 to an ordered list of range tuples in the form (start_line, count).
724 Ranges are in the same format as a git diff.
725 """
726 # If files is empty then diff_output will be a full diff.
727 if len(files) == 0:
728 return {}
729
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000730 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000731 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
732 diff_output = RunGit(diff_cmd)
733
734 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
735 # 2 capture groups
736 # 0 == fname of diff file
737 # 1 == 'diff_start,diff_count' or 'diff_start'
738 # will match each of
739 # diff --git a/foo.foo b/foo.py
740 # @@ -12,2 +14,3 @@
741 # @@ -12,2 +17 @@
742 # running re.findall on the above string with pattern will give
743 # [('foo.py', ''), ('', '14,3'), ('', '17')]
744
745 curr_file = None
746 line_diffs = {}
747 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
748 if match[0] != '':
749 # Will match the second filename in diff --git a/a.py b/b.py.
750 curr_file = match[0]
751 line_diffs[curr_file] = []
752 else:
753 # Matches +14,3
754 if ',' in match[1]:
755 diff_start, diff_count = match[1].split(',')
756 else:
757 # Single line changes are of the form +12 instead of +12,1.
758 diff_start = match[1]
759 diff_count = 1
760
761 diff_start = int(diff_start)
762 diff_count = int(diff_count)
763
764 # If diff_count == 0 this is a removal we can ignore.
765 line_diffs[curr_file].append((diff_start, diff_count))
766
767 return line_diffs
768
769
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000770def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000771 """Checks if a yapf file is in any parent directory of fpath until top_dir.
772
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000773 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000774 is found returns None. Uses yapf_config_cache as a cache for previously found
775 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000776 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000777 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000778 # Return result if we've already computed it.
779 if fpath in yapf_config_cache:
780 return yapf_config_cache[fpath]
781
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000782 parent_dir = os.path.dirname(fpath)
783 if os.path.isfile(fpath):
784 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000785 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000786 # Otherwise fpath is a directory
787 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
788 if os.path.isfile(yapf_file):
789 ret = yapf_file
790 elif fpath == top_dir or parent_dir == fpath:
791 # If we're at the top level directory, or if we're at root
792 # there is no provided style.
793 ret = None
794 else:
795 # Otherwise recurse on the current directory.
796 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000797 yapf_config_cache[fpath] = ret
798 return ret
799
800
qyearsley53f48a12016-09-01 10:45:13 -0700801def write_try_results_json(output_file, builds):
802 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
803
804 The input |builds| dict is assumed to be generated by Buildbucket.
805 Buildbucket documentation: http://goo.gl/G0s101
806 """
807
808 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800809 """Extracts some of the information from one build dict."""
810 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700811 return {
812 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700813 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800814 'builder_name': parameters.get('builder_name'),
815 'created_ts': build.get('created_ts'),
816 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700817 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800818 'result': build.get('result'),
819 'status': build.get('status'),
820 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700821 'url': build.get('url'),
822 }
823
824 converted = []
825 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000826 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700827 write_json(output_file, converted)
828
829
Aaron Gable13101a62018-02-09 13:20:41 -0800830def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000831 """Prints statistics about the change to the user."""
832 # --no-ext-diff is broken in some versions of Git, so try to work around
833 # this by overriding the environment (but there is still a problem if the
834 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000835 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000836 if 'GIT_EXTERNAL_DIFF' in env:
837 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000838
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000839 try:
840 stdout = sys.stdout.fileno()
841 except AttributeError:
842 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000843 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800844 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000845 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000846
847
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000848class BuildbucketResponseException(Exception):
849 pass
850
851
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000852class Settings(object):
853 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000855 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 self.tree_status_url = None
857 self.viewvc_url = None
858 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000859 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000860 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000861 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000862 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000863
864 def LazyUpdateIfNeeded(self):
865 """Updates the settings from a codereview.settings file, if available."""
866 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000867 # The only value that actually changes the behavior is
868 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000869 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000870 error_ok=True
871 ).strip().lower()
872
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000873 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000874 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875 LoadCodereviewSettingsFromFile(cr_settings_file)
876 self.updated = True
877
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000878 @staticmethod
879 def GetRelativeRoot():
880 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000881
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000882 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000883 if self.root is None:
884 self.root = os.path.abspath(self.GetRelativeRoot())
885 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000886
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000887 def GetTreeStatusUrl(self, error_ok=False):
888 if not self.tree_status_url:
889 error_message = ('You must configure your tree status URL by running '
890 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 self.tree_status_url = self._GetConfig(
892 'rietveld.tree-status-url', error_ok=error_ok,
893 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000894 return self.tree_status_url
895
896 def GetViewVCUrl(self):
897 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000898 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899 return self.viewvc_url
900
rmistry@google.com90752582014-01-14 21:04:50 +0000901 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000902 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000903
rmistry@google.com5626a922015-02-26 14:03:30 +0000904 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000905 run_post_upload_hook = self._GetConfig(
906 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000907 return run_post_upload_hook == "True"
908
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000909 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000910 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000911
ukai@chromium.orge8077812012-02-03 03:41:46 +0000912 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000913 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000914 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700915 self.is_gerrit = (
916 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000917 return self.is_gerrit
918
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000919 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000920 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000921 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700922 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
923 if self.squash_gerrit_uploads is None:
924 # Default is squash now (http://crbug.com/611892#c23).
925 self.squash_gerrit_uploads = not (
926 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
927 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000928 return self.squash_gerrit_uploads
929
tandriia60502f2016-06-20 02:01:53 -0700930 def GetSquashGerritUploadsOverride(self):
931 """Return True or False if codereview.settings should be overridden.
932
933 Returns None if no override has been defined.
934 """
935 # See also http://crbug.com/611892#c23
936 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
937 error_ok=True).strip()
938 if result == 'true':
939 return True
940 if result == 'false':
941 return False
942 return None
943
tandrii@chromium.org28253532016-04-14 13:46:56 +0000944 def GetGerritSkipEnsureAuthenticated(self):
945 """Return True if EnsureAuthenticated should not be done for Gerrit
946 uploads."""
947 if self.gerrit_skip_ensure_authenticated is None:
948 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000949 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000950 error_ok=True).strip() == 'true')
951 return self.gerrit_skip_ensure_authenticated
952
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000953 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000954 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000955 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000956 # Git requires single quotes for paths with spaces. We need to replace
957 # them with double quotes for Windows to treat such paths as a single
958 # path.
959 self.git_editor = self._GetConfig(
960 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000961 return self.git_editor or None
962
thestig@chromium.org44202a22014-03-11 19:22:18 +0000963 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000964 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000965 DEFAULT_LINT_REGEX)
966
967 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000968 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000969 DEFAULT_LINT_IGNORE_REGEX)
970
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971 def _GetConfig(self, param, **kwargs):
972 self.LazyUpdateIfNeeded()
973 return RunGit(['config', param], **kwargs).strip()
974
975
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000976def ShortBranchName(branch):
977 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000978 return branch.replace('refs/heads/', '', 1)
979
980
981def GetCurrentBranchRef():
982 """Returns branch ref (e.g., refs/heads/master) or None."""
983 return RunGit(['symbolic-ref', 'HEAD'],
984 stderr=subprocess2.VOID, error_ok=True).strip() or None
985
986
987def GetCurrentBranch():
988 """Returns current branch or None.
989
990 For refs/heads/* branches, returns just last part. For others, full ref.
991 """
992 branchref = GetCurrentBranchRef()
993 if branchref:
994 return ShortBranchName(branchref)
995 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000996
997
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000998class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000999 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001000 NONE = 'none'
1001 DRY_RUN = 'dry_run'
1002 COMMIT = 'commit'
1003
1004 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1005
1006
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001007class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001008 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001009 self.issue = issue
1010 self.patchset = patchset
1011 self.hostname = hostname
1012
1013 @property
1014 def valid(self):
1015 return self.issue is not None
1016
1017
Edward Lemurf38bc172019-09-03 21:02:13 +00001018def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001019 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1020 fail_result = _ParsedIssueNumberArgument()
1021
1022 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001023 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001024 if not arg.startswith('http'):
1025 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001026
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001027 url = gclient_utils.UpgradeToHttps(arg)
1028 try:
1029 parsed_url = urlparse.urlparse(url)
1030 except ValueError:
1031 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001032
Edward Lemur125d60a2019-09-13 18:25:41 +00001033 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001034
1035
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001036def _create_description_from_log(args):
1037 """Pulls out the commit log to use as a base for the CL description."""
1038 log_args = []
1039 if len(args) == 1 and not args[0].endswith('.'):
1040 log_args = [args[0] + '..']
1041 elif len(args) == 1 and args[0].endswith('...'):
1042 log_args = [args[0][:-1]]
1043 elif len(args) == 2:
1044 log_args = [args[0] + '..' + args[1]]
1045 else:
1046 log_args = args[:] # Hope for the best!
1047 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1048
1049
Aaron Gablea45ee112016-11-22 15:14:38 -08001050class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001051 def __init__(self, issue, url):
1052 self.issue = issue
1053 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001054 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001055
1056 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001057 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001058 self.issue, self.url)
1059
1060
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001061_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001062 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001063 # TODO(tandrii): these two aren't known in Gerrit.
1064 'approval', 'disapproval'])
1065
1066
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001067class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001068 """Changelist works with one changelist in local branch.
1069
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001070 Notes:
1071 * Not safe for concurrent multi-{thread,process} use.
1072 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001073 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001074 """
1075
Edward Lemur125d60a2019-09-13 18:25:41 +00001076 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001077 """Create a new ChangeList instance.
1078
Edward Lemurf38bc172019-09-03 21:02:13 +00001079 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001080 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001081 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001082 global settings
1083 if not settings:
1084 # Happens when git_cl.py is used as a utility library.
1085 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001086
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001087 self.branchref = branchref
1088 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001089 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 self.branch = ShortBranchName(self.branchref)
1091 else:
1092 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001094 self.lookedup_issue = False
1095 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096 self.has_description = False
1097 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001098 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001100 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001101 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001102 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001103 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001104
Edward Lemur125d60a2019-09-13 18:25:41 +00001105 # Lazily cached values.
1106 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1107 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1108 # Map from change number (issue) to its detail cache.
1109 self._detail_cache = {}
1110
1111 if codereview_host is not None:
1112 assert not codereview_host.startswith('https://'), codereview_host
1113 self._gerrit_host = codereview_host
1114 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001115
1116 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001117 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001118
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001119 The return value is a string suitable for passing to git cl with the --cc
1120 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121 """
1122 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001123 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001124 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001125 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1126 return self.cc
1127
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001128 def GetCCListWithoutDefault(self):
1129 """Return the users cc'd on this CL excluding default ones."""
1130 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001131 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001132 return self.cc
1133
Daniel Cheng7227d212017-11-17 08:12:37 -08001134 def ExtendCC(self, more_cc):
1135 """Extends the list of users to cc on this CL based on the changed files."""
1136 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137
1138 def GetBranch(self):
1139 """Returns the short branch name, e.g. 'master'."""
1140 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001141 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001142 if not branchref:
1143 return None
1144 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 self.branch = ShortBranchName(self.branchref)
1146 return self.branch
1147
1148 def GetBranchRef(self):
1149 """Returns the full branch name, e.g. 'refs/heads/master'."""
1150 self.GetBranch() # Poke the lazy loader.
1151 return self.branchref
1152
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001153 def ClearBranch(self):
1154 """Clears cached branch data of this object."""
1155 self.branch = self.branchref = None
1156
tandrii5d48c322016-08-18 16:19:37 -07001157 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1158 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1159 kwargs['branch'] = self.GetBranch()
1160 return _git_get_branch_config_value(key, default, **kwargs)
1161
1162 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1163 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1164 assert self.GetBranch(), (
1165 'this CL must have an associated branch to %sset %s%s' %
1166 ('un' if value is None else '',
1167 key,
1168 '' if value is None else ' to %r' % value))
1169 kwargs['branch'] = self.GetBranch()
1170 return _git_set_branch_config_value(key, value, **kwargs)
1171
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 @staticmethod
1173 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001174 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001175 e.g. 'origin', 'refs/heads/master'
1176 """
1177 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001178 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1179
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001181 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001182 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001183 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1184 error_ok=True).strip()
1185 if upstream_branch:
1186 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001188 # Else, try to guess the origin remote.
1189 remote_branches = RunGit(['branch', '-r']).split()
1190 if 'origin/master' in remote_branches:
1191 # Fall back on origin/master if it exits.
1192 remote = 'origin'
1193 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001194 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001195 DieWithError(
1196 'Unable to determine default branch to diff against.\n'
1197 'Either pass complete "git diff"-style arguments, like\n'
1198 ' git cl upload origin/master\n'
1199 'or verify this branch is set up to track another \n'
1200 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201
1202 return remote, upstream_branch
1203
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001204 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001205 upstream_branch = self.GetUpstreamBranch()
1206 if not BranchExists(upstream_branch):
1207 DieWithError('The upstream for the current branch (%s) does not exist '
1208 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001209 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001210 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001211
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001212 def GetUpstreamBranch(self):
1213 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001214 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001215 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001216 upstream_branch = upstream_branch.replace('refs/heads/',
1217 'refs/remotes/%s/' % remote)
1218 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1219 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220 self.upstream_branch = upstream_branch
1221 return self.upstream_branch
1222
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001223 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001224 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001225 remote, branch = None, self.GetBranch()
1226 seen_branches = set()
1227 while branch not in seen_branches:
1228 seen_branches.add(branch)
1229 remote, branch = self.FetchUpstreamTuple(branch)
1230 branch = ShortBranchName(branch)
1231 if remote != '.' or branch.startswith('refs/remotes'):
1232 break
1233 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001234 remotes = RunGit(['remote'], error_ok=True).split()
1235 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001237 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001238 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001239 logging.warn('Could not determine which remote this change is '
1240 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001241 else:
1242 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001243 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 branch = 'HEAD'
1245 if branch.startswith('refs/remotes'):
1246 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001247 elif branch.startswith('refs/branch-heads/'):
1248 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 else:
1250 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001251 return self._remote
1252
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001253 def GitSanityChecks(self, upstream_git_obj):
1254 """Checks git repo status and ensures diff is from local commits."""
1255
sbc@chromium.org79706062015-01-14 21:18:12 +00001256 if upstream_git_obj is None:
1257 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001258 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001259 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001260 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001261 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001262 return False
1263
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001264 # Verify the commit we're diffing against is in our current branch.
1265 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1266 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1267 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001268 print('ERROR: %s is not in the current branch. You may need to rebase '
1269 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 return False
1271
1272 # List the commits inside the diff, and verify they are all local.
1273 commits_in_diff = RunGit(
1274 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1275 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1276 remote_branch = remote_branch.strip()
1277 if code != 0:
1278 _, remote_branch = self.GetRemoteBranch()
1279
1280 commits_in_remote = RunGit(
1281 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1282
1283 common_commits = set(commits_in_diff) & set(commits_in_remote)
1284 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001285 print('ERROR: Your diff contains %d commits already in %s.\n'
1286 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1287 'the diff. If you are using a custom git flow, you can override'
1288 ' the reference used for this check with "git config '
1289 'gitcl.remotebranch <git-ref>".' % (
1290 len(common_commits), remote_branch, upstream_git_obj),
1291 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001292 return False
1293 return True
1294
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001295 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001296 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001297
1298 Returns None if it is not set.
1299 """
tandrii5d48c322016-08-18 16:19:37 -07001300 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def GetRemoteUrl(self):
1303 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1304
1305 Returns None if there is no remote.
1306 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001307 is_cached, value = self._cached_remote_url
1308 if is_cached:
1309 return value
1310
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001311 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001312 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1313
Edward Lemur298f2cf2019-02-22 21:40:39 +00001314 # Check if the remote url can be parsed as an URL.
1315 host = urlparse.urlparse(url).netloc
1316 if host:
1317 self._cached_remote_url = (True, url)
1318 return url
1319
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001320 # If it cannot be parsed as an url, assume it is a local directory,
1321 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001322 logging.warning('"%s" doesn\'t appear to point to a git host. '
1323 'Interpreting it as a local directory.', url)
1324 if not os.path.isdir(url):
1325 logging.error(
1326 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001327 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001328 return None
1329
1330 cache_path = url
1331 url = RunGit(['config', 'remote.%s.url' % remote],
1332 error_ok=True,
1333 cwd=url).strip()
1334
1335 host = urlparse.urlparse(url).netloc
1336 if not host:
1337 logging.error(
1338 'Remote "%(remote)s" for branch "%(branch)s" points to '
1339 '"%(cache_path)s", but it is misconfigured.\n'
1340 '"%(cache_path)s" must be a git repo and must have a remote named '
1341 '"%(remote)s" pointing to the git host.', {
1342 'remote': remote,
1343 'cache_path': cache_path,
1344 'branch': self.GetBranch()})
1345 return None
1346
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001347 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001348 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001349
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001350 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001351 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001352 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001353 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001354 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001355 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001356 return self.issue
1357
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001358 def GetIssueURL(self):
1359 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001360 issue = self.GetIssue()
1361 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001362 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001363 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001364
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001365 def GetDescription(self, pretty=False, force=False):
1366 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001368 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 self.has_description = True
1370 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001371 # Set width to 72 columns + 2 space indent.
1372 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001373 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001374 lines = self.description.splitlines()
1375 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001376 return self.description
1377
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001378 def GetDescriptionFooters(self):
1379 """Returns (non_footer_lines, footers) for the commit message.
1380
1381 Returns:
1382 non_footer_lines (list(str)) - Simple list of description lines without
1383 any footer. The lines do not contain newlines, nor does the list contain
1384 the empty line between the message and the footers.
1385 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1386 [("Change-Id", "Ideadbeef...."), ...]
1387 """
1388 raw_description = self.GetDescription()
1389 msg_lines, _, footers = git_footers.split_footers(raw_description)
1390 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001391 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001392 return msg_lines, footers
1393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001395 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001396 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001397 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001398 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001399 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 return self.patchset
1401
1402 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001403 """Set this branch's patchset. If patchset=0, clears the patchset."""
1404 assert self.GetBranch()
1405 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001406 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001407 else:
1408 self.patchset = int(patchset)
1409 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001410 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001412 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001413 """Set this branch's issue. If issue isn't given, clears the issue."""
1414 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001416 issue = int(issue)
1417 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001418 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001419 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001420 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001421 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001422 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001423 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001424 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 else:
tandrii5d48c322016-08-18 16:19:37 -07001426 # Reset all of these just to be clean.
1427 reset_suffixes = [
1428 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001429 self.IssueConfigKey(),
1430 self.PatchsetConfigKey(),
1431 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001432 ] + self._PostUnsetIssueProperties()
1433 for prop in reset_suffixes:
1434 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001435 msg = RunGit(['log', '-1', '--format=%B']).strip()
1436 if msg and git_footers.get_footer_change_id(msg):
1437 print('WARNING: The change patched into this branch has a Change-Id. '
1438 'Removing it.')
1439 RunGit(['commit', '--amend', '-m',
1440 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001441 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001442 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001443 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001444
dnjba1b0f32016-09-02 12:37:42 -07001445 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001446 if not self.GitSanityChecks(upstream_branch):
1447 DieWithError('\nGit sanity check failure')
1448
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001449 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001450 if not root:
1451 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001452 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001453
1454 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001455 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001456 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001457 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001458 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001459 except subprocess2.CalledProcessError:
1460 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001461 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001462 'This branch probably doesn\'t exist anymore. To reset the\n'
1463 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001464 ' git branch --set-upstream-to origin/master %s\n'
1465 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001466 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001467
maruel@chromium.org52424302012-08-29 15:14:30 +00001468 issue = self.GetIssue()
1469 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001470 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001471 description = self.GetDescription()
1472 else:
1473 # If the change was never uploaded, use the log messages of all commits
1474 # up to the branch point, as git cl upload will prefill the description
1475 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001476 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1477 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001478
1479 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001480 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001481 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001482 name,
1483 description,
1484 absroot,
1485 files,
1486 issue,
1487 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001488 author,
1489 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001490
dsansomee2d6fd92016-09-08 00:10:47 -07001491 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001492 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001493 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001494 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001495
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001496 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1497 """Sets the description for this CL remotely.
1498
1499 You can get description_lines and footers with GetDescriptionFooters.
1500
1501 Args:
1502 description_lines (list(str)) - List of CL description lines without
1503 newline characters.
1504 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1505 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1506 `List-Of-Tokens`). It will be case-normalized so that each token is
1507 title-cased.
1508 """
1509 new_description = '\n'.join(description_lines)
1510 if footers:
1511 new_description += '\n'
1512 for k, v in footers:
1513 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1514 if not git_footers.FOOTER_PATTERN.match(foot):
1515 raise ValueError('Invalid footer %r' % foot)
1516 new_description += foot + '\n'
1517 self.UpdateDescription(new_description, force)
1518
Edward Lesmes8e282792018-04-03 18:50:29 -04001519 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001520 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1521 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001522 start = time_time()
1523 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001524 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1525 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001526 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001527 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001528 metrics.collector.add_repeated('sub_commands', {
1529 'command': 'presubmit',
1530 'execution_time': time_time() - start,
1531 'exit_code': 0 if result.should_continue() else 1,
1532 })
1533 return result
vapierfd77ac72016-06-16 08:33:57 -07001534 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001535 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001536
Edward Lemurf38bc172019-09-03 21:02:13 +00001537 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001538 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001539 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1540 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001541 else:
1542 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001543 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001544 urlparse.urlparse(issue_arg))
1545 if not parsed_issue_arg or not parsed_issue_arg.valid:
1546 DieWithError('Failed to parse issue argument "%s". '
1547 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001548 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001549 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001550
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001551 def CMDUpload(self, options, git_diff_args, orig_args):
1552 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001553 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001554 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001555 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001556 else:
1557 if self.GetBranch() is None:
1558 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1559
1560 # Default to diffing against common ancestor of upstream branch
1561 base_branch = self.GetCommonAncestorWithUpstream()
1562 git_diff_args = [base_branch, 'HEAD']
1563
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001564 # Fast best-effort checks to abort before running potentially expensive
1565 # hooks if uploading is likely to fail anyway. Passing these checks does
1566 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001567 self.EnsureAuthenticated(force=options.force)
1568 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569
1570 # Apply watchlists on upload.
1571 change = self.GetChange(base_branch, None)
1572 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1573 files = [f.LocalPath() for f in change.AffectedFiles()]
1574 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001575 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576
1577 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001578 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 # Set the reviewer list now so that presubmit checks can access it.
1580 change_description = ChangeDescription(change.FullDescriptionText())
1581 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001582 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001583 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584 change)
1585 change.SetDescriptionText(change_description.description)
1586 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001587 may_prompt=not options.force,
1588 verbose=options.verbose,
1589 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 if not hook_results.should_continue():
1591 return 1
1592 if not options.reviewers and hook_results.reviewers:
1593 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001594 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001595
Aaron Gable13101a62018-02-09 13:20:41 -08001596 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001597 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001599 _git_set_branch_config_value('last-upload-hash',
1600 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 # Run post upload hooks, if specified.
1602 if settings.GetRunPostUploadHook():
1603 presubmit_support.DoPostUploadExecuter(
1604 change,
1605 self,
1606 settings.GetRoot(),
1607 options.verbose,
1608 sys.stdout)
1609
1610 # Upload all dependencies if specified.
1611 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001612 print()
1613 print('--dependencies has been specified.')
1614 print('All dependent local branches will be re-uploaded.')
1615 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616 # Remove the dependencies flag from args so that we do not end up in a
1617 # loop.
1618 orig_args.remove('--dependencies')
1619 ret = upload_branch_deps(self, orig_args)
1620 return ret
1621
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001622 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001623 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001624
1625 Issue must have been already uploaded and known.
1626 """
1627 assert new_state in _CQState.ALL_STATES
1628 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001629 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001630 vote_map = {
1631 _CQState.NONE: 0,
1632 _CQState.DRY_RUN: 1,
1633 _CQState.COMMIT: 2,
1634 }
1635 labels = {'Commit-Queue': vote_map[new_state]}
1636 notify = False if new_state == _CQState.DRY_RUN else None
1637 gerrit_util.SetReview(
1638 self._GetGerritHost(), self._GerritChangeIdentifier(),
1639 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001640 return 0
1641 except KeyboardInterrupt:
1642 raise
1643 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001644 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001645 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001646 ' * Your project has no CQ,\n'
1647 ' * You don\'t have permission to change the CQ state,\n'
1648 ' * There\'s a bug in this code (see stack trace below).\n'
1649 'Consider specifying which bots to trigger manually or asking your '
1650 'project owners for permissions or contacting Chrome Infra at:\n'
1651 'https://www.chromium.org/infra\n\n' %
1652 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001653 # Still raise exception so that stack trace is printed.
1654 raise
1655
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001656 def _GetGerritHost(self):
1657 # Lazy load of configs.
1658 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001659 if self._gerrit_host and '.' not in self._gerrit_host:
1660 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1661 # This happens for internal stuff http://crbug.com/614312.
1662 parsed = urlparse.urlparse(self.GetRemoteUrl())
1663 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001664 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001665 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001666 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1667 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001668 return self._gerrit_host
1669
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001670 def _GetGitHost(self):
1671 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001672 remote_url = self.GetRemoteUrl()
1673 if not remote_url:
1674 return None
1675 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001676
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001677 def GetCodereviewServer(self):
1678 if not self._gerrit_server:
1679 # If we're on a branch then get the server potentially associated
1680 # with that branch.
1681 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001682 self._gerrit_server = self._GitGetBranchConfigValue(
1683 self.CodereviewServerConfigKey())
1684 if self._gerrit_server:
1685 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001686 if not self._gerrit_server:
1687 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1688 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001689 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001690 parts[0] = parts[0] + '-review'
1691 self._gerrit_host = '.'.join(parts)
1692 self._gerrit_server = 'https://%s' % self._gerrit_host
1693 return self._gerrit_server
1694
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001695 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001696 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001697 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001698 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001699 logging.warn('can\'t detect Gerrit project.')
1700 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001701 project = urlparse.urlparse(remote_url).path.strip('/')
1702 if project.endswith('.git'):
1703 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001704 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1705 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1706 # gitiles/git-over-https protocol. E.g.,
1707 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1708 # as
1709 # https://chromium.googlesource.com/v8/v8
1710 if project.startswith('a/'):
1711 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001712 return project
1713
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001714 def _GerritChangeIdentifier(self):
1715 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1716
1717 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001718 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001719 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001720 project = self._GetGerritProject()
1721 if project:
1722 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1723 # Fall back on still unique, but less efficient change number.
1724 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001725
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001726 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001727 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001728 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001729
tandrii5d48c322016-08-18 16:19:37 -07001730 @classmethod
1731 def PatchsetConfigKey(cls):
1732 return 'gerritpatchset'
1733
1734 @classmethod
1735 def CodereviewServerConfigKey(cls):
1736 return 'gerritserver'
1737
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001738 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001739 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001740 if settings.GetGerritSkipEnsureAuthenticated():
1741 # For projects with unusual authentication schemes.
1742 # See http://crbug.com/603378.
1743 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001744
1745 # Check presence of cookies only if using cookies-based auth method.
1746 cookie_auth = gerrit_util.Authenticator.get()
1747 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001748 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001749
Daniel Chengcf6269b2019-05-18 01:02:12 +00001750 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1751 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001752 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001753 return
1754
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001755 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001756 self.GetCodereviewServer()
1757 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001758 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001759
1760 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1761 git_auth = cookie_auth.get_auth_header(git_host)
1762 if gerrit_auth and git_auth:
1763 if gerrit_auth == git_auth:
1764 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001765 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001766 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001768 ' %s\n'
1769 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001770 ' Consider running the following command:\n'
1771 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001772 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001773 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001774 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001775 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001776 cookie_auth.get_new_password_message(git_host)))
1777 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001778 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001779 return
1780 else:
1781 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001782 ([] if gerrit_auth else [self._gerrit_host]) +
1783 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001784 DieWithError('Credentials for the following hosts are required:\n'
1785 ' %s\n'
1786 'These are read from %s (or legacy %s)\n'
1787 '%s' % (
1788 '\n '.join(missing),
1789 cookie_auth.get_gitcookies_path(),
1790 cookie_auth.get_netrc_path(),
1791 cookie_auth.get_new_password_message(git_host)))
1792
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001793 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001794 if not self.GetIssue():
1795 return
1796
1797 # Warm change details cache now to avoid RPCs later, reducing latency for
1798 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001799 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001800 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001801
1802 status = self._GetChangeDetail()['status']
1803 if status in ('MERGED', 'ABANDONED'):
1804 DieWithError('Change %s has been %s, new uploads are not allowed' %
1805 (self.GetIssueURL(),
1806 'submitted' if status == 'MERGED' else 'abandoned'))
1807
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001808 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1809 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1810 # Apparently this check is not very important? Otherwise get_auth_email
1811 # could have been added to other implementations of Authenticator.
1812 cookies_auth = gerrit_util.Authenticator.get()
1813 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001814 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001815
1816 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001817 if self.GetIssueOwner() == cookies_user:
1818 return
1819 logging.debug('change %s owner is %s, cookies user is %s',
1820 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001821 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001822 # so ask what Gerrit thinks of this user.
1823 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1824 if details['email'] == self.GetIssueOwner():
1825 return
1826 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001827 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001828 'as %s.\n'
1829 'Uploading may fail due to lack of permissions.' %
1830 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1831 confirm_or_exit(action='upload')
1832
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001833 def _PostUnsetIssueProperties(self):
1834 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001835 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001836
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001837 def GetGerritObjForPresubmit(self):
1838 return presubmit_support.GerritAccessor(self._GetGerritHost())
1839
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001840 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001841 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001842 or CQ status, assuming adherence to a common workflow.
1843
1844 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001845 * 'error' - error from review tool (including deleted issues)
1846 * 'unsent' - no reviewers added
1847 * 'waiting' - waiting for review
1848 * 'reply' - waiting for uploader to reply to review
1849 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001850 * 'dry-run' - dry-running in the CQ
1851 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001852 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001853 """
1854 if not self.GetIssue():
1855 return None
1856
1857 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001858 data = self._GetChangeDetail([
1859 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001860 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001861 return 'error'
1862
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001863 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864 return 'closed'
1865
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001866 cq_label = data['labels'].get('Commit-Queue', {})
1867 max_cq_vote = 0
1868 for vote in cq_label.get('all', []):
1869 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1870 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001871 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001872 if max_cq_vote == 1:
1873 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001874
Aaron Gable9ab38c62017-04-06 14:36:33 -07001875 if data['labels'].get('Code-Review', {}).get('approved'):
1876 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001877
1878 if not data.get('reviewers', {}).get('REVIEWER', []):
1879 return 'unsent'
1880
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001881 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001882 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1883 last_message_author = messages.pop().get('author', {})
1884 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001885 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1886 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001887 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001888 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001889 if last_message_author.get('_account_id') == owner:
1890 # Most recent message was by owner.
1891 return 'waiting'
1892 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001893 # Some reply from non-owner.
1894 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001895
1896 # Somehow there are no messages even though there are reviewers.
1897 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001898
1899 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001900 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001901 patchset = data['revisions'][data['current_revision']]['_number']
1902 self.SetPatchset(patchset)
1903 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001904
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001905 def FetchDescription(self, force=False):
1906 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1907 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001908 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001909 return data['revisions'][current_rev]['commit']['message'].encode(
1910 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
dsansomee2d6fd92016-09-08 00:10:47 -07001912 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001913 if gerrit_util.HasPendingChangeEdit(
1914 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001915 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001916 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001917 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001918 'unpublished edit. Either publish the edit in the Gerrit web UI '
1919 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001920
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001921 gerrit_util.DeletePendingChangeEdit(
1922 self._GetGerritHost(), self._GerritChangeIdentifier())
1923 gerrit_util.SetCommitMessage(
1924 self._GetGerritHost(), self._GerritChangeIdentifier(),
1925 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001926
Aaron Gable636b13f2017-07-14 10:42:48 -07001927 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001928 gerrit_util.SetReview(
1929 self._GetGerritHost(), self._GerritChangeIdentifier(),
1930 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001931
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001932 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001933 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001934 # CURRENT_REVISION is included to get the latest patchset so that
1935 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001936 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001937 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1938 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001939 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001940 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001941 robot_file_comments = gerrit_util.GetChangeRobotComments(
1942 self._GetGerritHost(), self._GerritChangeIdentifier())
1943
1944 # Add the robot comments onto the list of comments, but only
1945 # keep those that are from the latest pachset.
1946 latest_patch_set = self.GetMostRecentPatchset()
1947 for path, robot_comments in robot_file_comments.iteritems():
1948 line_comments = file_comments.setdefault(path, [])
1949 line_comments.extend(
1950 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001951
1952 # Build dictionary of file comments for easy access and sorting later.
1953 # {author+date: {path: {patchset: {line: url+message}}}}
1954 comments = collections.defaultdict(
1955 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1956 for path, line_comments in file_comments.iteritems():
1957 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 tag = comment.get('tag', '')
1959 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001960 continue
1961 key = (comment['author']['email'], comment['updated'])
1962 if comment.get('side', 'REVISION') == 'PARENT':
1963 patchset = 'Base'
1964 else:
1965 patchset = 'PS%d' % comment['patch_set']
1966 line = comment.get('line', 0)
1967 url = ('https://%s/c/%s/%s/%s#%s%s' %
1968 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1969 'b' if comment.get('side') == 'PARENT' else '',
1970 str(line) if line else ''))
1971 comments[key][path][patchset][line] = (url, comment['message'])
1972
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001973 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001974 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001975 summary = self._BuildCommentSummary(msg, comments, readable)
1976 if summary:
1977 summaries.append(summary)
1978 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001979
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001980 @staticmethod
1981 def _BuildCommentSummary(msg, comments, readable):
1982 key = (msg['author']['email'], msg['date'])
1983 # Don't bother showing autogenerated messages that don't have associated
1984 # file or line comments. this will filter out most autogenerated
1985 # messages, but will keep robot comments like those from Tricium.
1986 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1987 if is_autogenerated and not comments.get(key):
1988 return None
1989 message = msg['message']
1990 # Gerrit spits out nanoseconds.
1991 assert len(msg['date'].split('.')[-1]) == 9
1992 date = datetime.datetime.strptime(msg['date'][:-3],
1993 '%Y-%m-%d %H:%M:%S.%f')
1994 if key in comments:
1995 message += '\n'
1996 for path, patchsets in sorted(comments.get(key, {}).items()):
1997 if readable:
1998 message += '\n%s' % path
1999 for patchset, lines in sorted(patchsets.items()):
2000 for line, (url, content) in sorted(lines.items()):
2001 if line:
2002 line_str = 'Line %d' % line
2003 path_str = '%s:%d:' % (path, line)
2004 else:
2005 line_str = 'File comment'
2006 path_str = '%s:0:' % path
2007 if readable:
2008 message += '\n %s, %s: %s' % (patchset, line_str, url)
2009 message += '\n %s\n' % content
2010 else:
2011 message += '\n%s ' % path_str
2012 message += '\n%s\n' % content
2013
2014 return _CommentSummary(
2015 date=date,
2016 message=message,
2017 sender=msg['author']['email'],
2018 autogenerated=is_autogenerated,
2019 # These could be inferred from the text messages and correlated with
2020 # Code-Review label maximum, however this is not reliable.
2021 # Leaving as is until the need arises.
2022 approval=False,
2023 disapproval=False,
2024 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002025
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002026 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002027 gerrit_util.AbandonChange(
2028 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002029
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002030 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002031 gerrit_util.SubmitChange(
2032 self._GetGerritHost(), self._GerritChangeIdentifier(),
2033 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002034
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002035 def _GetChangeDetail(self, options=None, no_cache=False):
2036 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002037
2038 If fresh data is needed, set no_cache=True which will clear cache and
2039 thus new data will be fetched from Gerrit.
2040 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002041 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002042 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002043
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002044 # Optimization to avoid multiple RPCs:
2045 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2046 'CURRENT_COMMIT' not in options):
2047 options.append('CURRENT_COMMIT')
2048
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002050 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002051 options = [o.upper() for o in options]
2052
2053 # Check in cache first unless no_cache is True.
2054 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002055 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002056 else:
2057 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002058 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002059 # Assumption: data fetched before with extra options is suitable
2060 # for return for a smaller set of options.
2061 # For example, if we cached data for
2062 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2063 # and request is for options=[CURRENT_REVISION],
2064 # THEN we can return prior cached data.
2065 if options_set.issubset(cached_options_set):
2066 return data
2067
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002068 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002069 data = gerrit_util.GetChangeDetail(
2070 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002071 except gerrit_util.GerritError as e:
2072 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002073 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002074 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002075
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002076 self._detail_cache.setdefault(cache_key, []).append(
2077 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002078 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002079
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002080 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002081 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002082 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002083 data = gerrit_util.GetChangeCommit(
2084 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002085 except gerrit_util.GerritError as e:
2086 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002087 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002088 raise
agable32978d92016-11-01 12:55:02 -07002089 return data
2090
Karen Qian40c19422019-03-13 21:28:29 +00002091 def _IsCqConfigured(self):
2092 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002093 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002094 return False
2095 # TODO(crbug/753213): Remove temporary hack
2096 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002097 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002098 detail['branch'].startswith('refs/branch-heads/')):
2099 return False
2100 return True
2101
Olivier Robin75ee7252018-04-13 10:02:56 +02002102 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002103 if git_common.is_dirty_git_tree('land'):
2104 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002105
tandriid60367b2016-06-22 05:25:12 -07002106 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002107 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002108 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002109 'which can test and land changes for you. '
2110 'Are you sure you wish to bypass it?\n',
2111 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002112 differs = True
tandriic4344b52016-08-29 06:04:54 -07002113 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002114 # Note: git diff outputs nothing if there is no diff.
2115 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002116 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002118 if detail['current_revision'] == last_upload:
2119 differs = False
2120 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 print('WARNING: Local branch contents differ from latest uploaded '
2122 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002123 if differs:
2124 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002125 confirm_or_exit(
2126 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2127 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002128 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002129 elif not bypass_hooks:
2130 hook_results = self.RunHook(
2131 committing=True,
2132 may_prompt=not force,
2133 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002134 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2135 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002136 if not hook_results.should_continue():
2137 return 1
2138
2139 self.SubmitIssue(wait_for_merge=True)
2140 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002141 links = self._GetChangeCommit().get('web_links', [])
2142 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002143 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002144 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002145 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002146 return 0
2147
Edward Lemurf38bc172019-09-03 21:02:13 +00002148 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 assert parsed_issue_arg.valid
2150
Edward Lemur125d60a2019-09-13 18:25:41 +00002151 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152
2153 if parsed_issue_arg.hostname:
2154 self._gerrit_host = parsed_issue_arg.hostname
2155 self._gerrit_server = 'https://%s' % self._gerrit_host
2156
tandriic2405f52016-10-10 08:13:15 -07002157 try:
2158 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002159 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002160 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161
2162 if not parsed_issue_arg.patchset:
2163 # Use current revision by default.
2164 revision_info = detail['revisions'][detail['current_revision']]
2165 patchset = int(revision_info['_number'])
2166 else:
2167 patchset = parsed_issue_arg.patchset
2168 for revision_info in detail['revisions'].itervalues():
2169 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2170 break
2171 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002172 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002173 (parsed_issue_arg.patchset, self.GetIssue()))
2174
Edward Lemur125d60a2019-09-13 18:25:41 +00002175 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002176 if remote_url.endswith('.git'):
2177 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002178 remote_url = remote_url.rstrip('/')
2179
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002181 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002182
2183 if remote_url != fetch_info['url']:
2184 DieWithError('Trying to patch a change from %s but this repo appears '
2185 'to be %s.' % (fetch_info['url'], remote_url))
2186
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002188
Aaron Gable62619a32017-06-16 08:22:09 -07002189 if force:
2190 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2191 print('Checked out commit for change %i patchset %i locally' %
2192 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002193 elif nocommit:
2194 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2195 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002196 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002197 RunGit(['cherry-pick', 'FETCH_HEAD'])
2198 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002199 (parsed_issue_arg.issue, patchset))
2200 print('Note: this created a local commit which does not have '
2201 'the same hash as the one uploaded for review. This will make '
2202 'uploading changes based on top of this branch difficult.\n'
2203 'If you want to do that, use "git cl patch --force" instead.')
2204
Stefan Zagerd08043c2017-10-12 12:07:02 -07002205 if self.GetBranch():
2206 self.SetIssue(parsed_issue_arg.issue)
2207 self.SetPatchset(patchset)
2208 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2209 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2210 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2211 else:
2212 print('WARNING: You are in detached HEAD state.\n'
2213 'The patch has been applied to your checkout, but you will not be '
2214 'able to upload a new patch set to the gerrit issue.\n'
2215 'Try using the \'-b\' option if you would like to work on a '
2216 'branch and/or upload a new patch set.')
2217
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002218 return 0
2219
2220 @staticmethod
2221 def ParseIssueURL(parsed_url):
2222 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2223 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002224 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2225 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002226 # Short urls like https://domain/<issue_number> can be used, but don't allow
2227 # specifying the patchset (you'd 404), but we allow that here.
2228 if parsed_url.path == '/':
2229 part = parsed_url.fragment
2230 else:
2231 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002232 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002233 if match:
2234 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002235 issue=int(match.group(3)),
2236 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002237 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002238 return None
2239
tandrii16e0b4e2016-06-07 10:34:28 -07002240 def _GerritCommitMsgHookCheck(self, offer_removal):
2241 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2242 if not os.path.exists(hook):
2243 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002244 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2245 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002246 data = gclient_utils.FileRead(hook)
2247 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2248 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002249 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002250 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002251 'and may interfere with it in subtle ways.\n'
2252 'We recommend you remove the commit-msg hook.')
2253 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002254 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002255 gclient_utils.rm_file_or_tree(hook)
2256 print('Gerrit commit-msg hook removed.')
2257 else:
2258 print('OK, will keep Gerrit commit-msg hook in place.')
2259
Edward Lemur1b52d872019-05-09 21:12:12 +00002260 def _CleanUpOldTraces(self):
2261 """Keep only the last |MAX_TRACES| traces."""
2262 try:
2263 traces = sorted([
2264 os.path.join(TRACES_DIR, f)
2265 for f in os.listdir(TRACES_DIR)
2266 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2267 and not f.startswith('tmp'))
2268 ])
2269 traces_to_delete = traces[:-MAX_TRACES]
2270 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002271 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002272 except OSError:
2273 print('WARNING: Failed to remove old git traces from\n'
2274 ' %s'
2275 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002276
Edward Lemur5737f022019-05-17 01:24:00 +00002277 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002278 """Zip and write the git push traces stored in traces_dir."""
2279 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002280 traces_zip = trace_name + '-traces'
2281 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002282 # Create a temporary dir to store git config and gitcookies in. It will be
2283 # compressed and stored next to the traces.
2284 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002285 git_info_zip = trace_name + '-git-info'
2286
Edward Lemur5737f022019-05-17 01:24:00 +00002287 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002288 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002289 git_push_metadata['now'] = git_push_metadata['now'].decode(
2290 sys.stdin.encoding)
2291
Edward Lemur1b52d872019-05-09 21:12:12 +00002292 git_push_metadata['trace_name'] = trace_name
2293 gclient_utils.FileWrite(
2294 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2295
2296 # Keep only the first 6 characters of the git hashes on the packet
2297 # trace. This greatly decreases size after compression.
2298 packet_traces = os.path.join(traces_dir, 'trace-packet')
2299 if os.path.isfile(packet_traces):
2300 contents = gclient_utils.FileRead(packet_traces)
2301 gclient_utils.FileWrite(
2302 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2303 shutil.make_archive(traces_zip, 'zip', traces_dir)
2304
2305 # Collect and compress the git config and gitcookies.
2306 git_config = RunGit(['config', '-l'])
2307 gclient_utils.FileWrite(
2308 os.path.join(git_info_dir, 'git-config'),
2309 git_config)
2310
2311 cookie_auth = gerrit_util.Authenticator.get()
2312 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2313 gitcookies_path = cookie_auth.get_gitcookies_path()
2314 if os.path.isfile(gitcookies_path):
2315 gitcookies = gclient_utils.FileRead(gitcookies_path)
2316 gclient_utils.FileWrite(
2317 os.path.join(git_info_dir, 'gitcookies'),
2318 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2319 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2320
Edward Lemur1b52d872019-05-09 21:12:12 +00002321 gclient_utils.rmtree(git_info_dir)
2322
2323 def _RunGitPushWithTraces(
2324 self, change_desc, refspec, refspec_opts, git_push_metadata):
2325 """Run git push and collect the traces resulting from the execution."""
2326 # Create a temporary directory to store traces in. Traces will be compressed
2327 # and stored in a 'traces' dir inside depot_tools.
2328 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002329 trace_name = os.path.join(
2330 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002331
2332 env = os.environ.copy()
2333 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2334 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002335 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002336 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2337 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2338 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2339
2340 try:
2341 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002342 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002343 before_push = time_time()
2344 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002345 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002346 env=env,
2347 print_stdout=True,
2348 # Flush after every line: useful for seeing progress when running as
2349 # recipe.
2350 filter_fn=lambda _: sys.stdout.flush())
2351 except subprocess2.CalledProcessError as e:
2352 push_returncode = e.returncode
2353 DieWithError('Failed to create a change. Please examine output above '
2354 'for the reason of the failure.\n'
2355 'Hint: run command below to diagnose common Git/Gerrit '
2356 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002357 ' git cl creds-check\n'
2358 '\n'
2359 'If git-cl is not working correctly, file a bug under the '
2360 'Infra>SDK component including the files below.\n'
2361 'Review the files before upload, since they might contain '
2362 'sensitive information.\n'
2363 'Set the Restrict-View-Google label so that they are not '
2364 'publicly accessible.\n'
2365 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002366 change_desc)
2367 finally:
2368 execution_time = time_time() - before_push
2369 metrics.collector.add_repeated('sub_commands', {
2370 'command': 'git push',
2371 'execution_time': execution_time,
2372 'exit_code': push_returncode,
2373 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2374 })
2375
Edward Lemur1b52d872019-05-09 21:12:12 +00002376 git_push_metadata['execution_time'] = execution_time
2377 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002378 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002379
Edward Lemur1b52d872019-05-09 21:12:12 +00002380 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002381 gclient_utils.rmtree(traces_dir)
2382
2383 return push_stdout
2384
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002385 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002387 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002388 # Load default for user, repo, squash=true, in this order.
2389 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002390
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002392 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002393 # This may be None; default fallback value is determined in logic below.
2394 title = options.title
2395
Dominic Battre7d1c4842017-10-27 09:17:28 +02002396 # Extract bug number from branch name.
2397 bug = options.bug
2398 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2399 if not bug and match:
2400 bug = match.group(1)
2401
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002403 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002404 if self.GetIssue():
2405 # Try to get the message from a previous upload.
2406 message = self.GetDescription()
2407 if not message:
2408 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002409 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002411 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002412 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002413 # When uploading a subsequent patchset, -m|--message is taken
2414 # as the patchset title if --title was not provided.
2415 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002416 else:
2417 default_title = RunGit(
2418 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002419 if options.force:
2420 title = default_title
2421 else:
2422 title = ask_for_data(
2423 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424 change_id = self._GetChangeDetail()['change_id']
2425 while True:
2426 footer_change_ids = git_footers.get_footer_change_id(message)
2427 if footer_change_ids == [change_id]:
2428 break
2429 if not footer_change_ids:
2430 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002431 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002432 continue
2433 # There is already a valid footer but with different or several ids.
2434 # Doing this automatically is non-trivial as we don't want to lose
2435 # existing other footers, yet we want to append just 1 desired
2436 # Change-Id. Thus, just create a new footer, but let user verify the
2437 # new description.
2438 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002439 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002440 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002441 print(
2442 'WARNING: change %s has Change-Id footer(s):\n'
2443 ' %s\n'
2444 'but change has Change-Id %s, according to Gerrit.\n'
2445 'Please, check the proposed correction to the description, '
2446 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2447 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2448 change_id))
2449 confirm_or_exit(action='edit')
2450 change_desc.prompt()
2451
2452 message = change_desc.description
2453 if not message:
2454 DieWithError("Description is empty. Aborting...")
2455
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002456 # Continue the while loop.
2457 # Sanity check of this code - we should end up with proper message
2458 # footer.
2459 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002460 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002461 else: # if not self.GetIssue()
2462 if options.message:
2463 message = options.message
2464 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002465 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002466 if options.title:
2467 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002468 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002469 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002470 change_desc.prompt()
2471
Aaron Gableb56ad332017-01-06 15:24:31 -08002472 # On first upload, patchset title is always this string, while
2473 # --title flag gets converted to first line of message.
2474 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002475 if not change_desc.description:
2476 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002477 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002478 if len(change_ids) > 1:
2479 DieWithError('too many Change-Id footers, at most 1 allowed.')
2480 if not change_ids:
2481 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002482 change_desc.set_description(git_footers.add_footer_change_id(
2483 change_desc.description,
2484 GenerateGerritChangeId(change_desc.description)))
2485 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002486 assert len(change_ids) == 1
2487 change_id = change_ids[0]
2488
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002489 if options.reviewers or options.tbrs or options.add_owners_to:
2490 change_desc.update_reviewers(options.reviewers, options.tbrs,
2491 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002492 if options.preserve_tryjobs:
2493 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002494
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002495 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002496 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2497 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002498 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002499 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2500 desc_tempfile.write(change_desc.description)
2501 desc_tempfile.close()
2502 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2503 '-F', desc_tempfile.name]).strip()
2504 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002505 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002506 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002507 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508 if not change_desc.description:
2509 DieWithError("Description is empty. Aborting...")
2510
2511 if not git_footers.get_footer_change_id(change_desc.description):
2512 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002513 change_desc.set_description(
2514 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002515 if options.reviewers or options.tbrs or options.add_owners_to:
2516 change_desc.update_reviewers(options.reviewers, options.tbrs,
2517 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002519 # For no-squash mode, we assume the remote called "origin" is the one we
2520 # want. It is not worthwhile to support different workflows for
2521 # no-squash mode.
2522 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002523 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2524
2525 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002526 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002527 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2528 ref_to_push)]).splitlines()
2529 if len(commits) > 1:
2530 print('WARNING: This will upload %d commits. Run the following command '
2531 'to see which commits will be uploaded: ' % len(commits))
2532 print('git log %s..%s' % (parent, ref_to_push))
2533 print('You can also use `git squash-branch` to squash these into a '
2534 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002535 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002536
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002537 if options.reviewers or options.tbrs or options.add_owners_to:
2538 change_desc.update_reviewers(options.reviewers, options.tbrs,
2539 options.add_owners_to, change)
2540
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002541 reviewers = sorted(change_desc.get_reviewers())
2542 # Add cc's from the CC_LIST and --cc flag (if any).
2543 if not options.private and not options.no_autocc:
2544 cc = self.GetCCList().split(',')
2545 else:
2546 cc = []
2547 if options.cc:
2548 cc.extend(options.cc)
2549 cc = filter(None, [email.strip() for email in cc])
2550 if change_desc.get_cced():
2551 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002552 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2553 valid_accounts = set(reviewers + cc)
2554 # TODO(crbug/877717): relax this for all hosts.
2555 else:
2556 valid_accounts = gerrit_util.ValidAccounts(
2557 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002558 logging.info('accounts %s are recognized, %s invalid',
2559 sorted(valid_accounts),
2560 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002561
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002562 # Extra options that can be specified at push time. Doc:
2563 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002564 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002565
Aaron Gable844cf292017-06-28 11:32:59 -07002566 # By default, new changes are started in WIP mode, and subsequent patchsets
2567 # don't send email. At any time, passing --send-mail will mark the change
2568 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002569 if options.send_mail:
2570 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002571 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002572 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002573 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002574 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002575 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002576
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002577 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002578 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002579
Aaron Gable9b713dd2016-12-14 16:04:21 -08002580 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002581 # Punctuation and whitespace in |title| must be percent-encoded.
2582 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002583
agablec6787972016-09-09 16:13:34 -07002584 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002585 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002586
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002587 for r in sorted(reviewers):
2588 if r in valid_accounts:
2589 refspec_opts.append('r=%s' % r)
2590 reviewers.remove(r)
2591 else:
2592 # TODO(tandrii): this should probably be a hard failure.
2593 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2594 % r)
2595 for c in sorted(cc):
2596 # refspec option will be rejected if cc doesn't correspond to an
2597 # account, even though REST call to add such arbitrary cc may succeed.
2598 if c in valid_accounts:
2599 refspec_opts.append('cc=%s' % c)
2600 cc.remove(c)
2601
rmistry9eadede2016-09-19 11:22:43 -07002602 if options.topic:
2603 # Documentation on Gerrit topics is here:
2604 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002605 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002606
Edward Lemur687ca902018-12-05 02:30:30 +00002607 if options.enable_auto_submit:
2608 refspec_opts.append('l=Auto-Submit+1')
2609 if options.use_commit_queue:
2610 refspec_opts.append('l=Commit-Queue+2')
2611 elif options.cq_dry_run:
2612 refspec_opts.append('l=Commit-Queue+1')
2613
2614 if change_desc.get_reviewers(tbr_only=True):
2615 score = gerrit_util.GetCodeReviewTbrScore(
2616 self._GetGerritHost(),
2617 self._GetGerritProject())
2618 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002619
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002620 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002621 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002622 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002623 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002624 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2625
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002626 refspec_suffix = ''
2627 if refspec_opts:
2628 refspec_suffix = '%' + ','.join(refspec_opts)
2629 assert ' ' not in refspec_suffix, (
2630 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2631 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2632
Edward Lemur1b52d872019-05-09 21:12:12 +00002633 git_push_metadata = {
2634 'gerrit_host': self._GetGerritHost(),
2635 'title': title or '<untitled>',
2636 'change_id': change_id,
2637 'description': change_desc.description,
2638 }
2639 push_stdout = self._RunGitPushWithTraces(
2640 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002641
2642 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002643 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002644 change_numbers = [m.group(1)
2645 for m in map(regex.match, push_stdout.splitlines())
2646 if m]
2647 if len(change_numbers) != 1:
2648 DieWithError(
2649 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002650 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002651 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002652 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002653
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002654 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002655 # GetIssue() is not set in case of non-squash uploads according to tests.
2656 # TODO(agable): non-squash uploads in git cl should be removed.
2657 gerrit_util.AddReviewers(
2658 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002659 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002660 reviewers, cc,
2661 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002662
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002663 return 0
2664
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002665 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2666 change_desc):
2667 """Computes parent of the generated commit to be uploaded to Gerrit.
2668
2669 Returns revision or a ref name.
2670 """
2671 if custom_cl_base:
2672 # Try to avoid creating additional unintended CLs when uploading, unless
2673 # user wants to take this risk.
2674 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2675 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2676 local_ref_of_target_remote])
2677 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002678 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002679 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2680 'If you proceed with upload, more than 1 CL may be created by '
2681 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2682 'If you are certain that specified base `%s` has already been '
2683 'uploaded to Gerrit as another CL, you may proceed.\n' %
2684 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2685 if not force:
2686 confirm_or_exit(
2687 'Do you take responsibility for cleaning up potential mess '
2688 'resulting from proceeding with upload?',
2689 action='upload')
2690 return custom_cl_base
2691
Aaron Gablef97e33d2017-03-30 15:44:27 -07002692 if remote != '.':
2693 return self.GetCommonAncestorWithUpstream()
2694
2695 # If our upstream branch is local, we base our squashed commit on its
2696 # squashed version.
2697 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2698
Aaron Gablef97e33d2017-03-30 15:44:27 -07002699 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002700 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002701
2702 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002703 # TODO(tandrii): consider checking parent change in Gerrit and using its
2704 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2705 # the tree hash of the parent branch. The upside is less likely bogus
2706 # requests to reupload parent change just because it's uploadhash is
2707 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002708 parent = RunGit(['config',
2709 'branch.%s.gerritsquashhash' % upstream_branch_name],
2710 error_ok=True).strip()
2711 # Verify that the upstream branch has been uploaded too, otherwise
2712 # Gerrit will create additional CLs when uploading.
2713 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2714 RunGitSilent(['rev-parse', parent + ':'])):
2715 DieWithError(
2716 '\nUpload upstream branch %s first.\n'
2717 'It is likely that this branch has been rebased since its last '
2718 'upload, so you just need to upload it again.\n'
2719 '(If you uploaded it with --no-squash, then branch dependencies '
2720 'are not supported, and you should reupload with --squash.)'
2721 % upstream_branch_name,
2722 change_desc)
2723 return parent
2724
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002725 def _AddChangeIdToCommitMessage(self, options, args):
2726 """Re-commits using the current message, assumes the commit hook is in
2727 place.
2728 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002729 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002730 git_command = ['commit', '--amend', '-m', log_desc]
2731 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002732 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002733 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002734 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002735 return new_log_desc
2736 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002737 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002738
tandriie113dfd2016-10-11 10:20:12 -07002739 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002740 try:
2741 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002742 except GerritChangeNotExists:
2743 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002744
2745 if data['status'] in ('ABANDONED', 'MERGED'):
2746 return 'CL %s is closed' % self.GetIssue()
2747
Edward Lemurf0faf482019-09-25 20:40:17 +00002748 # TODO(1004447): Remove on Oct 9th, 2019.
2749 def GetLegacyProperties(self, patchset=None):
2750 host = self.GetCodereviewServer()
2751 issue = self.GetIssue()
2752 patchset = int(patchset or self.GetPatchset())
2753 data = self._GetChangeDetail(['ALL_REVISIONS'])
2754
2755 assert host and issue and patchset, 'CL must be uploaded first'
2756
2757 revision_data = None # Pylint wants it to be defined.
2758 for revision_data in data['revisions'].itervalues():
2759 if int(revision_data['_number']) == patchset:
2760 break
2761 else:
2762 raise Exception('Patchset %d is not known in Gerrit change %d' %
2763 (patchset, issue))
2764
2765 return {
2766 'patch_issue': issue,
2767 'patch_set': patchset,
2768 'patch_project': data['project'],
2769 'patch_storage': 'gerrit',
2770 'patch_ref': revision_data['fetch']['http']['ref'],
2771 'patch_repository_url': revision_data['fetch']['http']['url'],
2772 'patch_gerrit_url': host,
2773 }
2774
2775
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002776 def GetGerritChange(self, patchset=None):
2777 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2778 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2779 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002780 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002781 data = self._GetChangeDetail(['ALL_REVISIONS'])
2782
2783 assert host and issue and patchset, 'CL must be uploaded first'
2784
2785 has_patchset = any(
2786 int(revision_data['_number']) == patchset
2787 for revision_data in data['revisions'].itervalues())
2788 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002789 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002790 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002791
tandrii8c5a3532016-11-04 07:52:02 -07002792 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002793 'host': host,
2794 'change': issue,
2795 'project': data['project'],
2796 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002797 }
tandriie113dfd2016-10-11 10:20:12 -07002798
tandriide281ae2016-10-12 06:02:30 -07002799 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002800 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002801
Edward Lemur707d70b2018-02-07 00:50:14 +01002802 def GetReviewers(self):
2803 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002804 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002805
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002806
2807_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002808 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002809}
2810
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002811
iannuccie53c9352016-08-17 14:40:40 -07002812def _add_codereview_issue_select_options(parser, extra=""):
2813 _add_codereview_select_options(parser)
2814
2815 text = ('Operate on this issue number instead of the current branch\'s '
2816 'implicit issue.')
2817 if extra:
2818 text += ' '+extra
2819 parser.add_option('-i', '--issue', type=int, help=text)
2820
2821
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002822def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002823 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002824 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002825 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002826 parser.add_option_group(parser.codereview_group)
2827 parser.codereview_group.add_option(
2828 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002829 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002830
2831
2832def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002833 options.forced_codereview = None
2834 if options.gerrit:
2835 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002836
2837
tandriif9aefb72016-07-01 09:06:51 -07002838def _get_bug_line_values(default_project, bugs):
2839 """Given default_project and comma separated list of bugs, yields bug line
2840 values.
2841
2842 Each bug can be either:
2843 * a number, which is combined with default_project
2844 * string, which is left as is.
2845
2846 This function may produce more than one line, because bugdroid expects one
2847 project per line.
2848
2849 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2850 ['v8:123', 'chromium:789']
2851 """
2852 default_bugs = []
2853 others = []
2854 for bug in bugs.split(','):
2855 bug = bug.strip()
2856 if bug:
2857 try:
2858 default_bugs.append(int(bug))
2859 except ValueError:
2860 others.append(bug)
2861
2862 if default_bugs:
2863 default_bugs = ','.join(map(str, default_bugs))
2864 if default_project:
2865 yield '%s:%s' % (default_project, default_bugs)
2866 else:
2867 yield default_bugs
2868 for other in sorted(others):
2869 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2870 yield other
2871
2872
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002873class ChangeDescription(object):
2874 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002875 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002876 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002877 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002878 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002879 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2880 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2881 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2882 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002883
Anthony Polito8b955342019-09-24 19:01:36 +00002884 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002885 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002886 if bug:
2887 regexp = re.compile(self.BUG_LINE)
2888 prefix = settings.GetBugPrefix()
2889 if not any((regexp.match(line) for line in self._description_lines)):
2890 values = list(_get_bug_line_values(prefix, bug))
2891 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002894 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002895 return '\n'.join(self._description_lines)
2896
2897 def set_description(self, desc):
2898 if isinstance(desc, basestring):
2899 lines = desc.splitlines()
2900 else:
2901 lines = [line.rstrip() for line in desc]
2902 while lines and not lines[0]:
2903 lines.pop(0)
2904 while lines and not lines[-1]:
2905 lines.pop(-1)
2906 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002907
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002908 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2909 """Rewrites the R=/TBR= line(s) as a single line each.
2910
2911 Args:
2912 reviewers (list(str)) - list of additional emails to use for reviewers.
2913 tbrs (list(str)) - list of additional emails to use for TBRs.
2914 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2915 the change that are missing OWNER coverage. If this is not None, you
2916 must also pass a value for `change`.
2917 change (Change) - The Change that should be used for OWNERS lookups.
2918 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002919 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002920 assert isinstance(tbrs, list), tbrs
2921
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002922 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002923 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002924
2925 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002926 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002927
2928 reviewers = set(reviewers)
2929 tbrs = set(tbrs)
2930 LOOKUP = {
2931 'TBR': tbrs,
2932 'R': reviewers,
2933 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002934
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002935 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002936 regexp = re.compile(self.R_LINE)
2937 matches = [regexp.match(line) for line in self._description_lines]
2938 new_desc = [l for i, l in enumerate(self._description_lines)
2939 if not matches[i]]
2940 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002941
agable@chromium.org42c20792013-09-12 17:34:49 +00002942 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002943
2944 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002945 for match in matches:
2946 if not match:
2947 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002948 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2949
2950 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002951 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002952 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002953 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002954 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002955 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002956 LOOKUP[add_owners_to].update(
2957 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002958
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002959 # If any folks ended up in both groups, remove them from tbrs.
2960 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002961
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002962 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2963 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002964
2965 # Put the new lines in the description where the old first R= line was.
2966 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2967 if 0 <= line_loc < len(self._description_lines):
2968 if new_tbr_line:
2969 self._description_lines.insert(line_loc, new_tbr_line)
2970 if new_r_line:
2971 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002972 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002973 if new_r_line:
2974 self.append_footer(new_r_line)
2975 if new_tbr_line:
2976 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002977
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002978 def set_preserve_tryjobs(self):
2979 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2980 footers = git_footers.parse_footers(self.description)
2981 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2982 if v.lower() == 'true':
2983 return
2984 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2985
Anthony Polito8b955342019-09-24 19:01:36 +00002986 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002987 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002988 self.set_description([
2989 '# Enter a description of the change.',
2990 '# This will be displayed on the codereview site.',
2991 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002992 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002993 '--------------------',
2994 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002995 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002996 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002997 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002998 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002999
agable@chromium.org42c20792013-09-12 17:34:49 +00003000 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00003001 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003002 if not content:
3003 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003004 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003005
Bruce Dawson2377b012018-01-11 16:46:49 -08003006 # Strip off comments and default inserted "Bug:" line.
3007 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003008 (line.startswith('#') or
3009 line.rstrip() == "Bug:" or
3010 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003011 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003012 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003013 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003014
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003015 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003016 """Adds a footer line to the description.
3017
3018 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3019 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3020 that Gerrit footers are always at the end.
3021 """
3022 parsed_footer_line = git_footers.parse_footer(line)
3023 if parsed_footer_line:
3024 # Line is a gerrit footer in the form: Footer-Key: any value.
3025 # Thus, must be appended observing Gerrit footer rules.
3026 self.set_description(
3027 git_footers.add_footer(self.description,
3028 key=parsed_footer_line[0],
3029 value=parsed_footer_line[1]))
3030 return
3031
3032 if not self._description_lines:
3033 self._description_lines.append(line)
3034 return
3035
3036 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3037 if gerrit_footers:
3038 # git_footers.split_footers ensures that there is an empty line before
3039 # actual (gerrit) footers, if any. We have to keep it that way.
3040 assert top_lines and top_lines[-1] == ''
3041 top_lines, separator = top_lines[:-1], top_lines[-1:]
3042 else:
3043 separator = [] # No need for separator if there are no gerrit_footers.
3044
3045 prev_line = top_lines[-1] if top_lines else ''
3046 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3047 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3048 top_lines.append('')
3049 top_lines.append(line)
3050 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003051
tandrii99a72f22016-08-17 14:33:24 -07003052 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003053 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003054 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003055 reviewers = [match.group(2).strip()
3056 for match in matches
3057 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003058 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003059
bradnelsond975b302016-10-23 12:20:23 -07003060 def get_cced(self):
3061 """Retrieves the list of reviewers."""
3062 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3063 cced = [match.group(2).strip() for match in matches if match]
3064 return cleanup_list(cced)
3065
Nodir Turakulov23b82142017-11-16 11:04:25 -08003066 def get_hash_tags(self):
3067 """Extracts and sanitizes a list of Gerrit hashtags."""
3068 subject = (self._description_lines or ('',))[0]
3069 subject = re.sub(
3070 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3071
3072 tags = []
3073 start = 0
3074 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3075 while True:
3076 m = bracket_exp.match(subject, start)
3077 if not m:
3078 break
3079 tags.append(self.sanitize_hash_tag(m.group(1)))
3080 start = m.end()
3081
3082 if not tags:
3083 # Try "Tag: " prefix.
3084 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3085 if m:
3086 tags.append(self.sanitize_hash_tag(m.group(1)))
3087 return tags
3088
3089 @classmethod
3090 def sanitize_hash_tag(cls, tag):
3091 """Returns a sanitized Gerrit hash tag.
3092
3093 A sanitized hashtag can be used as a git push refspec parameter value.
3094 """
3095 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3096
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003097 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3098 """Updates this commit description given the parent.
3099
3100 This is essentially what Gnumbd used to do.
3101 Consult https://goo.gl/WMmpDe for more details.
3102 """
3103 assert parent_msg # No, orphan branch creation isn't supported.
3104 assert parent_hash
3105 assert dest_ref
3106 parent_footer_map = git_footers.parse_footers(parent_msg)
3107 # This will also happily parse svn-position, which GnumbD is no longer
3108 # supporting. While we'd generate correct footers, the verifier plugin
3109 # installed in Gerrit will block such commit (ie git push below will fail).
3110 parent_position = git_footers.get_position(parent_footer_map)
3111
3112 # Cherry-picks may have last line obscuring their prior footers,
3113 # from git_footers perspective. This is also what Gnumbd did.
3114 cp_line = None
3115 if (self._description_lines and
3116 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3117 cp_line = self._description_lines.pop()
3118
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003119 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003120
3121 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3122 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003123 for i, line in enumerate(footer_lines):
3124 k, v = git_footers.parse_footer(line) or (None, None)
3125 if k and k.startswith('Cr-'):
3126 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003127
3128 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003129 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003130 if parent_position[0] == dest_ref:
3131 # Same branch as parent.
3132 number = int(parent_position[1]) + 1
3133 else:
3134 number = 1 # New branch, and extra lineage.
3135 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3136 int(parent_position[1])))
3137
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003138 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3139 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003140
3141 self._description_lines = top_lines
3142 if cp_line:
3143 self._description_lines.append(cp_line)
3144 if self._description_lines[-1] != '':
3145 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003146 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003147
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003148
Aaron Gablea1bab272017-04-11 16:38:18 -07003149def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003150 """Retrieves the reviewers that approved a CL from the issue properties with
3151 messages.
3152
3153 Note that the list may contain reviewers that are not committer, thus are not
3154 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003155
3156 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003157 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003158 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003159 return sorted(
3160 set(
3161 message['sender']
3162 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003163 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003164 )
3165 )
3166
3167
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003168def FindCodereviewSettingsFile(filename='codereview.settings'):
3169 """Finds the given file starting in the cwd and going up.
3170
3171 Only looks up to the top of the repository unless an
3172 'inherit-review-settings-ok' file exists in the root of the repository.
3173 """
3174 inherit_ok_file = 'inherit-review-settings-ok'
3175 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003176 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003177 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3178 root = '/'
3179 while True:
3180 if filename in os.listdir(cwd):
3181 if os.path.isfile(os.path.join(cwd, filename)):
3182 return open(os.path.join(cwd, filename))
3183 if cwd == root:
3184 break
3185 cwd = os.path.dirname(cwd)
3186
3187
3188def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003189 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003190 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003191
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003192 def SetProperty(name, setting, unset_error_ok=False):
3193 fullname = 'rietveld.' + name
3194 if setting in keyvals:
3195 RunGit(['config', fullname, keyvals[setting]])
3196 else:
3197 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3198
tandrii48df5812016-10-17 03:55:37 -07003199 if not keyvals.get('GERRIT_HOST', False):
3200 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003201 # Only server setting is required. Other settings can be absent.
3202 # In that case, we ignore errors raised during option deletion attempt.
3203 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3204 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3205 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003206 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003207 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3208 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003209 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3210 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003211
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003212 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003213 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003214
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003215 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003216 RunGit(['config', 'gerrit.squash-uploads',
3217 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003218
tandrii@chromium.org28253532016-04-14 13:46:56 +00003219 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003220 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003221 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3222
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003223 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003224 # should be of the form
3225 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3226 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003227 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3228 keyvals['ORIGIN_URL_CONFIG']])
3229
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003230
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003231def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003232 """Downloads a network object to a local file, like urllib.urlretrieve.
3233
3234 This is necessary because urllib is broken for SSL connections via a proxy.
3235 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003236 with open(destination, 'w') as f:
3237 f.write(urllib2.urlopen(source).read())
3238
3239
ukai@chromium.org712d6102013-11-27 00:52:58 +00003240def hasSheBang(fname):
3241 """Checks fname is a #! script."""
3242 with open(fname) as f:
3243 return f.read(2).startswith('#!')
3244
3245
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003246# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3247def DownloadHooks(*args, **kwargs):
3248 pass
3249
3250
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003251def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003252 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003253
3254 Args:
3255 force: True to update hooks. False to install hooks if not present.
3256 """
3257 if not settings.GetIsGerrit():
3258 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003259 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003260 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3261 if not os.access(dst, os.X_OK):
3262 if os.path.exists(dst):
3263 if not force:
3264 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003265 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003266 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003267 if not hasSheBang(dst):
3268 DieWithError('Not a script: %s\n'
3269 'You need to download from\n%s\n'
3270 'into .git/hooks/commit-msg and '
3271 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003272 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3273 except Exception:
3274 if os.path.exists(dst):
3275 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003276 DieWithError('\nFailed to download hooks.\n'
3277 'You need to download from\n%s\n'
3278 'into .git/hooks/commit-msg and '
3279 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003280
3281
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003282class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003283 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003284
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003285 _GOOGLESOURCE = 'googlesource.com'
3286
3287 def __init__(self):
3288 # Cached list of [host, identity, source], where source is either
3289 # .gitcookies or .netrc.
3290 self._all_hosts = None
3291
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003292 def ensure_configured_gitcookies(self):
3293 """Runs checks and suggests fixes to make git use .gitcookies from default
3294 path."""
3295 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3296 configured_path = RunGitSilent(
3297 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003298 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003299 if configured_path:
3300 self._ensure_default_gitcookies_path(configured_path, default)
3301 else:
3302 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003303
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003304 @staticmethod
3305 def _ensure_default_gitcookies_path(configured_path, default_path):
3306 assert configured_path
3307 if configured_path == default_path:
3308 print('git is already configured to use your .gitcookies from %s' %
3309 configured_path)
3310 return
3311
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003312 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003313 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3314 (configured_path, default_path))
3315
3316 if not os.path.exists(configured_path):
3317 print('However, your configured .gitcookies file is missing.')
3318 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3319 action='reconfigure')
3320 RunGit(['config', '--global', 'http.cookiefile', default_path])
3321 return
3322
3323 if os.path.exists(default_path):
3324 print('WARNING: default .gitcookies file already exists %s' %
3325 default_path)
3326 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3327 default_path)
3328
3329 confirm_or_exit('Move existing .gitcookies to default location?',
3330 action='move')
3331 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003332 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003333 print('Moved and reconfigured git to use .gitcookies from %s' %
3334 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003335
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003336 @staticmethod
3337 def _configure_gitcookies_path(default_path):
3338 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3339 if os.path.exists(netrc_path):
3340 print('You seem to be using outdated .netrc for git credentials: %s' %
3341 netrc_path)
3342 print('This tool will guide you through setting up recommended '
3343 '.gitcookies store for git credentials.\n'
3344 '\n'
3345 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3346 ' git config --global --unset http.cookiefile\n'
3347 ' mv %s %s.backup\n\n' % (default_path, default_path))
3348 confirm_or_exit(action='setup .gitcookies')
3349 RunGit(['config', '--global', 'http.cookiefile', default_path])
3350 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003351
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003352 def get_hosts_with_creds(self, include_netrc=False):
3353 if self._all_hosts is None:
3354 a = gerrit_util.CookiesAuthenticator()
3355 self._all_hosts = [
3356 (h, u, s)
3357 for h, u, s in itertools.chain(
3358 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3359 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3360 )
3361 if h.endswith(self._GOOGLESOURCE)
3362 ]
3363
3364 if include_netrc:
3365 return self._all_hosts
3366 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3367
3368 def print_current_creds(self, include_netrc=False):
3369 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3370 if not hosts:
3371 print('No Git/Gerrit credentials found')
3372 return
3373 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3374 header = [('Host', 'User', 'Which file'),
3375 ['=' * l for l in lengths]]
3376 for row in (header + hosts):
3377 print('\t'.join((('%%+%ds' % l) % s)
3378 for l, s in zip(lengths, row)))
3379
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003380 @staticmethod
3381 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003382 """Parses identity "git-<username>.domain" into <username> and domain."""
3383 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003384 # distinguishable from sub-domains. But we do know typical domains:
3385 if identity.endswith('.chromium.org'):
3386 domain = 'chromium.org'
3387 username = identity[:-len('.chromium.org')]
3388 else:
3389 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003390 if username.startswith('git-'):
3391 username = username[len('git-'):]
3392 return username, domain
3393
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003394 def _canonical_git_googlesource_host(self, host):
3395 """Normalizes Gerrit hosts (with '-review') to Git host."""
3396 assert host.endswith(self._GOOGLESOURCE)
3397 # Prefix doesn't include '.' at the end.
3398 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3399 if prefix.endswith('-review'):
3400 prefix = prefix[:-len('-review')]
3401 return prefix + '.' + self._GOOGLESOURCE
3402
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003403 def _canonical_gerrit_googlesource_host(self, host):
3404 git_host = self._canonical_git_googlesource_host(host)
3405 prefix = git_host.split('.', 1)[0]
3406 return prefix + '-review.' + self._GOOGLESOURCE
3407
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 def _get_counterpart_host(self, host):
3409 assert host.endswith(self._GOOGLESOURCE)
3410 git = self._canonical_git_googlesource_host(host)
3411 gerrit = self._canonical_gerrit_googlesource_host(git)
3412 return git if gerrit == host else gerrit
3413
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003414 def has_generic_host(self):
3415 """Returns whether generic .googlesource.com has been configured.
3416
3417 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3418 """
3419 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3420 if host == '.' + self._GOOGLESOURCE:
3421 return True
3422 return False
3423
3424 def _get_git_gerrit_identity_pairs(self):
3425 """Returns map from canonic host to pair of identities (Git, Gerrit).
3426
3427 One of identities might be None, meaning not configured.
3428 """
3429 host_to_identity_pairs = {}
3430 for host, identity, _ in self.get_hosts_with_creds():
3431 canonical = self._canonical_git_googlesource_host(host)
3432 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3433 idx = 0 if canonical == host else 1
3434 pair[idx] = identity
3435 return host_to_identity_pairs
3436
3437 def get_partially_configured_hosts(self):
3438 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003439 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3440 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3441 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003442
3443 def get_conflicting_hosts(self):
3444 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003445 host
3446 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003447 if None not in (i1, i2) and i1 != i2)
3448
3449 def get_duplicated_hosts(self):
3450 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3451 return set(host for host, count in counters.iteritems() if count > 1)
3452
3453 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3454 'chromium.googlesource.com': 'chromium.org',
3455 'chrome-internal.googlesource.com': 'google.com',
3456 }
3457
3458 def get_hosts_with_wrong_identities(self):
3459 """Finds hosts which **likely** reference wrong identities.
3460
3461 Note: skips hosts which have conflicting identities for Git and Gerrit.
3462 """
3463 hosts = set()
3464 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3465 pair = self._get_git_gerrit_identity_pairs().get(host)
3466 if pair and pair[0] == pair[1]:
3467 _, domain = self._parse_identity(pair[0])
3468 if domain != expected:
3469 hosts.add(host)
3470 return hosts
3471
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003472 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003473 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003474 hosts = sorted(hosts)
3475 assert hosts
3476 if extra_column_func is None:
3477 extras = [''] * len(hosts)
3478 else:
3479 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003480 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3481 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003482 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003483 lines.append(tmpl % he)
3484 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003485
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003486 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003487 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003488 yield ('.googlesource.com wildcard record detected',
3489 ['Chrome Infrastructure team recommends to list full host names '
3490 'explicitly.'],
3491 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003492
3493 dups = self.get_duplicated_hosts()
3494 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003495 yield ('The following hosts were defined twice',
3496 self._format_hosts(dups),
3497 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003498
3499 partial = self.get_partially_configured_hosts()
3500 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003501 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3502 'These hosts are missing',
3503 self._format_hosts(partial, lambda host: 'but %s defined' %
3504 self._get_counterpart_host(host)),
3505 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003506
3507 conflicting = self.get_conflicting_hosts()
3508 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003509 yield ('The following Git hosts have differing credentials from their '
3510 'Gerrit counterparts',
3511 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3512 tuple(self._get_git_gerrit_identity_pairs()[host])),
3513 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003514
3515 wrong = self.get_hosts_with_wrong_identities()
3516 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003517 yield ('These hosts likely use wrong identity',
3518 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3519 (self._get_git_gerrit_identity_pairs()[host][0],
3520 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3521 wrong)
3522
3523 def find_and_report_problems(self):
3524 """Returns True if there was at least one problem, else False."""
3525 found = False
3526 bad_hosts = set()
3527 for title, sublines, hosts in self._find_problems():
3528 if not found:
3529 found = True
3530 print('\n\n.gitcookies problem report:\n')
3531 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003532 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003533 if sublines:
3534 print()
3535 print(' %s' % '\n '.join(sublines))
3536 print()
3537
3538 if bad_hosts:
3539 assert found
3540 print(' You can manually remove corresponding lines in your %s file and '
3541 'visit the following URLs with correct account to generate '
3542 'correct credential lines:\n' %
3543 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3544 print(' %s' % '\n '.join(sorted(set(
3545 gerrit_util.CookiesAuthenticator().get_new_password_url(
3546 self._canonical_git_googlesource_host(host))
3547 for host in bad_hosts
3548 ))))
3549 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003550
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003551
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003552@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003553def CMDcreds_check(parser, args):
3554 """Checks credentials and suggests changes."""
3555 _, _ = parser.parse_args(args)
3556
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003557 # Code below checks .gitcookies. Abort if using something else.
3558 authn = gerrit_util.Authenticator.get()
3559 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3560 if isinstance(authn, gerrit_util.GceAuthenticator):
3561 DieWithError(
3562 'This command is not designed for GCE, are you on a bot?\n'
3563 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3564 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003565 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003566 'This command is not designed for bot environment. It checks '
3567 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003568
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003569 checker = _GitCookiesChecker()
3570 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003571
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003572 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003573 checker.print_current_creds(include_netrc=True)
3574
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003575 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003576 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003577 return 0
3578 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003579
3580
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003581@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003582def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003583 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003584 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3585 branch = ShortBranchName(branchref)
3586 _, args = parser.parse_args(args)
3587 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003588 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003589 return RunGit(['config', 'branch.%s.base-url' % branch],
3590 error_ok=False).strip()
3591 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003592 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003593 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3594 error_ok=False).strip()
3595
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003596
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003597def color_for_status(status):
3598 """Maps a Changelist status to color, for CMDstatus and other tools."""
3599 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003600 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003601 'waiting': Fore.BLUE,
3602 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003603 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003604 'lgtm': Fore.GREEN,
3605 'commit': Fore.MAGENTA,
3606 'closed': Fore.CYAN,
3607 'error': Fore.WHITE,
3608 }.get(status, Fore.WHITE)
3609
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003610
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003611def get_cl_statuses(changes, fine_grained, max_processes=None):
3612 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003613
3614 If fine_grained is true, this will fetch CL statuses from the server.
3615 Otherwise, simply indicate if there's a matching url for the given branches.
3616
3617 If max_processes is specified, it is used as the maximum number of processes
3618 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3619 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003620
3621 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003622 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003623 if not changes:
3624 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003625
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003626 if not fine_grained:
3627 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003628 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003629 for cl in changes:
3630 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003631 return
3632
3633 # First, sort out authentication issues.
3634 logging.debug('ensuring credentials exist')
3635 for cl in changes:
3636 cl.EnsureAuthenticated(force=False, refresh=True)
3637
3638 def fetch(cl):
3639 try:
3640 return (cl, cl.GetStatus())
3641 except:
3642 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003643 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003644 raise
3645
3646 threads_count = len(changes)
3647 if max_processes:
3648 threads_count = max(1, min(threads_count, max_processes))
3649 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3650
3651 pool = ThreadPool(threads_count)
3652 fetched_cls = set()
3653 try:
3654 it = pool.imap_unordered(fetch, changes).__iter__()
3655 while True:
3656 try:
3657 cl, status = it.next(timeout=5)
3658 except multiprocessing.TimeoutError:
3659 break
3660 fetched_cls.add(cl)
3661 yield cl, status
3662 finally:
3663 pool.close()
3664
3665 # Add any branches that failed to fetch.
3666 for cl in set(changes) - fetched_cls:
3667 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003668
rmistry@google.com2dd99862015-06-22 12:22:18 +00003669
3670def upload_branch_deps(cl, args):
3671 """Uploads CLs of local branches that are dependents of the current branch.
3672
3673 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003674
3675 test1 -> test2.1 -> test3.1
3676 -> test3.2
3677 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003678
3679 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3680 run on the dependent branches in this order:
3681 test2.1, test3.1, test3.2, test2.2, test3.3
3682
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003683 Note: This function does not rebase your local dependent branches. Use it
3684 when you make a change to the parent branch that will not conflict
3685 with its dependent branches, and you would like their dependencies
3686 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 """
3688 if git_common.is_dirty_git_tree('upload-branch-deps'):
3689 return 1
3690
3691 root_branch = cl.GetBranch()
3692 if root_branch is None:
3693 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3694 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003695 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003696 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3697 'patchset dependencies without an uploaded CL.')
3698
3699 branches = RunGit(['for-each-ref',
3700 '--format=%(refname:short) %(upstream:short)',
3701 'refs/heads'])
3702 if not branches:
3703 print('No local branches found.')
3704 return 0
3705
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003706 # Create a dictionary of all local branches to the branches that are
3707 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003708 tracked_to_dependents = collections.defaultdict(list)
3709 for b in branches.splitlines():
3710 tokens = b.split()
3711 if len(tokens) == 2:
3712 branch_name, tracked = tokens
3713 tracked_to_dependents[tracked].append(branch_name)
3714
vapiera7fbd5a2016-06-16 09:17:49 -07003715 print()
3716 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003717 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003718
rmistry@google.com2dd99862015-06-22 12:22:18 +00003719 def traverse_dependents_preorder(branch, padding=''):
3720 dependents_to_process = tracked_to_dependents.get(branch, [])
3721 padding += ' '
3722 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003723 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003724 dependents.append(dependent)
3725 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003726
rmistry@google.com2dd99862015-06-22 12:22:18 +00003727 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003729
3730 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003731 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003732 return 0
3733
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003734 confirm_or_exit('This command will checkout all dependent branches and run '
3735 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003736
rmistry@google.com2dd99862015-06-22 12:22:18 +00003737 # Record all dependents that failed to upload.
3738 failures = {}
3739 # Go through all dependents, checkout the branch and upload.
3740 try:
3741 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003742 print()
3743 print('--------------------------------------')
3744 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003745 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003747 try:
3748 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003749 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003750 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003751 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003752 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003754 finally:
3755 # Swap back to the original root branch.
3756 RunGit(['checkout', '-q', root_branch])
3757
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print()
3759 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003760 for dependent_branch in dependents:
3761 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print(' %s : %s' % (dependent_branch, upload_status))
3763 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003764
3765 return 0
3766
3767
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003768@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003769def CMDarchive(parser, args):
3770 """Archives and deletes branches associated with closed changelists."""
3771 parser.add_option(
3772 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003773 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003774 parser.add_option(
3775 '-f', '--force', action='store_true',
3776 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003777 parser.add_option(
3778 '-d', '--dry-run', action='store_true',
3779 help='Skip the branch tagging and removal steps.')
3780 parser.add_option(
3781 '-t', '--notags', action='store_true',
3782 help='Do not tag archived branches. '
3783 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003784
kmarshall3bff56b2016-06-06 18:31:47 -07003785 options, args = parser.parse_args(args)
3786 if args:
3787 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003788
3789 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3790 if not branches:
3791 return 0
3792
vapiera7fbd5a2016-06-16 09:17:49 -07003793 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003794 changes = [Changelist(branchref=b)
3795 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003796 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3797 statuses = get_cl_statuses(changes,
3798 fine_grained=True,
3799 max_processes=options.maxjobs)
3800 proposal = [(cl.GetBranch(),
3801 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3802 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003803 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003804 proposal.sort()
3805
3806 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003807 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003808 return 0
3809
3810 current_branch = GetCurrentBranch()
3811
vapiera7fbd5a2016-06-16 09:17:49 -07003812 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003813 if options.notags:
3814 for next_item in proposal:
3815 print(' ' + next_item[0])
3816 else:
3817 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3818 for next_item in proposal:
3819 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003820
kmarshall9249e012016-08-23 12:02:16 -07003821 # Quit now on precondition failure or if instructed by the user, either
3822 # via an interactive prompt or by command line flags.
3823 if options.dry_run:
3824 print('\nNo changes were made (dry run).\n')
3825 return 0
3826 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003827 print('You are currently on a branch \'%s\' which is associated with a '
3828 'closed codereview issue, so archive cannot proceed. Please '
3829 'checkout another branch and run this command again.' %
3830 current_branch)
3831 return 1
kmarshall9249e012016-08-23 12:02:16 -07003832 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003833 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3834 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003835 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003836 return 1
3837
3838 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003839 if not options.notags:
3840 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003841 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003842
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003844
3845 return 0
3846
3847
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003848@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003850 """Show status of changelists.
3851
3852 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003853 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003854 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003855 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003856 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003857 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003858 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003859 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003860
3861 Also see 'git cl comments'.
3862 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003863 parser.add_option(
3864 '--no-branch-color',
3865 action='store_true',
3866 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003867 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003868 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003869 parser.add_option('-f', '--fast', action='store_true',
3870 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003871 parser.add_option(
3872 '-j', '--maxjobs', action='store', type=int,
3873 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003874
iannuccie53c9352016-08-17 14:40:40 -07003875 _add_codereview_issue_select_options(
3876 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003877 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003878 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003879 if args:
3880 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003881
iannuccie53c9352016-08-17 14:40:40 -07003882 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003883 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003884
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003885 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003886 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003887 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889 elif options.field == 'id':
3890 issueid = cl.GetIssue()
3891 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003893 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003894 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003895 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003897 elif options.field == 'status':
3898 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003899 elif options.field == 'url':
3900 url = cl.GetIssueURL()
3901 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003903 return 0
3904
3905 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3906 if not branches:
3907 print('No local branch found.')
3908 return 0
3909
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003910 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003911 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003912 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003913 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003914 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003915 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003916 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003917
Daniel McArdlea23bf592019-02-12 00:25:12 +00003918 current_branch = GetCurrentBranch()
3919
3920 def FormatBranchName(branch, colorize=False):
3921 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3922 an asterisk when it is the current branch."""
3923
3924 asterisk = ""
3925 color = Fore.RESET
3926 if branch == current_branch:
3927 asterisk = "* "
3928 color = Fore.GREEN
3929 branch_name = ShortBranchName(branch)
3930
3931 if colorize:
3932 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003933 return asterisk + branch_name
3934
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003935 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003936
3937 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003938 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3939 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003940 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003941 c, status = output.next()
3942 branch_statuses[c.GetBranch()] = status
3943 status = branch_statuses.pop(branch)
3944 url = cl.GetIssueURL()
3945 if url and (not status or status == 'error'):
3946 # The issue probably doesn't exist anymore.
3947 url += ' (broken)'
3948
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003949 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003950 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003951 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003952 color = ''
3953 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003954 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003955
Alan Cuttera3be9a52019-03-04 18:50:33 +00003956 branch_display = FormatBranchName(branch)
3957 padding = ' ' * (alignment - len(branch_display))
3958 if not options.no_branch_color:
3959 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003960
Alan Cuttera3be9a52019-03-04 18:50:33 +00003961 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3962 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003963
vapiera7fbd5a2016-06-16 09:17:49 -07003964 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003965 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003966 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003967 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003968 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003969 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003970 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003971 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003973 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003974 print('Issue description:')
3975 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003976 return 0
3977
3978
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003979def colorize_CMDstatus_doc():
3980 """To be called once in main() to add colors to git cl status help."""
3981 colors = [i for i in dir(Fore) if i[0].isupper()]
3982
3983 def colorize_line(line):
3984 for color in colors:
3985 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003986 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003987 indent = len(line) - len(line.lstrip(' ')) + 1
3988 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3989 return line
3990
3991 lines = CMDstatus.__doc__.splitlines()
3992 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3993
3994
phajdan.jre328cf92016-08-22 04:12:17 -07003995def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003996 if path == '-':
3997 json.dump(contents, sys.stdout)
3998 else:
3999 with open(path, 'w') as f:
4000 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004001
4002
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004003@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004004@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004005def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004006 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004007
4008 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004009 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004010 parser.add_option('-r', '--reverse', action='store_true',
4011 help='Lookup the branch(es) for the specified issues. If '
4012 'no issues are specified, all branches with mapped '
4013 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004014 parser.add_option('--json',
4015 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004016 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004017 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004018 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019
dnj@chromium.org406c4402015-03-03 17:22:28 +00004020 if options.reverse:
4021 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004022 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004023 # Reverse issue lookup.
4024 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004025
4026 git_config = {}
4027 for config in RunGit(['config', '--get-regexp',
4028 r'branch\..*issue']).splitlines():
4029 name, _space, val = config.partition(' ')
4030 git_config[name] = val
4031
dnj@chromium.org406c4402015-03-03 17:22:28 +00004032 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004033 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4034 config_key = _git_branch_config_key(ShortBranchName(branch),
4035 cls.IssueConfigKey())
4036 issue = git_config.get(config_key)
4037 if issue:
4038 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004039 if not args:
4040 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004041 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004042 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004043 try:
4044 issue_num = int(issue)
4045 except ValueError:
4046 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004047 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004048 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004050 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004051 if options.json:
4052 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004053 return 0
4054
4055 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004056 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004057 if not issue.valid:
4058 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4059 'or no argument to list it.\n'
4060 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004061 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004062 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004063 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004064 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004065 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4066 if options.json:
4067 write_json(options.json, {
4068 'issue': cl.GetIssue(),
4069 'issue_url': cl.GetIssueURL(),
4070 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 return 0
4072
4073
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004074@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004075def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004076 """Shows or posts review comments for any changelist."""
4077 parser.add_option('-a', '--add-comment', dest='comment',
4078 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004079 parser.add_option('-p', '--publish', action='store_true',
4080 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004081 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004082 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004083 parser.add_option('-m', '--machine-readable', dest='readable',
4084 action='store_false', default=True,
4085 help='output comments in a format compatible with '
4086 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004087 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004088 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004089 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004090 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004091 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004092
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004093 issue = None
4094 if options.issue:
4095 try:
4096 issue = int(options.issue)
4097 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004098 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004099
Edward Lemur934836a2019-09-09 20:16:54 +00004100 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004101
4102 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004103 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004104 return 0
4105
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004106 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4107 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004108 for comment in summary:
4109 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004110 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004111 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004112 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004113 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004114 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004115 elif comment.autogenerated:
4116 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004117 else:
4118 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004119 print('\n%s%s %s%s\n%s' % (
4120 color,
4121 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4122 comment.sender,
4123 Fore.RESET,
4124 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4125
smut@google.comc85ac942015-09-15 16:34:43 +00004126 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004127 def pre_serialize(c):
4128 dct = c.__dict__.copy()
4129 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4130 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004131 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004132 return 0
4133
4134
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004135@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004136@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004137def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004138 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004139 parser.add_option('-d', '--display', action='store_true',
4140 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004141 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004142 help='New description to set for this issue (- for stdin, '
4143 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004144 parser.add_option('-f', '--force', action='store_true',
4145 help='Delete any unpublished Gerrit edits for this issue '
4146 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004147
4148 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004149 options, args = parser.parse_args(args)
4150 _process_codereview_select_options(parser, options)
4151
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004152 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004153 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004154 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004155 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004156 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004157
Edward Lemur934836a2019-09-09 20:16:54 +00004158 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004159 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004160 if target_issue_arg:
4161 kwargs['issue'] = target_issue_arg.issue
4162 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004163 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004164 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004165
4166 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004167 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004168 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004169 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004170
4171 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004172 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004173
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004174 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004175
smut@google.com34fb6b12015-07-13 20:03:26 +00004176 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004178 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004179
4180 if options.new_description:
4181 text = options.new_description
4182 if text == '-':
4183 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004184 elif text == '+':
4185 base_branch = cl.GetCommonAncestorWithUpstream()
4186 change = cl.GetChange(base_branch, None, local_description=True)
4187 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004188
4189 description.set_description(text)
4190 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004191 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004192 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004193 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004194 return 0
4195
4196
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004197@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004198def CMDlint(parser, args):
4199 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004200 parser.add_option('--filter', action='append', metavar='-x,+y',
4201 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004202 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004203
4204 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004205 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004206 try:
4207 import cpplint
4208 import cpplint_chromium
4209 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004210 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004211 return 1
4212
4213 # Change the current working directory before calling lint so that it
4214 # shows the correct base.
4215 previous_cwd = os.getcwd()
4216 os.chdir(settings.GetRoot())
4217 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004218 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004219 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4220 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004221 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004223 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004224
4225 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004226 command = args + files
4227 if options.filter:
4228 command = ['--filter=' + ','.join(options.filter)] + command
4229 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004230
4231 white_regex = re.compile(settings.GetLintRegex())
4232 black_regex = re.compile(settings.GetLintIgnoreRegex())
4233 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4234 for filename in filenames:
4235 if white_regex.match(filename):
4236 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004238 else:
4239 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4240 extra_check_functions)
4241 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004242 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004243 finally:
4244 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004245 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004246 if cpplint._cpplint_state.error_count != 0:
4247 return 1
4248 return 0
4249
4250
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004251@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004252def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004253 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004254 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004255 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004256 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004257 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004258 parser.add_option('--all', action='store_true',
4259 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004260 parser.add_option('--parallel', action='store_true',
4261 help='Run all tests specified by input_api.RunTests in all '
4262 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004263 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264
sbc@chromium.org71437c02015-04-09 19:29:40 +00004265 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004266 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004267 return 1
4268
Edward Lemur934836a2019-09-09 20:16:54 +00004269 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004270 if args:
4271 base_branch = args[0]
4272 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004273 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004274 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004275
Aaron Gable8076c282017-11-29 14:39:41 -08004276 if options.all:
4277 base_change = cl.GetChange(base_branch, None)
4278 files = [('M', f) for f in base_change.AllFiles()]
4279 change = presubmit_support.GitChange(
4280 base_change.Name(),
4281 base_change.FullDescriptionText(),
4282 base_change.RepositoryRoot(),
4283 files,
4284 base_change.issue,
4285 base_change.patchset,
4286 base_change.author_email,
4287 base_change._upstream)
4288 else:
4289 change = cl.GetChange(base_branch, None)
4290
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004291 cl.RunHook(
4292 committing=not options.upload,
4293 may_prompt=False,
4294 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004295 change=change,
4296 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004297 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004298
4299
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004300def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004301 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004302
4303 Works the same way as
4304 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4305 but can be called on demand on all platforms.
4306
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004307 The basic idea is to generate git hash of a state of the tree, original
4308 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004309 """
4310 lines = []
4311 tree_hash = RunGitSilent(['write-tree'])
4312 lines.append('tree %s' % tree_hash.strip())
4313 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4314 if code == 0:
4315 lines.append('parent %s' % parent.strip())
4316 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4317 lines.append('author %s' % author.strip())
4318 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4319 lines.append('committer %s' % committer.strip())
4320 lines.append('')
4321 # Note: Gerrit's commit-hook actually cleans message of some lines and
4322 # whitespace. This code is not doing this, but it clearly won't decrease
4323 # entropy.
4324 lines.append(message)
4325 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004326 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004327 return 'I%s' % change_hash.strip()
4328
4329
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004330def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004331 """Computes the remote branch ref to use for the CL.
4332
4333 Args:
4334 remote (str): The git remote for the CL.
4335 remote_branch (str): The git remote branch for the CL.
4336 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004337 """
4338 if not (remote and remote_branch):
4339 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004340
wittman@chromium.org455dc922015-01-26 20:15:50 +00004341 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004342 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004343 # refs, which are then translated into the remote full symbolic refs
4344 # below.
4345 if '/' not in target_branch:
4346 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4347 else:
4348 prefix_replacements = (
4349 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4350 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4351 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4352 )
4353 match = None
4354 for regex, replacement in prefix_replacements:
4355 match = re.search(regex, target_branch)
4356 if match:
4357 remote_branch = target_branch.replace(match.group(0), replacement)
4358 break
4359 if not match:
4360 # This is a branch path but not one we recognize; use as-is.
4361 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004362 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4363 # Handle the refs that need to land in different refs.
4364 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004365
wittman@chromium.org455dc922015-01-26 20:15:50 +00004366 # Create the true path to the remote branch.
4367 # Does the following translation:
4368 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4369 # * refs/remotes/origin/master -> refs/heads/master
4370 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4371 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4372 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4373 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4374 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4375 'refs/heads/')
4376 elif remote_branch.startswith('refs/remotes/branch-heads'):
4377 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004378
wittman@chromium.org455dc922015-01-26 20:15:50 +00004379 return remote_branch
4380
4381
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004382def cleanup_list(l):
4383 """Fixes a list so that comma separated items are put as individual items.
4384
4385 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4386 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4387 """
4388 items = sum((i.split(',') for i in l), [])
4389 stripped_items = (i.strip() for i in items)
4390 return sorted(filter(None, stripped_items))
4391
4392
Aaron Gable4db38df2017-11-03 14:59:07 -07004393@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004394@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004395def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004396 """Uploads the current changelist to codereview.
4397
4398 Can skip dependency patchset uploads for a branch by running:
4399 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004400 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004401 git config --unset branch.branch_name.skip-deps-uploads
4402 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004403
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004404 If the name of the checked out branch starts with "bug-" or "fix-" followed
4405 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004406 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004407
4408 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004409 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004410 [git-cl] add support for hashtags
4411 Foo bar: implement foo
4412 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004413 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004414 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4415 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004416 parser.add_option('--bypass-watchlists', action='store_true',
4417 dest='bypass_watchlists',
4418 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004419 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004420 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004421 parser.add_option('--message', '-m', dest='message',
4422 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004423 parser.add_option('-b', '--bug',
4424 help='pre-populate the bug number(s) for this issue. '
4425 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004426 parser.add_option('--message-file', dest='message_file',
4427 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004428 parser.add_option('--title', '-t', dest='title',
4429 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004430 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004431 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004432 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004433 parser.add_option('--tbrs',
4434 action='append', default=[],
4435 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004436 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004437 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004438 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004439 parser.add_option('--hashtag', dest='hashtags',
4440 action='append', default=[],
4441 help=('Gerrit hashtag for new CL; '
4442 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004443 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004444 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004445 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004446 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004447 metavar='TARGET',
4448 help='Apply CL to remote ref TARGET. ' +
4449 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004450 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004451 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004452 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004453 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004454 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004455 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004456 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4457 const='TBR', help='add a set of OWNERS to TBR')
4458 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4459 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004460 parser.add_option('-c', '--use-commit-queue', action='store_true',
4461 help='tell the CQ to commit this patchset; '
4462 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004463 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4464 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004465 help='Send the patchset to do a CQ dry run right after '
4466 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004467 parser.add_option('--preserve-tryjobs', action='store_true',
4468 help='instruct the CQ to let tryjobs running even after '
4469 'new patchsets are uploaded instead of canceling '
4470 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004471 parser.add_option('--dependencies', action='store_true',
4472 help='Uploads CLs of all the local branches that depend on '
4473 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004474 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4475 help='Sends your change to the CQ after an approval. Only '
4476 'works on repos that have the Auto-Submit label '
4477 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004478 parser.add_option('--parallel', action='store_true',
4479 help='Run all tests specified by input_api.RunTests in all '
4480 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004481
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004482 parser.add_option('--no-autocc', action='store_true',
4483 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004484 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004485 help='Set the review private. This implies --no-autocc.')
4486
rmistry@google.com2dd99862015-06-22 12:22:18 +00004487 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004488 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004489 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004490 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004491
sbc@chromium.org71437c02015-04-09 19:29:40 +00004492 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004493 return 1
4494
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004495 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004496 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004497 options.cc = cleanup_list(options.cc)
4498
tandriib80458a2016-06-23 12:20:07 -07004499 if options.message_file:
4500 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004501 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004502 options.message = gclient_utils.FileRead(options.message_file)
4503 options.message_file = None
4504
tandrii4d0545a2016-07-06 03:56:49 -07004505 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004506 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004507
Aaron Gableedbc4132017-09-11 13:22:28 -07004508 if options.use_commit_queue:
4509 options.send_mail = True
4510
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004511 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4512 settings.GetIsGerrit()
4513
Edward Lemur934836a2019-09-09 20:16:54 +00004514 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004515
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004516 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004517
4518
Francois Dorayd42c6812017-05-30 15:10:20 -04004519@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004520@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004521def CMDsplit(parser, args):
4522 """Splits a branch into smaller branches and uploads CLs.
4523
4524 Creates a branch and uploads a CL for each group of files modified in the
4525 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004526 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004527 the shared OWNERS file.
4528 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004529 parser.add_option('-d', '--description', dest='description_file',
4530 help='A text file containing a CL description in which '
4531 '$directory will be replaced by each CL\'s directory.')
4532 parser.add_option('-c', '--comment', dest='comment_file',
4533 help='A text file containing a CL comment.')
4534 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004535 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004536 help='List the files and reviewers for each CL that would '
4537 'be created, but don\'t create branches or CLs.')
4538 parser.add_option('--cq-dry-run', action='store_true',
4539 help='If set, will do a cq dry run for each uploaded CL. '
4540 'Please be careful when doing this; more than ~10 CLs '
4541 'has the potential to overload our build '
4542 'infrastructure. Try to upload these not during high '
4543 'load times (usually 11-3 Mountain View time). Email '
4544 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004545 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4546 default=True,
4547 help='Sends your change to the CQ after an approval. Only '
4548 'works on repos that have the Auto-Submit label '
4549 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004550 options, _ = parser.parse_args(args)
4551
4552 if not options.description_file:
4553 parser.error('No --description flag specified.')
4554
4555 def WrappedCMDupload(args):
4556 return CMDupload(OptionParser(), args)
4557
4558 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004559 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004560 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004561
4562
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004563@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004564@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004566 """DEPRECATED: Used to commit the current changelist via git-svn."""
4567 message = ('git-cl no longer supports committing to SVN repositories via '
4568 'git-svn. You probably want to use `git cl land` instead.')
4569 print(message)
4570 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571
4572
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004573@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004575def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004576 """Commits the current changelist via git.
4577
4578 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4579 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004580 """
4581 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4582 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004583 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004584 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004585 parser.add_option('--parallel', action='store_true',
4586 help='Run all tests specified by input_api.RunTests in all '
4587 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004588 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004589
Edward Lemur934836a2019-09-09 20:16:54 +00004590 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004591
Robert Iannucci2e73d432018-03-14 01:10:47 -07004592 if not cl.GetIssue():
4593 DieWithError('You must upload the change first to Gerrit.\n'
4594 ' If you would rather have `git cl land` upload '
4595 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004596 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004597 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598
4599
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004600@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004601@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004603 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604 parser.add_option('-b', dest='newbranch',
4605 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004606 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004607 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004609 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004610
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004611 group = optparse.OptionGroup(
4612 parser,
4613 'Options for continuing work on the current issue uploaded from a '
4614 'different clone (e.g. different machine). Must be used independently '
4615 'from the other options. No issue number should be specified, and the '
4616 'branch must have an issue number associated with it')
4617 group.add_option('--reapply', action='store_true', dest='reapply',
4618 help='Reset the branch and reapply the issue.\n'
4619 'CAUTION: This will undo any local changes in this '
4620 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004621
4622 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004623 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004624 parser.add_option_group(group)
4625
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004626 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004627 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004628 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004629
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004630 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004631 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004632 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004633 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004634 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004635
Edward Lemur934836a2019-09-09 20:16:54 +00004636 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004637 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004638 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004639
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004640 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004641 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004642 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004643
4644 RunGit(['reset', '--hard', upstream])
4645 if options.pull:
4646 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004647
Edward Lemurf38bc172019-09-03 21:02:13 +00004648 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004649
4650 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004651 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004652
Edward Lemurf38bc172019-09-03 21:02:13 +00004653 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004654 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004655 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004656
4657 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004658 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004659 }
4660 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004661 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004662 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004663 cl_kwargs['issue'] = target_issue_arg.issue
4664
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004665 # We don't want uncommitted changes mixed up with the patch.
4666 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004667 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004668
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004669 if options.newbranch:
4670 if options.force:
4671 RunGit(['branch', '-D', options.newbranch],
4672 stderr=subprocess2.PIPE, error_ok=True)
4673 RunGit(['new-branch', options.newbranch])
4674
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004675 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004676
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004677 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004678 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004679
Edward Lemurf38bc172019-09-03 21:02:13 +00004680 return cl.CMDPatchWithParsedIssue(
4681 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004682
4683
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004684def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004685 """Fetches the tree status and returns either 'open', 'closed',
4686 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004687 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004688 if url:
4689 status = urllib2.urlopen(url).read().lower()
4690 if status.find('closed') != -1 or status == '0':
4691 return 'closed'
4692 elif status.find('open') != -1 or status == '1':
4693 return 'open'
4694 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695 return 'unset'
4696
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004697
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004698def GetTreeStatusReason():
4699 """Fetches the tree status from a json url and returns the message
4700 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004701 url = settings.GetTreeStatusUrl()
4702 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004703 connection = urllib2.urlopen(json_url)
4704 status = json.loads(connection.read())
4705 connection.close()
4706 return status['message']
4707
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004708
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004709@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004710def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004711 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004712 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004713 status = GetTreeStatus()
4714 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004715 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004716 return 2
4717
vapiera7fbd5a2016-06-16 09:17:49 -07004718 print('The tree is %s' % status)
4719 print()
4720 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004721 if status != 'open':
4722 return 1
4723 return 0
4724
4725
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004726@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004727def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004728 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4729 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004730 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004731 '-b', '--bot', action='append',
4732 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4733 'times to specify multiple builders. ex: '
4734 '"-b win_rel -b win_layout". See '
4735 'the try server waterfall for the builders name and the tests '
4736 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004737 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004738 '-B', '--bucket', default='',
4739 help=('Buildbucket bucket to send the try requests.'))
4740 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004741 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004742 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004743 'be determined by the try recipe that builder runs, which usually '
4744 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004745 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004746 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004747 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004748 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004749 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004750 '--category', default='git_cl_try', help='Specify custom build category.')
4751 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004752 '--project',
4753 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004754 'in recipe to determine to which repository or directory to '
4755 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004756 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004757 '-p', '--property', dest='properties', action='append', default=[],
4758 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004759 'key2=value2 etc. The value will be treated as '
4760 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004761 'NOTE: using this may make your tryjob not usable for CQ, '
4762 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004763 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004764 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4765 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004766 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004767 parser.add_option(
4768 '-R', '--retry-failed', action='store_true', default=False,
4769 help='Retry failed jobs from the latest set of tryjobs. '
4770 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004771 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004772 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004773 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004774 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004775 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004776
machenbach@chromium.org45453142015-09-15 08:45:22 +00004777 # Make sure that all properties are prop=value pairs.
4778 bad_params = [x for x in options.properties if '=' not in x]
4779 if bad_params:
4780 parser.error('Got properties with missing "=": %s' % bad_params)
4781
maruel@chromium.org15192402012-09-06 12:38:29 +00004782 if args:
4783 parser.error('Unknown arguments: %s' % args)
4784
Edward Lemur934836a2019-09-09 20:16:54 +00004785 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004786 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004787 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004788
Edward Lemurf38bc172019-09-03 21:02:13 +00004789 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004790 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004791
tandriie113dfd2016-10-11 10:20:12 -07004792 error_message = cl.CannotTriggerTryJobReason()
4793 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004794 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004795
Quinten Yearsley983111f2019-09-26 17:18:48 +00004796 if options.retry_failed:
4797 if options.bot or options.bucket:
4798 print('ERROR: The option --retry-failed is not compatible with '
4799 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4800 return 1
4801 print('Searching for failed tryjobs...')
4802 builds, patchset = _fetch_latest_builds(
4803 auth_config, cl, options.buildbucket_host)
4804 if options.verbose:
4805 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4806 buckets = _filter_failed(builds)
4807 if not buckets:
4808 print('There are no failed jobs in the latest set of jobs '
4809 '(patchset #%d), doing nothing.' % patchset)
4810 return 0
4811 num_builders = sum(len(builders) for builders in buckets.values())
4812 if num_builders > 10:
4813 confirm_or_exit('There are %d builders with failed builds.'
4814 % num_builders, action='continue')
4815 else:
4816 buckets = _get_bucket_map(cl, options, parser)
4817 if buckets and any(b.startswith('master.') for b in buckets):
4818 print('ERROR: Buildbot masters are not supported.')
4819 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004820
qyearsleydd49f942016-10-28 11:57:22 -07004821 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4822 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004823 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004824 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004825 print('git cl try with no bots now defaults to CQ dry run.')
4826 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4827 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004828
borenet6c0efe62016-10-19 08:13:29 -07004829 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004830 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004831 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004832 'of bot requires an initial job from a parent (usually a builder). '
4833 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004834 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004835 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004836
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004837 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004838 try:
4839 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4840 except BuildbucketResponseException as ex:
4841 print('ERROR: %s' % ex)
4842 return 1
4843 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004844
4845
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004846@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004847def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004848 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004849 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004850 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004851 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004852 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004853 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004854 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004855 '--color', action='store_true', default=setup_color.IS_TTY,
4856 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004857 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004858 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4859 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004860 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004861 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004862 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004863 parser.add_option_group(group)
4864 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004865 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004866 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004867 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004868 if args:
4869 parser.error('Unrecognized args: %s' % ' '.join(args))
4870
4871 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004872 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004873 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004874 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004875
tandrii221ab252016-10-06 08:12:04 -07004876 patchset = options.patchset
4877 if not patchset:
4878 patchset = cl.GetMostRecentPatchset()
4879 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004880 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004881 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004882 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004883 cl.GetIssue())
4884
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004885 try:
tandrii221ab252016-10-06 08:12:04 -07004886 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004887 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004888 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004889 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004890 if options.json:
4891 write_try_results_json(options.json, jobs)
4892 else:
4893 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004894 return 0
4895
4896
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004897@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004898@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004899def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004900 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004901 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004902 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004903 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004904
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004905 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004906 if args:
4907 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004908 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004909 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004910 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004911 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004912
4913 # Clear configured merge-base, if there is one.
4914 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004915 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004916 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004917 return 0
4918
4919
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004920@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004921def CMDweb(parser, args):
4922 """Opens the current CL in the web browser."""
4923 _, args = parser.parse_args(args)
4924 if args:
4925 parser.error('Unrecognized args: %s' % ' '.join(args))
4926
4927 issue_url = Changelist().GetIssueURL()
4928 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004929 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004930 return 1
4931
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004932 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004933 # allows us to hide the "Created new window in existing browser session."
4934 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004935 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004936 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004937 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004938 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004939 os.open(os.devnull, os.O_RDWR)
4940 try:
4941 webbrowser.open(issue_url)
4942 finally:
4943 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004944 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004945 return 0
4946
4947
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004948@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004949def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004950 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004951 parser.add_option('-d', '--dry-run', action='store_true',
4952 help='trigger in dry run mode')
4953 parser.add_option('-c', '--clear', action='store_true',
4954 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004955 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004956 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004957 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004958 if args:
4959 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004960 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004961 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004962
Edward Lemur934836a2019-09-09 20:16:54 +00004963 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004964 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004965 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004966 elif options.dry_run:
4967 state = _CQState.DRY_RUN
4968 else:
4969 state = _CQState.COMMIT
4970 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004971 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004972 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004973 return 0
4974
4975
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004976@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004977def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004978 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004979 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004980 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004981 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004982 if args:
4983 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004984 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004985 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004986 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004987 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004988 cl.CloseIssue()
4989 return 0
4990
4991
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004992@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004993def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004994 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004995 parser.add_option(
4996 '--stat',
4997 action='store_true',
4998 dest='stat',
4999 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005000 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005001 if args:
5002 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005003
Edward Lemur934836a2019-09-09 20:16:54 +00005004 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005005 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005006 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005007 if not issue:
5008 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005009
Aaron Gablea718c3e2017-08-28 17:47:28 -07005010 base = cl._GitGetBranchConfigValue('last-upload-hash')
5011 if not base:
5012 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5013 if not base:
5014 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5015 revision_info = detail['revisions'][detail['current_revision']]
5016 fetch_info = revision_info['fetch']['http']
5017 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5018 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005019
Aaron Gablea718c3e2017-08-28 17:47:28 -07005020 cmd = ['git', 'diff']
5021 if options.stat:
5022 cmd.append('--stat')
5023 cmd.append(base)
5024 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005025
5026 return 0
5027
5028
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005029@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005030def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005031 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005032 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005033 '--ignore-current',
5034 action='store_true',
5035 help='Ignore the CL\'s current reviewers and start from scratch.')
5036 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005037 '--ignore-self',
5038 action='store_true',
5039 help='Do not consider CL\'s author as an owners.')
5040 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005041 '--no-color',
5042 action='store_true',
5043 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005044 parser.add_option(
5045 '--batch',
5046 action='store_true',
5047 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005048 # TODO: Consider moving this to another command, since other
5049 # git-cl owners commands deal with owners for a given CL.
5050 parser.add_option(
5051 '--show-all',
5052 action='store_true',
5053 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005054 options, args = parser.parse_args(args)
5055
5056 author = RunGit(['config', 'user.email']).strip() or None
5057
Edward Lemur934836a2019-09-09 20:16:54 +00005058 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005059
Yang Guo6e269a02019-06-26 11:17:02 +00005060 if options.show_all:
5061 for arg in args:
5062 base_branch = cl.GetCommonAncestorWithUpstream()
5063 change = cl.GetChange(base_branch, None)
5064 database = owners.Database(change.RepositoryRoot(), file, os.path)
5065 database.load_data_needed_for([arg])
5066 print('Owners for %s:' % arg)
5067 for owner in sorted(database.all_possible_owners([arg], None)):
5068 print(' - %s' % owner)
5069 return 0
5070
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005071 if args:
5072 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005073 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005074 base_branch = args[0]
5075 else:
5076 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005077 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005078
5079 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005080 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5081
5082 if options.batch:
5083 db = owners.Database(change.RepositoryRoot(), file, os.path)
5084 print('\n'.join(db.reviewers_for(affected_files, author)))
5085 return 0
5086
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005087 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005088 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005089 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005090 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005091 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005092 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005093 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005094 override_files=change.OriginalOwnersFiles(),
5095 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005096
5097
Aiden Bennerc08566e2018-10-03 17:52:42 +00005098def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005099 """Generates a diff command."""
5100 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005101 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5102
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005103 if allow_prefix:
5104 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5105 # case that diff.noprefix is set in the user's git config.
5106 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5107 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005108 diff_cmd += ['--no-prefix']
5109
5110 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005111
5112 if args:
5113 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005114 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005115 diff_cmd.append(arg)
5116 else:
5117 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005118
5119 return diff_cmd
5120
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005121
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005122def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005123 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005124 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005125
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005126
enne@chromium.org555cfe42014-01-29 18:21:39 +00005127@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005128@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005129def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005130 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005131 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005132 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005133 parser.add_option('--full', action='store_true',
5134 help='Reformat the full content of all touched files')
5135 parser.add_option('--dry-run', action='store_true',
5136 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005137 parser.add_option(
5138 '--python',
5139 action='store_true',
5140 default=None,
5141 help='Enables python formatting on all python files.')
5142 parser.add_option(
5143 '--no-python',
5144 action='store_true',
5145 dest='python',
5146 help='Disables python formatting on all python files. '
5147 'Takes precedence over --python. '
5148 'If neither --python or --no-python are set, python '
5149 'files that have a .style.yapf file in an ancestor '
5150 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005151 parser.add_option('--js', action='store_true',
5152 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005153 parser.add_option('--diff', action='store_true',
5154 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005155 parser.add_option('--presubmit', action='store_true',
5156 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005157 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005158
Daniel Chengc55eecf2016-12-30 03:11:02 -08005159 # Normalize any remaining args against the current path, so paths relative to
5160 # the current directory are still resolved as expected.
5161 args = [os.path.join(os.getcwd(), arg) for arg in args]
5162
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005163 # git diff generates paths against the root of the repository. Change
5164 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005165 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005166 if rel_base_path:
5167 os.chdir(rel_base_path)
5168
digit@chromium.org29e47272013-05-17 17:01:46 +00005169 # Grab the merge-base commit, i.e. the upstream commit of the current
5170 # branch when it was created or the last time it was rebased. This is
5171 # to cover the case where the user may have called "git fetch origin",
5172 # moving the origin branch to a newer commit, but hasn't rebased yet.
5173 upstream_commit = None
5174 cl = Changelist()
5175 upstream_branch = cl.GetUpstreamBranch()
5176 if upstream_branch:
5177 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5178 upstream_commit = upstream_commit.strip()
5179
5180 if not upstream_commit:
5181 DieWithError('Could not find base commit for this branch. '
5182 'Are you in detached state?')
5183
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005184 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5185 diff_output = RunGit(changed_files_cmd)
5186 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005187 # Filter out files deleted by this CL
5188 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005189
Christopher Lamc5ba6922017-01-24 11:19:14 +11005190 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005191 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005192
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005193 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5194 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5195 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005196 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005197
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005198 top_dir = os.path.normpath(
5199 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5200
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005201 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5202 # formatted. This is used to block during the presubmit.
5203 return_value = 0
5204
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005205 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005206 # Locate the clang-format binary in the checkout
5207 try:
5208 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005209 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005210 DieWithError(e)
5211
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005212 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213 cmd = [clang_format_tool]
5214 if not opts.dry_run and not opts.diff:
5215 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005216 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005217 if opts.diff:
5218 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005219 else:
5220 env = os.environ.copy()
5221 env['PATH'] = str(os.path.dirname(clang_format_tool))
5222 try:
5223 script = clang_format.FindClangFormatScriptInChromiumTree(
5224 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005225 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005226 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005227
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005228 cmd = [sys.executable, script, '-p0']
5229 if not opts.dry_run and not opts.diff:
5230 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005231
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005232 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5233 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005234
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005235 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5236 if opts.diff:
5237 sys.stdout.write(stdout)
5238 if opts.dry_run and len(stdout) > 0:
5239 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005240
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005241 # Similar code to above, but using yapf on .py files rather than clang-format
5242 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005243 py_explicitly_disabled = opts.python is not None and not opts.python
5244 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005245 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5246 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5247 if sys.platform.startswith('win'):
5248 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005249
Aiden Bennerc08566e2018-10-03 17:52:42 +00005250 # If we couldn't find a yapf file we'll default to the chromium style
5251 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005252 chromium_default_yapf_style = os.path.join(depot_tools_path,
5253 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005254 # Used for caching.
5255 yapf_configs = {}
5256 for f in python_diff_files:
5257 # Find the yapf style config for the current file, defaults to depot
5258 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005259 _FindYapfConfigFile(f, yapf_configs, top_dir)
5260
5261 # Turn on python formatting by default if a yapf config is specified.
5262 # This breaks in the case of this repo though since the specified
5263 # style file is also the global default.
5264 if opts.python is None:
5265 filtered_py_files = []
5266 for f in python_diff_files:
5267 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5268 filtered_py_files.append(f)
5269 else:
5270 filtered_py_files = python_diff_files
5271
5272 # Note: yapf still seems to fix indentation of the entire file
5273 # even if line ranges are specified.
5274 # See https://github.com/google/yapf/issues/499
5275 if not opts.full and filtered_py_files:
5276 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5277
5278 for f in filtered_py_files:
5279 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5280 if yapf_config is None:
5281 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005282
5283 cmd = [yapf_tool, '--style', yapf_config, f]
5284
5285 has_formattable_lines = False
5286 if not opts.full:
5287 # Only run yapf over changed line ranges.
5288 for diff_start, diff_len in py_line_diffs[f]:
5289 diff_end = diff_start + diff_len - 1
5290 # Yapf errors out if diff_end < diff_start but this
5291 # is a valid line range diff for a removal.
5292 if diff_end >= diff_start:
5293 has_formattable_lines = True
5294 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5295 # If all line diffs were removals we have nothing to format.
5296 if not has_formattable_lines:
5297 continue
5298
5299 if opts.diff or opts.dry_run:
5300 cmd += ['--diff']
5301 # Will return non-zero exit code if non-empty diff.
5302 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5303 if opts.diff:
5304 sys.stdout.write(stdout)
5305 elif len(stdout) > 0:
5306 return_value = 2
5307 else:
5308 cmd += ['-i']
5309 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005310
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005311 # Dart's formatter does not have the nice property of only operating on
5312 # modified chunks, so hard code full.
5313 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005314 try:
5315 command = [dart_format.FindDartFmtToolInChromiumTree()]
5316 if not opts.dry_run and not opts.diff:
5317 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005318 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005319
ppi@chromium.org6593d932016-03-03 15:41:15 +00005320 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005321 if opts.dry_run and stdout:
5322 return_value = 2
5323 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005324 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5325 'found in this checkout. Files in other languages are still '
5326 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005327
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005328 # Format GN build files. Always run on full build files for canonical form.
5329 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005330 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005331 if opts.dry_run or opts.diff:
5332 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005333 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005334 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5335 shell=sys.platform == 'win32',
5336 cwd=top_dir)
5337 if opts.dry_run and gn_ret == 2:
5338 return_value = 2 # Not formatted.
5339 elif opts.diff and gn_ret == 2:
5340 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005341 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005342 elif gn_ret != 0:
5343 # For non-dry run cases (and non-2 return values for dry-run), a
5344 # nonzero error code indicates a failure, probably because the file
5345 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005346 DieWithError('gn format failed on ' + gn_diff_file +
5347 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005348
Ilya Shermane081cbe2017-08-15 17:51:04 -07005349 # Skip the metrics formatting from the global presubmit hook. These files have
5350 # a separate presubmit hook that issues an error if the files need formatting,
5351 # whereas the top-level presubmit script merely issues a warning. Formatting
5352 # these files is somewhat slow, so it's important not to duplicate the work.
5353 if not opts.presubmit:
5354 for xml_dir in GetDirtyMetricsDirs(diff_files):
5355 tool_dir = os.path.join(top_dir, xml_dir)
5356 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5357 if opts.dry_run or opts.diff:
5358 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005359 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005360 if opts.diff:
5361 sys.stdout.write(stdout)
5362 if opts.dry_run and stdout:
5363 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005364
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005365 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005366
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005367
Steven Holte2e664bf2017-04-21 13:10:47 -07005368def GetDirtyMetricsDirs(diff_files):
5369 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5370 metrics_xml_dirs = [
5371 os.path.join('tools', 'metrics', 'actions'),
5372 os.path.join('tools', 'metrics', 'histograms'),
5373 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005374 os.path.join('tools', 'metrics', 'ukm'),
5375 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005376 for xml_dir in metrics_xml_dirs:
5377 if any(file.startswith(xml_dir) for file in xml_diff_files):
5378 yield xml_dir
5379
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005380
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005381@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005382@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005383def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005384 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005385 _, args = parser.parse_args(args)
5386
5387 if len(args) != 1:
5388 parser.print_help()
5389 return 1
5390
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005391 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005392 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005393 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005394
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005395 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005396
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005397 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005398 output = RunGit(['config', '--local', '--get-regexp',
5399 r'branch\..*\.%s' % issueprefix],
5400 error_ok=True)
5401 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005402 if issue == target_issue:
5403 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005404
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005405 branches = []
5406 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005407 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005408 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005409 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005410 return 1
5411 if len(branches) == 1:
5412 RunGit(['checkout', branches[0]])
5413 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005414 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005415 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005416 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005417 which = raw_input('Choose by index: ')
5418 try:
5419 RunGit(['checkout', branches[int(which)]])
5420 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005421 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005422 return 1
5423
5424 return 0
5425
5426
maruel@chromium.org29404b52014-09-08 22:58:00 +00005427def CMDlol(parser, args):
5428 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005429 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005430 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5431 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5432 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005433 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005434 return 0
5435
5436
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005437class OptionParser(optparse.OptionParser):
5438 """Creates the option parse and add --verbose support."""
5439 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005440 optparse.OptionParser.__init__(
5441 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005442 self.add_option(
5443 '-v', '--verbose', action='count', default=0,
5444 help='Use 2 times for more debugging info')
5445
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005446 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005447 try:
5448 return self._parse_args(args)
5449 finally:
5450 # Regardless of success or failure of args parsing, we want to report
5451 # metrics, but only after logging has been initialized (if parsing
5452 # succeeded).
5453 global settings
5454 settings = Settings()
5455
5456 if not metrics.DISABLE_METRICS_COLLECTION:
5457 # GetViewVCUrl ultimately calls logging method.
5458 project_url = settings.GetViewVCUrl().strip('/+')
5459 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5460 metrics.collector.add('project_urls', [project_url])
5461
5462 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005463 # Create an optparse.Values object that will store only the actual passed
5464 # options, without the defaults.
5465 actual_options = optparse.Values()
5466 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5467 # Create an optparse.Values object with the default options.
5468 options = optparse.Values(self.get_default_values().__dict__)
5469 # Update it with the options passed by the user.
5470 options._update_careful(actual_options.__dict__)
5471 # Store the options passed by the user in an _actual_options attribute.
5472 # We store only the keys, and not the values, since the values can contain
5473 # arbitrary information, which might be PII.
5474 metrics.collector.add('arguments', actual_options.__dict__.keys())
5475
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005476 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005477 logging.basicConfig(
5478 level=levels[min(options.verbose, len(levels) - 1)],
5479 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5480 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005481
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005482 return options, args
5483
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005484
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005485def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005486 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005487 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005488 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005489 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005490
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005491 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005492 dispatcher = subcommand.CommandDispatcher(__name__)
5493 try:
5494 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005495 except auth.AuthenticationError as e:
5496 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005497 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005498 if e.code != 500:
5499 raise
5500 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005501 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005502 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005503 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005504
5505
5506if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005507 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5508 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005509 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005510 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005511 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005512 sys.exit(main(sys.argv[1:]))