blob: c8c02e0c6bde6e99434f298f676c62d3b029f561 [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 Lemurd4d1ba42019-09-20 21:46:37 +0000458 gerrit_changes = [changelist.GetGerritChange()]
459 shared_properties = {
460 'category': options.category,
461 }
462 if options.clobber:
463 shared_properties['clobber'] = True
464 shared_properties.update(_get_properties_from_options(options) or {})
465
466 requests = []
467 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
468 project, bucket = _parse_bucket(raw_bucket)
469 if not project or not bucket:
470 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
471 continue
472
473 for builder, tests in sorted(builders_and_tests.iteritems()):
474 properties = shared_properties.copy()
475 if 'presubmit' in builder.lower():
476 properties['dry_run'] = 'true'
477 if tests:
478 properties['testfilter'] = tests
479
480 requests.append({
481 'scheduleBuild': {
482 'requestId': str(uuid.uuid4()),
483 'builder': {
484 'project': options.project or project,
485 'bucket': bucket,
486 'builder': builder,
487 },
488 'gerritChanges': gerrit_changes,
489 'properties': properties,
490 'tags': [
491 {'key': 'builder', 'value': builder},
492 {'key': 'user_agent', 'value': 'git_cl_try'},
493 ],
494 }
495 })
496
497 if not requests:
498 return
499
500 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000501 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000502
Edward Lemur2c210a42019-09-16 23:58:35 +0000503 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
504 http = authenticator.authorize(httplib2.Http())
505 http.force_exception_to_status_code = True
506
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000507 batch_request = {'requests': requests}
508 batch_response = _call_buildbucket(
Edward Lemur4c707a22019-09-24 21:13:43 +0000509 http, options.buildbucket_host, 'Batch', batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000510
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000511 errors = [
512 ' ' + response['error']['message']
513 for response in batch_response.get('responses', [])
514 if 'error' in response
515 ]
516 if errors:
517 raise BuildbucketResponseException(
518 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000519
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000520
tandrii221ab252016-10-06 08:12:04 -0700521def fetch_try_jobs(auth_config, changelist, buildbucket_host,
522 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000523 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000524
qyearsley53f48a12016-09-01 10:45:13 -0700525 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526 """
tandrii221ab252016-10-06 08:12:04 -0700527 assert buildbucket_host
528 assert changelist.GetIssue(), 'CL must be uploaded first'
529 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
530 patchset = patchset or changelist.GetMostRecentPatchset()
531 assert patchset, 'CL must be uploaded first'
532
533 codereview_url = changelist.GetCodereviewServer()
534 codereview_host = urlparse.urlparse(codereview_url).hostname
535 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536 if authenticator.has_cached_credentials():
537 http = authenticator.authorize(httplib2.Http())
538 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700539 print('Warning: Some results might be missing because %s' %
540 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000541 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000542 http = httplib2.Http()
543
544 http.force_exception_to_status_code = True
545
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000546 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700547 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700549 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 params = {'tag': 'buildset:%s' % buildset}
551
552 builds = {}
553 while True:
554 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700555 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000557 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 for build in content.get('builds', []):
559 builds[build['id']] = build
560 if 'next_cursor' in content:
561 params['start_cursor'] = content['next_cursor']
562 else:
563 break
564 return builds
565
566
qyearsleyeab3c042016-08-24 09:18:28 -0700567def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 """Prints nicely result of fetch_try_jobs."""
569 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000570 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 return
572
573 # Make a copy, because we'll be modifying builds dictionary.
574 builds = builds.copy()
575 builder_names_cache = {}
576
577 def get_builder(b):
578 try:
579 return builder_names_cache[b['id']]
580 except KeyError:
581 try:
582 parameters = json.loads(b['parameters_json'])
583 name = parameters['builder_name']
584 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700585 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700586 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587 name = None
588 builder_names_cache[b['id']] = name
589 return name
590
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 if options.print_master:
592 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000593 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 max(len(str(get_builder(b))) for b in builds.itervalues()))
595 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000596 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597 else:
598 name_fmt = '%%-%ds' % (
599 max(len(str(get_builder(b))) for b in builds.itervalues()))
600 def get_name(b):
601 return name_fmt % get_builder(b)
602
603 def sort_key(b):
604 return b['status'], b.get('result'), get_name(b), b.get('url')
605
606 def pop(title, f, color=None, **kwargs):
607 """Pop matching builds from `builds` dict and print them."""
608
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000609 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000610 colorize = str
611 else:
612 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
613
614 result = []
615 for b in builds.values():
616 if all(b.get(k) == v for k, v in kwargs.iteritems()):
617 builds.pop(b['id'])
618 result.append(b)
619 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700620 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700622 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000623
624 total = len(builds)
625 pop(status='COMPLETED', result='SUCCESS',
626 title='Successes:', color=Fore.GREEN,
627 f=lambda b: (get_name(b), b.get('url')))
628 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
629 title='Infra Failures:', color=Fore.MAGENTA,
630 f=lambda b: (get_name(b), b.get('url')))
631 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
632 title='Failures:', color=Fore.RED,
633 f=lambda b: (get_name(b), b.get('url')))
634 pop(status='COMPLETED', result='CANCELED',
635 title='Canceled:', color=Fore.MAGENTA,
636 f=lambda b: (get_name(b),))
637 pop(status='COMPLETED', result='FAILURE',
638 failure_reason='INVALID_BUILD_DEFINITION',
639 title='Wrong master/builder name:', color=Fore.MAGENTA,
640 f=lambda b: (get_name(b),))
641 pop(status='COMPLETED', result='FAILURE',
642 title='Other failures:',
643 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
644 pop(status='COMPLETED',
645 title='Other finished:',
646 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
647 pop(status='STARTED',
648 title='Started:', color=Fore.YELLOW,
649 f=lambda b: (get_name(b), b.get('url')))
650 pop(status='SCHEDULED',
651 title='Scheduled:',
652 f=lambda b: (get_name(b), 'id=%s' % b['id']))
653 # The last section is just in case buildbucket API changes OR there is a bug.
654 pop(title='Other:',
655 f=lambda b: (get_name(b), 'id=%s' % b['id']))
656 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000657 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000658
659
Aiden Bennerc08566e2018-10-03 17:52:42 +0000660def _ComputeDiffLineRanges(files, upstream_commit):
661 """Gets the changed line ranges for each file since upstream_commit.
662
663 Parses a git diff on provided files and returns a dict that maps a file name
664 to an ordered list of range tuples in the form (start_line, count).
665 Ranges are in the same format as a git diff.
666 """
667 # If files is empty then diff_output will be a full diff.
668 if len(files) == 0:
669 return {}
670
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000671 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000672 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
673 diff_output = RunGit(diff_cmd)
674
675 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
676 # 2 capture groups
677 # 0 == fname of diff file
678 # 1 == 'diff_start,diff_count' or 'diff_start'
679 # will match each of
680 # diff --git a/foo.foo b/foo.py
681 # @@ -12,2 +14,3 @@
682 # @@ -12,2 +17 @@
683 # running re.findall on the above string with pattern will give
684 # [('foo.py', ''), ('', '14,3'), ('', '17')]
685
686 curr_file = None
687 line_diffs = {}
688 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
689 if match[0] != '':
690 # Will match the second filename in diff --git a/a.py b/b.py.
691 curr_file = match[0]
692 line_diffs[curr_file] = []
693 else:
694 # Matches +14,3
695 if ',' in match[1]:
696 diff_start, diff_count = match[1].split(',')
697 else:
698 # Single line changes are of the form +12 instead of +12,1.
699 diff_start = match[1]
700 diff_count = 1
701
702 diff_start = int(diff_start)
703 diff_count = int(diff_count)
704
705 # If diff_count == 0 this is a removal we can ignore.
706 line_diffs[curr_file].append((diff_start, diff_count))
707
708 return line_diffs
709
710
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000711def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000712 """Checks if a yapf file is in any parent directory of fpath until top_dir.
713
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000714 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000715 is found returns None. Uses yapf_config_cache as a cache for previously found
716 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000717 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000718 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000719 # Return result if we've already computed it.
720 if fpath in yapf_config_cache:
721 return yapf_config_cache[fpath]
722
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000723 parent_dir = os.path.dirname(fpath)
724 if os.path.isfile(fpath):
725 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000726 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000727 # Otherwise fpath is a directory
728 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
729 if os.path.isfile(yapf_file):
730 ret = yapf_file
731 elif fpath == top_dir or parent_dir == fpath:
732 # If we're at the top level directory, or if we're at root
733 # there is no provided style.
734 ret = None
735 else:
736 # Otherwise recurse on the current directory.
737 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000738 yapf_config_cache[fpath] = ret
739 return ret
740
741
qyearsley53f48a12016-09-01 10:45:13 -0700742def write_try_results_json(output_file, builds):
743 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
744
745 The input |builds| dict is assumed to be generated by Buildbucket.
746 Buildbucket documentation: http://goo.gl/G0s101
747 """
748
749 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800750 """Extracts some of the information from one build dict."""
751 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700752 return {
753 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700754 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800755 'builder_name': parameters.get('builder_name'),
756 'created_ts': build.get('created_ts'),
757 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700758 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800759 'result': build.get('result'),
760 'status': build.get('status'),
761 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700762 'url': build.get('url'),
763 }
764
765 converted = []
766 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000767 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700768 write_json(output_file, converted)
769
770
Aaron Gable13101a62018-02-09 13:20:41 -0800771def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000772 """Prints statistics about the change to the user."""
773 # --no-ext-diff is broken in some versions of Git, so try to work around
774 # this by overriding the environment (but there is still a problem if the
775 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000776 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000777 if 'GIT_EXTERNAL_DIFF' in env:
778 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000779
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000780 try:
781 stdout = sys.stdout.fileno()
782 except AttributeError:
783 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000784 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800785 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000786 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000787
788
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000789class BuildbucketResponseException(Exception):
790 pass
791
792
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793class Settings(object):
794 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 self.tree_status_url = None
798 self.viewvc_url = None
799 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000800 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000801 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000802 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000803 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804
805 def LazyUpdateIfNeeded(self):
806 """Updates the settings from a codereview.settings file, if available."""
807 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000808 # The only value that actually changes the behavior is
809 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000810 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000811 error_ok=True
812 ).strip().lower()
813
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000815 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816 LoadCodereviewSettingsFromFile(cr_settings_file)
817 self.updated = True
818
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000819 @staticmethod
820 def GetRelativeRoot():
821 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000822
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000823 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000824 if self.root is None:
825 self.root = os.path.abspath(self.GetRelativeRoot())
826 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000832 self.tree_status_url = self._GetConfig(
833 'rietveld.tree-status-url', error_ok=error_ok,
834 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 return self.tree_status_url
836
837 def GetViewVCUrl(self):
838 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000839 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840 return self.viewvc_url
841
rmistry@google.com90752582014-01-14 21:04:50 +0000842 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000843 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844
rmistry@google.com5626a922015-02-26 14:03:30 +0000845 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000846 run_post_upload_hook = self._GetConfig(
847 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000848 return run_post_upload_hook == "True"
849
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000850 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000851 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000852
ukai@chromium.orge8077812012-02-03 03:41:46 +0000853 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000854 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000855 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700856 self.is_gerrit = (
857 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000858 return self.is_gerrit
859
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000860 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000861 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000862 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700863 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
864 if self.squash_gerrit_uploads is None:
865 # Default is squash now (http://crbug.com/611892#c23).
866 self.squash_gerrit_uploads = not (
867 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
868 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000869 return self.squash_gerrit_uploads
870
tandriia60502f2016-06-20 02:01:53 -0700871 def GetSquashGerritUploadsOverride(self):
872 """Return True or False if codereview.settings should be overridden.
873
874 Returns None if no override has been defined.
875 """
876 # See also http://crbug.com/611892#c23
877 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
878 error_ok=True).strip()
879 if result == 'true':
880 return True
881 if result == 'false':
882 return False
883 return None
884
tandrii@chromium.org28253532016-04-14 13:46:56 +0000885 def GetGerritSkipEnsureAuthenticated(self):
886 """Return True if EnsureAuthenticated should not be done for Gerrit
887 uploads."""
888 if self.gerrit_skip_ensure_authenticated is None:
889 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000890 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000891 error_ok=True).strip() == 'true')
892 return self.gerrit_skip_ensure_authenticated
893
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000894 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000895 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000896 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000897 # Git requires single quotes for paths with spaces. We need to replace
898 # them with double quotes for Windows to treat such paths as a single
899 # path.
900 self.git_editor = self._GetConfig(
901 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000902 return self.git_editor or None
903
thestig@chromium.org44202a22014-03-11 19:22:18 +0000904 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000905 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000906 DEFAULT_LINT_REGEX)
907
908 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000909 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000910 DEFAULT_LINT_IGNORE_REGEX)
911
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000912 def _GetConfig(self, param, **kwargs):
913 self.LazyUpdateIfNeeded()
914 return RunGit(['config', param], **kwargs).strip()
915
916
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000917def ShortBranchName(branch):
918 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000919 return branch.replace('refs/heads/', '', 1)
920
921
922def GetCurrentBranchRef():
923 """Returns branch ref (e.g., refs/heads/master) or None."""
924 return RunGit(['symbolic-ref', 'HEAD'],
925 stderr=subprocess2.VOID, error_ok=True).strip() or None
926
927
928def GetCurrentBranch():
929 """Returns current branch or None.
930
931 For refs/heads/* branches, returns just last part. For others, full ref.
932 """
933 branchref = GetCurrentBranchRef()
934 if branchref:
935 return ShortBranchName(branchref)
936 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000937
938
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000939class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000940 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000941 NONE = 'none'
942 DRY_RUN = 'dry_run'
943 COMMIT = 'commit'
944
945 ALL_STATES = [NONE, DRY_RUN, COMMIT]
946
947
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000948class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000949 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 self.issue = issue
951 self.patchset = patchset
952 self.hostname = hostname
953
954 @property
955 def valid(self):
956 return self.issue is not None
957
958
Edward Lemurf38bc172019-09-03 21:02:13 +0000959def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000960 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
961 fail_result = _ParsedIssueNumberArgument()
962
963 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000964 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000965 if not arg.startswith('http'):
966 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700967
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000968 url = gclient_utils.UpgradeToHttps(arg)
969 try:
970 parsed_url = urlparse.urlparse(url)
971 except ValueError:
972 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200973
Edward Lemur125d60a2019-09-13 18:25:41 +0000974 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000975
976
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000977def _create_description_from_log(args):
978 """Pulls out the commit log to use as a base for the CL description."""
979 log_args = []
980 if len(args) == 1 and not args[0].endswith('.'):
981 log_args = [args[0] + '..']
982 elif len(args) == 1 and args[0].endswith('...'):
983 log_args = [args[0][:-1]]
984 elif len(args) == 2:
985 log_args = [args[0] + '..' + args[1]]
986 else:
987 log_args = args[:] # Hope for the best!
988 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
989
990
Aaron Gablea45ee112016-11-22 15:14:38 -0800991class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700992 def __init__(self, issue, url):
993 self.issue = issue
994 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800995 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700996
997 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800998 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700999 self.issue, self.url)
1000
1001
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001002_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001003 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001004 # TODO(tandrii): these two aren't known in Gerrit.
1005 'approval', 'disapproval'])
1006
1007
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001009 """Changelist works with one changelist in local branch.
1010
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001011 Notes:
1012 * Not safe for concurrent multi-{thread,process} use.
1013 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001014 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001015 """
1016
Edward Lemur125d60a2019-09-13 18:25:41 +00001017 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """Create a new ChangeList instance.
1019
Edward Lemurf38bc172019-09-03 21:02:13 +00001020 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001021 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001022 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001023 global settings
1024 if not settings:
1025 # Happens when git_cl.py is used as a utility library.
1026 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001027
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028 self.branchref = branchref
1029 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001030 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.branch = ShortBranchName(self.branchref)
1032 else:
1033 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001035 self.lookedup_issue = False
1036 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.has_description = False
1038 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001039 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001041 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001042 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001043 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001044 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001045
Edward Lemur125d60a2019-09-13 18:25:41 +00001046 # Lazily cached values.
1047 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1048 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1049 # Map from change number (issue) to its detail cache.
1050 self._detail_cache = {}
1051
1052 if codereview_host is not None:
1053 assert not codereview_host.startswith('https://'), codereview_host
1054 self._gerrit_host = codereview_host
1055 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001056
1057 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001058 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001059
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001060 The return value is a string suitable for passing to git cl with the --cc
1061 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001062 """
1063 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001064 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001065 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001066 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1067 return self.cc
1068
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001069 def GetCCListWithoutDefault(self):
1070 """Return the users cc'd on this CL excluding default ones."""
1071 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001072 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001073 return self.cc
1074
Daniel Cheng7227d212017-11-17 08:12:37 -08001075 def ExtendCC(self, more_cc):
1076 """Extends the list of users to cc on this CL based on the changed files."""
1077 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001078
1079 def GetBranch(self):
1080 """Returns the short branch name, e.g. 'master'."""
1081 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001082 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001083 if not branchref:
1084 return None
1085 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001086 self.branch = ShortBranchName(self.branchref)
1087 return self.branch
1088
1089 def GetBranchRef(self):
1090 """Returns the full branch name, e.g. 'refs/heads/master'."""
1091 self.GetBranch() # Poke the lazy loader.
1092 return self.branchref
1093
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001094 def ClearBranch(self):
1095 """Clears cached branch data of this object."""
1096 self.branch = self.branchref = None
1097
tandrii5d48c322016-08-18 16:19:37 -07001098 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1099 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1100 kwargs['branch'] = self.GetBranch()
1101 return _git_get_branch_config_value(key, default, **kwargs)
1102
1103 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1104 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1105 assert self.GetBranch(), (
1106 'this CL must have an associated branch to %sset %s%s' %
1107 ('un' if value is None else '',
1108 key,
1109 '' if value is None else ' to %r' % value))
1110 kwargs['branch'] = self.GetBranch()
1111 return _git_set_branch_config_value(key, value, **kwargs)
1112
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001113 @staticmethod
1114 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001115 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 e.g. 'origin', 'refs/heads/master'
1117 """
1118 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001119 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1120
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001122 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001124 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1125 error_ok=True).strip()
1126 if upstream_branch:
1127 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001129 # Else, try to guess the origin remote.
1130 remote_branches = RunGit(['branch', '-r']).split()
1131 if 'origin/master' in remote_branches:
1132 # Fall back on origin/master if it exits.
1133 remote = 'origin'
1134 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001136 DieWithError(
1137 'Unable to determine default branch to diff against.\n'
1138 'Either pass complete "git diff"-style arguments, like\n'
1139 ' git cl upload origin/master\n'
1140 'or verify this branch is set up to track another \n'
1141 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142
1143 return remote, upstream_branch
1144
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001145 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001146 upstream_branch = self.GetUpstreamBranch()
1147 if not BranchExists(upstream_branch):
1148 DieWithError('The upstream for the current branch (%s) does not exist '
1149 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001150 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001151 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 def GetUpstreamBranch(self):
1154 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001156 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001157 upstream_branch = upstream_branch.replace('refs/heads/',
1158 'refs/remotes/%s/' % remote)
1159 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1160 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161 self.upstream_branch = upstream_branch
1162 return self.upstream_branch
1163
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001164 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001165 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 remote, branch = None, self.GetBranch()
1167 seen_branches = set()
1168 while branch not in seen_branches:
1169 seen_branches.add(branch)
1170 remote, branch = self.FetchUpstreamTuple(branch)
1171 branch = ShortBranchName(branch)
1172 if remote != '.' or branch.startswith('refs/remotes'):
1173 break
1174 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 remotes = RunGit(['remote'], error_ok=True).split()
1176 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001177 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001180 logging.warn('Could not determine which remote this change is '
1181 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 else:
1183 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001184 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 branch = 'HEAD'
1186 if branch.startswith('refs/remotes'):
1187 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001188 elif branch.startswith('refs/branch-heads/'):
1189 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001190 else:
1191 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001192 return self._remote
1193
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001194 def GitSanityChecks(self, upstream_git_obj):
1195 """Checks git repo status and ensures diff is from local commits."""
1196
sbc@chromium.org79706062015-01-14 21:18:12 +00001197 if upstream_git_obj is None:
1198 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001199 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001200 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001201 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001202 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001203 return False
1204
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001205 # Verify the commit we're diffing against is in our current branch.
1206 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1207 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1208 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001209 print('ERROR: %s is not in the current branch. You may need to rebase '
1210 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001211 return False
1212
1213 # List the commits inside the diff, and verify they are all local.
1214 commits_in_diff = RunGit(
1215 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1216 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1217 remote_branch = remote_branch.strip()
1218 if code != 0:
1219 _, remote_branch = self.GetRemoteBranch()
1220
1221 commits_in_remote = RunGit(
1222 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1223
1224 common_commits = set(commits_in_diff) & set(commits_in_remote)
1225 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001226 print('ERROR: Your diff contains %d commits already in %s.\n'
1227 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1228 'the diff. If you are using a custom git flow, you can override'
1229 ' the reference used for this check with "git config '
1230 'gitcl.remotebranch <git-ref>".' % (
1231 len(common_commits), remote_branch, upstream_git_obj),
1232 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001233 return False
1234 return True
1235
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001236 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001237 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001238
1239 Returns None if it is not set.
1240 """
tandrii5d48c322016-08-18 16:19:37 -07001241 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001242
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001243 def GetRemoteUrl(self):
1244 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1245
1246 Returns None if there is no remote.
1247 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001248 is_cached, value = self._cached_remote_url
1249 if is_cached:
1250 return value
1251
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001252 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001253 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1254
Edward Lemur298f2cf2019-02-22 21:40:39 +00001255 # Check if the remote url can be parsed as an URL.
1256 host = urlparse.urlparse(url).netloc
1257 if host:
1258 self._cached_remote_url = (True, url)
1259 return url
1260
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001261 # If it cannot be parsed as an url, assume it is a local directory,
1262 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001263 logging.warning('"%s" doesn\'t appear to point to a git host. '
1264 'Interpreting it as a local directory.', url)
1265 if not os.path.isdir(url):
1266 logging.error(
1267 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001268 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001269 return None
1270
1271 cache_path = url
1272 url = RunGit(['config', 'remote.%s.url' % remote],
1273 error_ok=True,
1274 cwd=url).strip()
1275
1276 host = urlparse.urlparse(url).netloc
1277 if not host:
1278 logging.error(
1279 'Remote "%(remote)s" for branch "%(branch)s" points to '
1280 '"%(cache_path)s", but it is misconfigured.\n'
1281 '"%(cache_path)s" must be a git repo and must have a remote named '
1282 '"%(remote)s" pointing to the git host.', {
1283 'remote': remote,
1284 'cache_path': cache_path,
1285 'branch': self.GetBranch()})
1286 return None
1287
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001288 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001289 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001291 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001292 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001293 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001294 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001295 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001296 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 return self.issue
1298
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 def GetIssueURL(self):
1300 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001301 issue = self.GetIssue()
1302 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001303 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001304 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001306 def GetDescription(self, pretty=False, force=False):
1307 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001309 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310 self.has_description = True
1311 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001312 # Set width to 72 columns + 2 space indent.
1313 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001315 lines = self.description.splitlines()
1316 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001317 return self.description
1318
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001319 def GetDescriptionFooters(self):
1320 """Returns (non_footer_lines, footers) for the commit message.
1321
1322 Returns:
1323 non_footer_lines (list(str)) - Simple list of description lines without
1324 any footer. The lines do not contain newlines, nor does the list contain
1325 the empty line between the message and the footers.
1326 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1327 [("Change-Id", "Ideadbeef...."), ...]
1328 """
1329 raw_description = self.GetDescription()
1330 msg_lines, _, footers = git_footers.split_footers(raw_description)
1331 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001332 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001333 return msg_lines, footers
1334
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001335 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001336 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001337 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001338 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001339 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001341 return self.patchset
1342
1343 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001344 """Set this branch's patchset. If patchset=0, clears the patchset."""
1345 assert self.GetBranch()
1346 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001347 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001348 else:
1349 self.patchset = int(patchset)
1350 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001351 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001352
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001353 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001354 """Set this branch's issue. If issue isn't given, clears the issue."""
1355 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001356 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001357 issue = int(issue)
1358 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001359 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001360 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001361 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001362 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001363 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001364 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001365 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001366 else:
tandrii5d48c322016-08-18 16:19:37 -07001367 # Reset all of these just to be clean.
1368 reset_suffixes = [
1369 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001370 self.IssueConfigKey(),
1371 self.PatchsetConfigKey(),
1372 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001373 ] + self._PostUnsetIssueProperties()
1374 for prop in reset_suffixes:
1375 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001376 msg = RunGit(['log', '-1', '--format=%B']).strip()
1377 if msg and git_footers.get_footer_change_id(msg):
1378 print('WARNING: The change patched into this branch has a Change-Id. '
1379 'Removing it.')
1380 RunGit(['commit', '--amend', '-m',
1381 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001382 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001383 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001384 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385
dnjba1b0f32016-09-02 12:37:42 -07001386 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001387 if not self.GitSanityChecks(upstream_branch):
1388 DieWithError('\nGit sanity check failure')
1389
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001390 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001391 if not root:
1392 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001393 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001394
1395 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001396 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001397 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001398 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001399 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001400 except subprocess2.CalledProcessError:
1401 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001402 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001403 'This branch probably doesn\'t exist anymore. To reset the\n'
1404 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001405 ' git branch --set-upstream-to origin/master %s\n'
1406 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001407 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001408
maruel@chromium.org52424302012-08-29 15:14:30 +00001409 issue = self.GetIssue()
1410 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001411 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001412 description = self.GetDescription()
1413 else:
1414 # If the change was never uploaded, use the log messages of all commits
1415 # up to the branch point, as git cl upload will prefill the description
1416 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001417 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1418 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001419
1420 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001421 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001422 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001423 name,
1424 description,
1425 absroot,
1426 files,
1427 issue,
1428 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001429 author,
1430 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001431
dsansomee2d6fd92016-09-08 00:10:47 -07001432 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001433 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001434 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001435 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001436
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001437 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1438 """Sets the description for this CL remotely.
1439
1440 You can get description_lines and footers with GetDescriptionFooters.
1441
1442 Args:
1443 description_lines (list(str)) - List of CL description lines without
1444 newline characters.
1445 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1446 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1447 `List-Of-Tokens`). It will be case-normalized so that each token is
1448 title-cased.
1449 """
1450 new_description = '\n'.join(description_lines)
1451 if footers:
1452 new_description += '\n'
1453 for k, v in footers:
1454 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1455 if not git_footers.FOOTER_PATTERN.match(foot):
1456 raise ValueError('Invalid footer %r' % foot)
1457 new_description += foot + '\n'
1458 self.UpdateDescription(new_description, force)
1459
Edward Lesmes8e282792018-04-03 18:50:29 -04001460 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001461 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1462 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001463 start = time_time()
1464 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001465 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1466 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001467 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001468 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001469 metrics.collector.add_repeated('sub_commands', {
1470 'command': 'presubmit',
1471 'execution_time': time_time() - start,
1472 'exit_code': 0 if result.should_continue() else 1,
1473 })
1474 return result
vapierfd77ac72016-06-16 08:33:57 -07001475 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001476 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001477
Edward Lemurf38bc172019-09-03 21:02:13 +00001478 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001479 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001480 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1481 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001482 else:
1483 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001484 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001485 urlparse.urlparse(issue_arg))
1486 if not parsed_issue_arg or not parsed_issue_arg.valid:
1487 DieWithError('Failed to parse issue argument "%s". '
1488 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001489 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001490 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001491
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001492 def CMDUpload(self, options, git_diff_args, orig_args):
1493 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001494 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001495 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001496 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497 else:
1498 if self.GetBranch() is None:
1499 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1500
1501 # Default to diffing against common ancestor of upstream branch
1502 base_branch = self.GetCommonAncestorWithUpstream()
1503 git_diff_args = [base_branch, 'HEAD']
1504
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001505 # Fast best-effort checks to abort before running potentially expensive
1506 # hooks if uploading is likely to fail anyway. Passing these checks does
1507 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001508 self.EnsureAuthenticated(force=options.force)
1509 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001510
1511 # Apply watchlists on upload.
1512 change = self.GetChange(base_branch, None)
1513 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1514 files = [f.LocalPath() for f in change.AffectedFiles()]
1515 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001516 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001517
1518 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001519 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 # Set the reviewer list now so that presubmit checks can access it.
1521 change_description = ChangeDescription(change.FullDescriptionText())
1522 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001523 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001524 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525 change)
1526 change.SetDescriptionText(change_description.description)
1527 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001528 may_prompt=not options.force,
1529 verbose=options.verbose,
1530 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531 if not hook_results.should_continue():
1532 return 1
1533 if not options.reviewers and hook_results.reviewers:
1534 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001535 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536
Aaron Gable13101a62018-02-09 13:20:41 -08001537 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001538 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001540 _git_set_branch_config_value('last-upload-hash',
1541 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001542 # Run post upload hooks, if specified.
1543 if settings.GetRunPostUploadHook():
1544 presubmit_support.DoPostUploadExecuter(
1545 change,
1546 self,
1547 settings.GetRoot(),
1548 options.verbose,
1549 sys.stdout)
1550
1551 # Upload all dependencies if specified.
1552 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001553 print()
1554 print('--dependencies has been specified.')
1555 print('All dependent local branches will be re-uploaded.')
1556 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 # Remove the dependencies flag from args so that we do not end up in a
1558 # loop.
1559 orig_args.remove('--dependencies')
1560 ret = upload_branch_deps(self, orig_args)
1561 return ret
1562
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001563 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001564 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001565
1566 Issue must have been already uploaded and known.
1567 """
1568 assert new_state in _CQState.ALL_STATES
1569 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001571 vote_map = {
1572 _CQState.NONE: 0,
1573 _CQState.DRY_RUN: 1,
1574 _CQState.COMMIT: 2,
1575 }
1576 labels = {'Commit-Queue': vote_map[new_state]}
1577 notify = False if new_state == _CQState.DRY_RUN else None
1578 gerrit_util.SetReview(
1579 self._GetGerritHost(), self._GerritChangeIdentifier(),
1580 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001581 return 0
1582 except KeyboardInterrupt:
1583 raise
1584 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001585 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001586 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001587 ' * Your project has no CQ,\n'
1588 ' * You don\'t have permission to change the CQ state,\n'
1589 ' * There\'s a bug in this code (see stack trace below).\n'
1590 'Consider specifying which bots to trigger manually or asking your '
1591 'project owners for permissions or contacting Chrome Infra at:\n'
1592 'https://www.chromium.org/infra\n\n' %
1593 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001594 # Still raise exception so that stack trace is printed.
1595 raise
1596
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001597 def _GetGerritHost(self):
1598 # Lazy load of configs.
1599 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001600 if self._gerrit_host and '.' not in self._gerrit_host:
1601 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1602 # This happens for internal stuff http://crbug.com/614312.
1603 parsed = urlparse.urlparse(self.GetRemoteUrl())
1604 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001605 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001606 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001607 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1608 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001609 return self._gerrit_host
1610
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001611 def _GetGitHost(self):
1612 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001613 remote_url = self.GetRemoteUrl()
1614 if not remote_url:
1615 return None
1616 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001617
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001618 def GetCodereviewServer(self):
1619 if not self._gerrit_server:
1620 # If we're on a branch then get the server potentially associated
1621 # with that branch.
1622 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001623 self._gerrit_server = self._GitGetBranchConfigValue(
1624 self.CodereviewServerConfigKey())
1625 if self._gerrit_server:
1626 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001627 if not self._gerrit_server:
1628 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1629 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001630 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001631 parts[0] = parts[0] + '-review'
1632 self._gerrit_host = '.'.join(parts)
1633 self._gerrit_server = 'https://%s' % self._gerrit_host
1634 return self._gerrit_server
1635
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001636 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001637 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001638 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001639 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001640 logging.warn('can\'t detect Gerrit project.')
1641 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001642 project = urlparse.urlparse(remote_url).path.strip('/')
1643 if project.endswith('.git'):
1644 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001645 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1646 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1647 # gitiles/git-over-https protocol. E.g.,
1648 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1649 # as
1650 # https://chromium.googlesource.com/v8/v8
1651 if project.startswith('a/'):
1652 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001653 return project
1654
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001655 def _GerritChangeIdentifier(self):
1656 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1657
1658 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001659 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001660 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001661 project = self._GetGerritProject()
1662 if project:
1663 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1664 # Fall back on still unique, but less efficient change number.
1665 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001666
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001667 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001668 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001669 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001670
tandrii5d48c322016-08-18 16:19:37 -07001671 @classmethod
1672 def PatchsetConfigKey(cls):
1673 return 'gerritpatchset'
1674
1675 @classmethod
1676 def CodereviewServerConfigKey(cls):
1677 return 'gerritserver'
1678
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001679 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001680 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001681 if settings.GetGerritSkipEnsureAuthenticated():
1682 # For projects with unusual authentication schemes.
1683 # See http://crbug.com/603378.
1684 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001685
1686 # Check presence of cookies only if using cookies-based auth method.
1687 cookie_auth = gerrit_util.Authenticator.get()
1688 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001689 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001690
Daniel Chengcf6269b2019-05-18 01:02:12 +00001691 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1692 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001693 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001694 return
1695
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001696 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697 self.GetCodereviewServer()
1698 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001699 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001700
1701 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1702 git_auth = cookie_auth.get_auth_header(git_host)
1703 if gerrit_auth and git_auth:
1704 if gerrit_auth == git_auth:
1705 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001706 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001707 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001708 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001709 ' %s\n'
1710 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001711 ' Consider running the following command:\n'
1712 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001713 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001714 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001715 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001716 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001717 cookie_auth.get_new_password_message(git_host)))
1718 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001719 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001720 return
1721 else:
1722 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001723 ([] if gerrit_auth else [self._gerrit_host]) +
1724 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001725 DieWithError('Credentials for the following hosts are required:\n'
1726 ' %s\n'
1727 'These are read from %s (or legacy %s)\n'
1728 '%s' % (
1729 '\n '.join(missing),
1730 cookie_auth.get_gitcookies_path(),
1731 cookie_auth.get_netrc_path(),
1732 cookie_auth.get_new_password_message(git_host)))
1733
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001734 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001735 if not self.GetIssue():
1736 return
1737
1738 # Warm change details cache now to avoid RPCs later, reducing latency for
1739 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001740 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001741 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001742
1743 status = self._GetChangeDetail()['status']
1744 if status in ('MERGED', 'ABANDONED'):
1745 DieWithError('Change %s has been %s, new uploads are not allowed' %
1746 (self.GetIssueURL(),
1747 'submitted' if status == 'MERGED' else 'abandoned'))
1748
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001749 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1750 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1751 # Apparently this check is not very important? Otherwise get_auth_email
1752 # could have been added to other implementations of Authenticator.
1753 cookies_auth = gerrit_util.Authenticator.get()
1754 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001755 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001756
1757 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001758 if self.GetIssueOwner() == cookies_user:
1759 return
1760 logging.debug('change %s owner is %s, cookies user is %s',
1761 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001762 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001763 # so ask what Gerrit thinks of this user.
1764 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1765 if details['email'] == self.GetIssueOwner():
1766 return
1767 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001768 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001769 'as %s.\n'
1770 'Uploading may fail due to lack of permissions.' %
1771 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1772 confirm_or_exit(action='upload')
1773
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001774 def _PostUnsetIssueProperties(self):
1775 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001776 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001777
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001778 def GetGerritObjForPresubmit(self):
1779 return presubmit_support.GerritAccessor(self._GetGerritHost())
1780
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001781 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001782 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 or CQ status, assuming adherence to a common workflow.
1784
1785 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001786 * 'error' - error from review tool (including deleted issues)
1787 * 'unsent' - no reviewers added
1788 * 'waiting' - waiting for review
1789 * 'reply' - waiting for uploader to reply to review
1790 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001791 * 'dry-run' - dry-running in the CQ
1792 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001793 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001794 """
1795 if not self.GetIssue():
1796 return None
1797
1798 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001799 data = self._GetChangeDetail([
1800 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001801 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001802 return 'error'
1803
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001804 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001805 return 'closed'
1806
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001807 cq_label = data['labels'].get('Commit-Queue', {})
1808 max_cq_vote = 0
1809 for vote in cq_label.get('all', []):
1810 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1811 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001813 if max_cq_vote == 1:
1814 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001815
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 if data['labels'].get('Code-Review', {}).get('approved'):
1817 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001818
1819 if not data.get('reviewers', {}).get('REVIEWER', []):
1820 return 'unsent'
1821
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001822 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001823 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1824 last_message_author = messages.pop().get('author', {})
1825 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001826 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1827 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001828 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001829 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001830 if last_message_author.get('_account_id') == owner:
1831 # Most recent message was by owner.
1832 return 'waiting'
1833 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001834 # Some reply from non-owner.
1835 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001836
1837 # Somehow there are no messages even though there are reviewers.
1838 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839
1840 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001841 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001842 patchset = data['revisions'][data['current_revision']]['_number']
1843 self.SetPatchset(patchset)
1844 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001845
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001846 def FetchDescription(self, force=False):
1847 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1848 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001849 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001850 return data['revisions'][current_rev]['commit']['message'].encode(
1851 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001852
dsansomee2d6fd92016-09-08 00:10:47 -07001853 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001854 if gerrit_util.HasPendingChangeEdit(
1855 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001856 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001857 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001858 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001859 'unpublished edit. Either publish the edit in the Gerrit web UI '
1860 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001861
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001862 gerrit_util.DeletePendingChangeEdit(
1863 self._GetGerritHost(), self._GerritChangeIdentifier())
1864 gerrit_util.SetCommitMessage(
1865 self._GetGerritHost(), self._GerritChangeIdentifier(),
1866 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001867
Aaron Gable636b13f2017-07-14 10:42:48 -07001868 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001869 gerrit_util.SetReview(
1870 self._GetGerritHost(), self._GerritChangeIdentifier(),
1871 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001872
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001873 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001874 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001875 # CURRENT_REVISION is included to get the latest patchset so that
1876 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001877 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001878 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1879 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001880 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001881 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001882 robot_file_comments = gerrit_util.GetChangeRobotComments(
1883 self._GetGerritHost(), self._GerritChangeIdentifier())
1884
1885 # Add the robot comments onto the list of comments, but only
1886 # keep those that are from the latest pachset.
1887 latest_patch_set = self.GetMostRecentPatchset()
1888 for path, robot_comments in robot_file_comments.iteritems():
1889 line_comments = file_comments.setdefault(path, [])
1890 line_comments.extend(
1891 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001892
1893 # Build dictionary of file comments for easy access and sorting later.
1894 # {author+date: {path: {patchset: {line: url+message}}}}
1895 comments = collections.defaultdict(
1896 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1897 for path, line_comments in file_comments.iteritems():
1898 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001899 tag = comment.get('tag', '')
1900 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001901 continue
1902 key = (comment['author']['email'], comment['updated'])
1903 if comment.get('side', 'REVISION') == 'PARENT':
1904 patchset = 'Base'
1905 else:
1906 patchset = 'PS%d' % comment['patch_set']
1907 line = comment.get('line', 0)
1908 url = ('https://%s/c/%s/%s/%s#%s%s' %
1909 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1910 'b' if comment.get('side') == 'PARENT' else '',
1911 str(line) if line else ''))
1912 comments[key][path][patchset][line] = (url, comment['message'])
1913
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001914 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001915 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001916 summary = self._BuildCommentSummary(msg, comments, readable)
1917 if summary:
1918 summaries.append(summary)
1919 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001920
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001921 @staticmethod
1922 def _BuildCommentSummary(msg, comments, readable):
1923 key = (msg['author']['email'], msg['date'])
1924 # Don't bother showing autogenerated messages that don't have associated
1925 # file or line comments. this will filter out most autogenerated
1926 # messages, but will keep robot comments like those from Tricium.
1927 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1928 if is_autogenerated and not comments.get(key):
1929 return None
1930 message = msg['message']
1931 # Gerrit spits out nanoseconds.
1932 assert len(msg['date'].split('.')[-1]) == 9
1933 date = datetime.datetime.strptime(msg['date'][:-3],
1934 '%Y-%m-%d %H:%M:%S.%f')
1935 if key in comments:
1936 message += '\n'
1937 for path, patchsets in sorted(comments.get(key, {}).items()):
1938 if readable:
1939 message += '\n%s' % path
1940 for patchset, lines in sorted(patchsets.items()):
1941 for line, (url, content) in sorted(lines.items()):
1942 if line:
1943 line_str = 'Line %d' % line
1944 path_str = '%s:%d:' % (path, line)
1945 else:
1946 line_str = 'File comment'
1947 path_str = '%s:0:' % path
1948 if readable:
1949 message += '\n %s, %s: %s' % (patchset, line_str, url)
1950 message += '\n %s\n' % content
1951 else:
1952 message += '\n%s ' % path_str
1953 message += '\n%s\n' % content
1954
1955 return _CommentSummary(
1956 date=date,
1957 message=message,
1958 sender=msg['author']['email'],
1959 autogenerated=is_autogenerated,
1960 # These could be inferred from the text messages and correlated with
1961 # Code-Review label maximum, however this is not reliable.
1962 # Leaving as is until the need arises.
1963 approval=False,
1964 disapproval=False,
1965 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001966
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001967 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001968 gerrit_util.AbandonChange(
1969 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001970
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001971 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001972 gerrit_util.SubmitChange(
1973 self._GetGerritHost(), self._GerritChangeIdentifier(),
1974 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001975
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001976 def _GetChangeDetail(self, options=None, no_cache=False):
1977 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001978
1979 If fresh data is needed, set no_cache=True which will clear cache and
1980 thus new data will be fetched from Gerrit.
1981 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001982 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001983 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001984
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001985 # Optimization to avoid multiple RPCs:
1986 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1987 'CURRENT_COMMIT' not in options):
1988 options.append('CURRENT_COMMIT')
1989
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001990 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001991 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001992 options = [o.upper() for o in options]
1993
1994 # Check in cache first unless no_cache is True.
1995 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001996 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001997 else:
1998 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001999 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002000 # Assumption: data fetched before with extra options is suitable
2001 # for return for a smaller set of options.
2002 # For example, if we cached data for
2003 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2004 # and request is for options=[CURRENT_REVISION],
2005 # THEN we can return prior cached data.
2006 if options_set.issubset(cached_options_set):
2007 return data
2008
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002009 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002010 data = gerrit_util.GetChangeDetail(
2011 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002012 except gerrit_util.GerritError as e:
2013 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002014 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002015 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002016
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002017 self._detail_cache.setdefault(cache_key, []).append(
2018 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002019 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002020
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002021 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002022 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002023 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002024 data = gerrit_util.GetChangeCommit(
2025 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002026 except gerrit_util.GerritError as e:
2027 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002028 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002029 raise
agable32978d92016-11-01 12:55:02 -07002030 return data
2031
Karen Qian40c19422019-03-13 21:28:29 +00002032 def _IsCqConfigured(self):
2033 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002034 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002035 return False
2036 # TODO(crbug/753213): Remove temporary hack
2037 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002038 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002039 detail['branch'].startswith('refs/branch-heads/')):
2040 return False
2041 return True
2042
Olivier Robin75ee7252018-04-13 10:02:56 +02002043 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 if git_common.is_dirty_git_tree('land'):
2045 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002046
tandriid60367b2016-06-22 05:25:12 -07002047 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002048 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002049 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002050 'which can test and land changes for you. '
2051 'Are you sure you wish to bypass it?\n',
2052 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002053 differs = True
tandriic4344b52016-08-29 06:04:54 -07002054 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002055 # Note: git diff outputs nothing if there is no diff.
2056 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002057 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002058 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 if detail['current_revision'] == last_upload:
2060 differs = False
2061 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002062 print('WARNING: Local branch contents differ from latest uploaded '
2063 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002064 if differs:
2065 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002066 confirm_or_exit(
2067 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2068 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002069 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002070 elif not bypass_hooks:
2071 hook_results = self.RunHook(
2072 committing=True,
2073 may_prompt=not force,
2074 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002075 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2076 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002077 if not hook_results.should_continue():
2078 return 1
2079
2080 self.SubmitIssue(wait_for_merge=True)
2081 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002082 links = self._GetChangeCommit().get('web_links', [])
2083 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002084 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002085 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002086 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002087 return 0
2088
Edward Lemurf38bc172019-09-03 21:02:13 +00002089 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002090 assert parsed_issue_arg.valid
2091
Edward Lemur125d60a2019-09-13 18:25:41 +00002092 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002093
2094 if parsed_issue_arg.hostname:
2095 self._gerrit_host = parsed_issue_arg.hostname
2096 self._gerrit_server = 'https://%s' % self._gerrit_host
2097
tandriic2405f52016-10-10 08:13:15 -07002098 try:
2099 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002100 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002101 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002102
2103 if not parsed_issue_arg.patchset:
2104 # Use current revision by default.
2105 revision_info = detail['revisions'][detail['current_revision']]
2106 patchset = int(revision_info['_number'])
2107 else:
2108 patchset = parsed_issue_arg.patchset
2109 for revision_info in detail['revisions'].itervalues():
2110 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2111 break
2112 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002113 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002114 (parsed_issue_arg.patchset, self.GetIssue()))
2115
Edward Lemur125d60a2019-09-13 18:25:41 +00002116 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002117 if remote_url.endswith('.git'):
2118 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002119 remote_url = remote_url.rstrip('/')
2120
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002121 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002122 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002123
2124 if remote_url != fetch_info['url']:
2125 DieWithError('Trying to patch a change from %s but this repo appears '
2126 'to be %s.' % (fetch_info['url'], remote_url))
2127
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002128 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002129
Aaron Gable62619a32017-06-16 08:22:09 -07002130 if force:
2131 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2132 print('Checked out commit for change %i patchset %i locally' %
2133 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002134 elif nocommit:
2135 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2136 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002137 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002138 RunGit(['cherry-pick', 'FETCH_HEAD'])
2139 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002140 (parsed_issue_arg.issue, patchset))
2141 print('Note: this created a local commit which does not have '
2142 'the same hash as the one uploaded for review. This will make '
2143 'uploading changes based on top of this branch difficult.\n'
2144 'If you want to do that, use "git cl patch --force" instead.')
2145
Stefan Zagerd08043c2017-10-12 12:07:02 -07002146 if self.GetBranch():
2147 self.SetIssue(parsed_issue_arg.issue)
2148 self.SetPatchset(patchset)
2149 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2150 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2151 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2152 else:
2153 print('WARNING: You are in detached HEAD state.\n'
2154 'The patch has been applied to your checkout, but you will not be '
2155 'able to upload a new patch set to the gerrit issue.\n'
2156 'Try using the \'-b\' option if you would like to work on a '
2157 'branch and/or upload a new patch set.')
2158
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 return 0
2160
2161 @staticmethod
2162 def ParseIssueURL(parsed_url):
2163 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2164 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002165 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2166 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002167 # Short urls like https://domain/<issue_number> can be used, but don't allow
2168 # specifying the patchset (you'd 404), but we allow that here.
2169 if parsed_url.path == '/':
2170 part = parsed_url.fragment
2171 else:
2172 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002173 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002174 if match:
2175 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002176 issue=int(match.group(3)),
2177 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002178 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 return None
2180
tandrii16e0b4e2016-06-07 10:34:28 -07002181 def _GerritCommitMsgHookCheck(self, offer_removal):
2182 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2183 if not os.path.exists(hook):
2184 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002185 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2186 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002187 data = gclient_utils.FileRead(hook)
2188 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2189 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002190 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002191 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002192 'and may interfere with it in subtle ways.\n'
2193 'We recommend you remove the commit-msg hook.')
2194 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002195 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002196 gclient_utils.rm_file_or_tree(hook)
2197 print('Gerrit commit-msg hook removed.')
2198 else:
2199 print('OK, will keep Gerrit commit-msg hook in place.')
2200
Edward Lemur1b52d872019-05-09 21:12:12 +00002201 def _CleanUpOldTraces(self):
2202 """Keep only the last |MAX_TRACES| traces."""
2203 try:
2204 traces = sorted([
2205 os.path.join(TRACES_DIR, f)
2206 for f in os.listdir(TRACES_DIR)
2207 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2208 and not f.startswith('tmp'))
2209 ])
2210 traces_to_delete = traces[:-MAX_TRACES]
2211 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002212 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002213 except OSError:
2214 print('WARNING: Failed to remove old git traces from\n'
2215 ' %s'
2216 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002217
Edward Lemur5737f022019-05-17 01:24:00 +00002218 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002219 """Zip and write the git push traces stored in traces_dir."""
2220 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002221 traces_zip = trace_name + '-traces'
2222 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002223 # Create a temporary dir to store git config and gitcookies in. It will be
2224 # compressed and stored next to the traces.
2225 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002226 git_info_zip = trace_name + '-git-info'
2227
Edward Lemur5737f022019-05-17 01:24:00 +00002228 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002229 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002230 git_push_metadata['now'] = git_push_metadata['now'].decode(
2231 sys.stdin.encoding)
2232
Edward Lemur1b52d872019-05-09 21:12:12 +00002233 git_push_metadata['trace_name'] = trace_name
2234 gclient_utils.FileWrite(
2235 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2236
2237 # Keep only the first 6 characters of the git hashes on the packet
2238 # trace. This greatly decreases size after compression.
2239 packet_traces = os.path.join(traces_dir, 'trace-packet')
2240 if os.path.isfile(packet_traces):
2241 contents = gclient_utils.FileRead(packet_traces)
2242 gclient_utils.FileWrite(
2243 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2244 shutil.make_archive(traces_zip, 'zip', traces_dir)
2245
2246 # Collect and compress the git config and gitcookies.
2247 git_config = RunGit(['config', '-l'])
2248 gclient_utils.FileWrite(
2249 os.path.join(git_info_dir, 'git-config'),
2250 git_config)
2251
2252 cookie_auth = gerrit_util.Authenticator.get()
2253 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2254 gitcookies_path = cookie_auth.get_gitcookies_path()
2255 if os.path.isfile(gitcookies_path):
2256 gitcookies = gclient_utils.FileRead(gitcookies_path)
2257 gclient_utils.FileWrite(
2258 os.path.join(git_info_dir, 'gitcookies'),
2259 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2260 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2261
Edward Lemur1b52d872019-05-09 21:12:12 +00002262 gclient_utils.rmtree(git_info_dir)
2263
2264 def _RunGitPushWithTraces(
2265 self, change_desc, refspec, refspec_opts, git_push_metadata):
2266 """Run git push and collect the traces resulting from the execution."""
2267 # Create a temporary directory to store traces in. Traces will be compressed
2268 # and stored in a 'traces' dir inside depot_tools.
2269 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002270 trace_name = os.path.join(
2271 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002272
2273 env = os.environ.copy()
2274 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2275 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002276 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002277 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2278 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2279 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2280
2281 try:
2282 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002283 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002284 before_push = time_time()
2285 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002287 env=env,
2288 print_stdout=True,
2289 # Flush after every line: useful for seeing progress when running as
2290 # recipe.
2291 filter_fn=lambda _: sys.stdout.flush())
2292 except subprocess2.CalledProcessError as e:
2293 push_returncode = e.returncode
2294 DieWithError('Failed to create a change. Please examine output above '
2295 'for the reason of the failure.\n'
2296 'Hint: run command below to diagnose common Git/Gerrit '
2297 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002298 ' git cl creds-check\n'
2299 '\n'
2300 'If git-cl is not working correctly, file a bug under the '
2301 'Infra>SDK component including the files below.\n'
2302 'Review the files before upload, since they might contain '
2303 'sensitive information.\n'
2304 'Set the Restrict-View-Google label so that they are not '
2305 'publicly accessible.\n'
2306 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002307 change_desc)
2308 finally:
2309 execution_time = time_time() - before_push
2310 metrics.collector.add_repeated('sub_commands', {
2311 'command': 'git push',
2312 'execution_time': execution_time,
2313 'exit_code': push_returncode,
2314 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2315 })
2316
Edward Lemur1b52d872019-05-09 21:12:12 +00002317 git_push_metadata['execution_time'] = execution_time
2318 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002319 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002320
Edward Lemur1b52d872019-05-09 21:12:12 +00002321 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002322 gclient_utils.rmtree(traces_dir)
2323
2324 return push_stdout
2325
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002326 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002328 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002329 # Load default for user, repo, squash=true, in this order.
2330 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002331
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002332 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002333 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002334 # This may be None; default fallback value is determined in logic below.
2335 title = options.title
2336
Dominic Battre7d1c4842017-10-27 09:17:28 +02002337 # Extract bug number from branch name.
2338 bug = options.bug
2339 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2340 if not bug and match:
2341 bug = match.group(1)
2342
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002343 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002344 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 if self.GetIssue():
2346 # Try to get the message from a previous upload.
2347 message = self.GetDescription()
2348 if not message:
2349 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002350 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002351 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002352 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002353 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002354 # When uploading a subsequent patchset, -m|--message is taken
2355 # as the patchset title if --title was not provided.
2356 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002357 else:
2358 default_title = RunGit(
2359 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002360 if options.force:
2361 title = default_title
2362 else:
2363 title = ask_for_data(
2364 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002365 change_id = self._GetChangeDetail()['change_id']
2366 while True:
2367 footer_change_ids = git_footers.get_footer_change_id(message)
2368 if footer_change_ids == [change_id]:
2369 break
2370 if not footer_change_ids:
2371 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002372 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 continue
2374 # There is already a valid footer but with different or several ids.
2375 # Doing this automatically is non-trivial as we don't want to lose
2376 # existing other footers, yet we want to append just 1 desired
2377 # Change-Id. Thus, just create a new footer, but let user verify the
2378 # new description.
2379 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002380 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002381 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002382 print(
2383 'WARNING: change %s has Change-Id footer(s):\n'
2384 ' %s\n'
2385 'but change has Change-Id %s, according to Gerrit.\n'
2386 'Please, check the proposed correction to the description, '
2387 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2388 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2389 change_id))
2390 confirm_or_exit(action='edit')
2391 change_desc.prompt()
2392
2393 message = change_desc.description
2394 if not message:
2395 DieWithError("Description is empty. Aborting...")
2396
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002397 # Continue the while loop.
2398 # Sanity check of this code - we should end up with proper message
2399 # footer.
2400 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002401 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002402 else: # if not self.GetIssue()
2403 if options.message:
2404 message = options.message
2405 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002406 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002407 if options.title:
2408 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002409 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002411 change_desc.prompt()
2412
Aaron Gableb56ad332017-01-06 15:24:31 -08002413 # On first upload, patchset title is always this string, while
2414 # --title flag gets converted to first line of message.
2415 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 if not change_desc.description:
2417 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002418 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419 if len(change_ids) > 1:
2420 DieWithError('too many Change-Id footers, at most 1 allowed.')
2421 if not change_ids:
2422 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002423 change_desc.set_description(git_footers.add_footer_change_id(
2424 change_desc.description,
2425 GenerateGerritChangeId(change_desc.description)))
2426 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002427 assert len(change_ids) == 1
2428 change_id = change_ids[0]
2429
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002430 if options.reviewers or options.tbrs or options.add_owners_to:
2431 change_desc.update_reviewers(options.reviewers, options.tbrs,
2432 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002433 if options.preserve_tryjobs:
2434 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002435
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002436 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002437 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2438 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002439 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002440 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2441 desc_tempfile.write(change_desc.description)
2442 desc_tempfile.close()
2443 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2444 '-F', desc_tempfile.name]).strip()
2445 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002446 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002447 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002448 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 if not change_desc.description:
2450 DieWithError("Description is empty. Aborting...")
2451
2452 if not git_footers.get_footer_change_id(change_desc.description):
2453 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002454 change_desc.set_description(
2455 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002456 if options.reviewers or options.tbrs or options.add_owners_to:
2457 change_desc.update_reviewers(options.reviewers, options.tbrs,
2458 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002459 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002460 # For no-squash mode, we assume the remote called "origin" is the one we
2461 # want. It is not worthwhile to support different workflows for
2462 # no-squash mode.
2463 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002464 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2465
2466 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002467 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002468 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2469 ref_to_push)]).splitlines()
2470 if len(commits) > 1:
2471 print('WARNING: This will upload %d commits. Run the following command '
2472 'to see which commits will be uploaded: ' % len(commits))
2473 print('git log %s..%s' % (parent, ref_to_push))
2474 print('You can also use `git squash-branch` to squash these into a '
2475 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002476 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002477
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002478 if options.reviewers or options.tbrs or options.add_owners_to:
2479 change_desc.update_reviewers(options.reviewers, options.tbrs,
2480 options.add_owners_to, change)
2481
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002482 reviewers = sorted(change_desc.get_reviewers())
2483 # Add cc's from the CC_LIST and --cc flag (if any).
2484 if not options.private and not options.no_autocc:
2485 cc = self.GetCCList().split(',')
2486 else:
2487 cc = []
2488 if options.cc:
2489 cc.extend(options.cc)
2490 cc = filter(None, [email.strip() for email in cc])
2491 if change_desc.get_cced():
2492 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002493 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2494 valid_accounts = set(reviewers + cc)
2495 # TODO(crbug/877717): relax this for all hosts.
2496 else:
2497 valid_accounts = gerrit_util.ValidAccounts(
2498 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002499 logging.info('accounts %s are recognized, %s invalid',
2500 sorted(valid_accounts),
2501 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002502
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002503 # Extra options that can be specified at push time. Doc:
2504 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002505 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002506
Aaron Gable844cf292017-06-28 11:32:59 -07002507 # By default, new changes are started in WIP mode, and subsequent patchsets
2508 # don't send email. At any time, passing --send-mail will mark the change
2509 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002510 if options.send_mail:
2511 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002512 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002513 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002514 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002515 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002516 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002517
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002518 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002519 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002520
Aaron Gable9b713dd2016-12-14 16:04:21 -08002521 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002522 # Punctuation and whitespace in |title| must be percent-encoded.
2523 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002524
agablec6787972016-09-09 16:13:34 -07002525 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002526 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002527
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002528 for r in sorted(reviewers):
2529 if r in valid_accounts:
2530 refspec_opts.append('r=%s' % r)
2531 reviewers.remove(r)
2532 else:
2533 # TODO(tandrii): this should probably be a hard failure.
2534 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2535 % r)
2536 for c in sorted(cc):
2537 # refspec option will be rejected if cc doesn't correspond to an
2538 # account, even though REST call to add such arbitrary cc may succeed.
2539 if c in valid_accounts:
2540 refspec_opts.append('cc=%s' % c)
2541 cc.remove(c)
2542
rmistry9eadede2016-09-19 11:22:43 -07002543 if options.topic:
2544 # Documentation on Gerrit topics is here:
2545 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002546 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002547
Edward Lemur687ca902018-12-05 02:30:30 +00002548 if options.enable_auto_submit:
2549 refspec_opts.append('l=Auto-Submit+1')
2550 if options.use_commit_queue:
2551 refspec_opts.append('l=Commit-Queue+2')
2552 elif options.cq_dry_run:
2553 refspec_opts.append('l=Commit-Queue+1')
2554
2555 if change_desc.get_reviewers(tbr_only=True):
2556 score = gerrit_util.GetCodeReviewTbrScore(
2557 self._GetGerritHost(),
2558 self._GetGerritProject())
2559 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002560
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002561 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002562 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002563 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002564 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002565 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2566
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002567 refspec_suffix = ''
2568 if refspec_opts:
2569 refspec_suffix = '%' + ','.join(refspec_opts)
2570 assert ' ' not in refspec_suffix, (
2571 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2572 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2573
Edward Lemur1b52d872019-05-09 21:12:12 +00002574 git_push_metadata = {
2575 'gerrit_host': self._GetGerritHost(),
2576 'title': title or '<untitled>',
2577 'change_id': change_id,
2578 'description': change_desc.description,
2579 }
2580 push_stdout = self._RunGitPushWithTraces(
2581 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002582
2583 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002584 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002585 change_numbers = [m.group(1)
2586 for m in map(regex.match, push_stdout.splitlines())
2587 if m]
2588 if len(change_numbers) != 1:
2589 DieWithError(
2590 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002591 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002592 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002593 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002594
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002595 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002596 # GetIssue() is not set in case of non-squash uploads according to tests.
2597 # TODO(agable): non-squash uploads in git cl should be removed.
2598 gerrit_util.AddReviewers(
2599 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002600 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002601 reviewers, cc,
2602 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002603
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002604 return 0
2605
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002606 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2607 change_desc):
2608 """Computes parent of the generated commit to be uploaded to Gerrit.
2609
2610 Returns revision or a ref name.
2611 """
2612 if custom_cl_base:
2613 # Try to avoid creating additional unintended CLs when uploading, unless
2614 # user wants to take this risk.
2615 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2616 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2617 local_ref_of_target_remote])
2618 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002619 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002620 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2621 'If you proceed with upload, more than 1 CL may be created by '
2622 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2623 'If you are certain that specified base `%s` has already been '
2624 'uploaded to Gerrit as another CL, you may proceed.\n' %
2625 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2626 if not force:
2627 confirm_or_exit(
2628 'Do you take responsibility for cleaning up potential mess '
2629 'resulting from proceeding with upload?',
2630 action='upload')
2631 return custom_cl_base
2632
Aaron Gablef97e33d2017-03-30 15:44:27 -07002633 if remote != '.':
2634 return self.GetCommonAncestorWithUpstream()
2635
2636 # If our upstream branch is local, we base our squashed commit on its
2637 # squashed version.
2638 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2639
Aaron Gablef97e33d2017-03-30 15:44:27 -07002640 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002641 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002642
2643 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002644 # TODO(tandrii): consider checking parent change in Gerrit and using its
2645 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2646 # the tree hash of the parent branch. The upside is less likely bogus
2647 # requests to reupload parent change just because it's uploadhash is
2648 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002649 parent = RunGit(['config',
2650 'branch.%s.gerritsquashhash' % upstream_branch_name],
2651 error_ok=True).strip()
2652 # Verify that the upstream branch has been uploaded too, otherwise
2653 # Gerrit will create additional CLs when uploading.
2654 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2655 RunGitSilent(['rev-parse', parent + ':'])):
2656 DieWithError(
2657 '\nUpload upstream branch %s first.\n'
2658 'It is likely that this branch has been rebased since its last '
2659 'upload, so you just need to upload it again.\n'
2660 '(If you uploaded it with --no-squash, then branch dependencies '
2661 'are not supported, and you should reupload with --squash.)'
2662 % upstream_branch_name,
2663 change_desc)
2664 return parent
2665
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002666 def _AddChangeIdToCommitMessage(self, options, args):
2667 """Re-commits using the current message, assumes the commit hook is in
2668 place.
2669 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002670 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002671 git_command = ['commit', '--amend', '-m', log_desc]
2672 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002673 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002674 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002675 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002676 return new_log_desc
2677 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002678 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002679
tandriie113dfd2016-10-11 10:20:12 -07002680 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002681 try:
2682 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002683 except GerritChangeNotExists:
2684 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002685
2686 if data['status'] in ('ABANDONED', 'MERGED'):
2687 return 'CL %s is closed' % self.GetIssue()
2688
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002689 def GetGerritChange(self, patchset=None):
2690 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2691 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2692 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002693 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002694 data = self._GetChangeDetail(['ALL_REVISIONS'])
2695
2696 assert host and issue and patchset, 'CL must be uploaded first'
2697
2698 has_patchset = any(
2699 int(revision_data['_number']) == patchset
2700 for revision_data in data['revisions'].itervalues())
2701 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002702 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002703 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002704
tandrii8c5a3532016-11-04 07:52:02 -07002705 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002706 'host': host,
2707 'change': issue,
2708 'project': data['project'],
2709 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002710 }
tandriie113dfd2016-10-11 10:20:12 -07002711
tandriide281ae2016-10-12 06:02:30 -07002712 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002713 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002714
Edward Lemur707d70b2018-02-07 00:50:14 +01002715 def GetReviewers(self):
2716 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002717 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002718
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002719
2720_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002721 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002722}
2723
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002724
iannuccie53c9352016-08-17 14:40:40 -07002725def _add_codereview_issue_select_options(parser, extra=""):
2726 _add_codereview_select_options(parser)
2727
2728 text = ('Operate on this issue number instead of the current branch\'s '
2729 'implicit issue.')
2730 if extra:
2731 text += ' '+extra
2732 parser.add_option('-i', '--issue', type=int, help=text)
2733
2734
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002735def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002736 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002737 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002738 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002739 parser.add_option_group(parser.codereview_group)
2740 parser.codereview_group.add_option(
2741 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002742 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002743
2744
2745def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002746 options.forced_codereview = None
2747 if options.gerrit:
2748 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002749
2750
tandriif9aefb72016-07-01 09:06:51 -07002751def _get_bug_line_values(default_project, bugs):
2752 """Given default_project and comma separated list of bugs, yields bug line
2753 values.
2754
2755 Each bug can be either:
2756 * a number, which is combined with default_project
2757 * string, which is left as is.
2758
2759 This function may produce more than one line, because bugdroid expects one
2760 project per line.
2761
2762 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2763 ['v8:123', 'chromium:789']
2764 """
2765 default_bugs = []
2766 others = []
2767 for bug in bugs.split(','):
2768 bug = bug.strip()
2769 if bug:
2770 try:
2771 default_bugs.append(int(bug))
2772 except ValueError:
2773 others.append(bug)
2774
2775 if default_bugs:
2776 default_bugs = ','.join(map(str, default_bugs))
2777 if default_project:
2778 yield '%s:%s' % (default_project, default_bugs)
2779 else:
2780 yield default_bugs
2781 for other in sorted(others):
2782 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2783 yield other
2784
2785
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002786class ChangeDescription(object):
2787 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002788 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002789 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002790 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002791 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002792 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2793 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2794 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2795 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002796
Anthony Polito8b955342019-09-24 19:01:36 +00002797 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002798 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002799 if bug:
2800 regexp = re.compile(self.BUG_LINE)
2801 prefix = settings.GetBugPrefix()
2802 if not any((regexp.match(line) for line in self._description_lines)):
2803 values = list(_get_bug_line_values(prefix, bug))
2804 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002805
agable@chromium.org42c20792013-09-12 17:34:49 +00002806 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002807 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002808 return '\n'.join(self._description_lines)
2809
2810 def set_description(self, desc):
2811 if isinstance(desc, basestring):
2812 lines = desc.splitlines()
2813 else:
2814 lines = [line.rstrip() for line in desc]
2815 while lines and not lines[0]:
2816 lines.pop(0)
2817 while lines and not lines[-1]:
2818 lines.pop(-1)
2819 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002820
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002821 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2822 """Rewrites the R=/TBR= line(s) as a single line each.
2823
2824 Args:
2825 reviewers (list(str)) - list of additional emails to use for reviewers.
2826 tbrs (list(str)) - list of additional emails to use for TBRs.
2827 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2828 the change that are missing OWNER coverage. If this is not None, you
2829 must also pass a value for `change`.
2830 change (Change) - The Change that should be used for OWNERS lookups.
2831 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002832 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002833 assert isinstance(tbrs, list), tbrs
2834
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002835 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002836 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002837
2838 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002839 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002840
2841 reviewers = set(reviewers)
2842 tbrs = set(tbrs)
2843 LOOKUP = {
2844 'TBR': tbrs,
2845 'R': reviewers,
2846 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002848 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 regexp = re.compile(self.R_LINE)
2850 matches = [regexp.match(line) for line in self._description_lines]
2851 new_desc = [l for i, l in enumerate(self._description_lines)
2852 if not matches[i]]
2853 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002854
agable@chromium.org42c20792013-09-12 17:34:49 +00002855 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002856
2857 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002858 for match in matches:
2859 if not match:
2860 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002861 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2862
2863 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002864 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002865 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002866 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002867 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002868 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002869 LOOKUP[add_owners_to].update(
2870 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002871
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002872 # If any folks ended up in both groups, remove them from tbrs.
2873 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002874
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002875 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2876 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002877
2878 # Put the new lines in the description where the old first R= line was.
2879 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2880 if 0 <= line_loc < len(self._description_lines):
2881 if new_tbr_line:
2882 self._description_lines.insert(line_loc, new_tbr_line)
2883 if new_r_line:
2884 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002886 if new_r_line:
2887 self.append_footer(new_r_line)
2888 if new_tbr_line:
2889 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002890
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002891 def set_preserve_tryjobs(self):
2892 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2893 footers = git_footers.parse_footers(self.description)
2894 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2895 if v.lower() == 'true':
2896 return
2897 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2898
Anthony Polito8b955342019-09-24 19:01:36 +00002899 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002900 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002901 self.set_description([
2902 '# Enter a description of the change.',
2903 '# This will be displayed on the codereview site.',
2904 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002905 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002906 '--------------------',
2907 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002908 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002909 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002910 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002911 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002912
agable@chromium.org42c20792013-09-12 17:34:49 +00002913 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002914 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002915 if not content:
2916 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002917 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002918
Bruce Dawson2377b012018-01-11 16:46:49 -08002919 # Strip off comments and default inserted "Bug:" line.
2920 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002921 (line.startswith('#') or
2922 line.rstrip() == "Bug:" or
2923 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002924 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002925 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002926 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002927
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002929 """Adds a footer line to the description.
2930
2931 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2932 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2933 that Gerrit footers are always at the end.
2934 """
2935 parsed_footer_line = git_footers.parse_footer(line)
2936 if parsed_footer_line:
2937 # Line is a gerrit footer in the form: Footer-Key: any value.
2938 # Thus, must be appended observing Gerrit footer rules.
2939 self.set_description(
2940 git_footers.add_footer(self.description,
2941 key=parsed_footer_line[0],
2942 value=parsed_footer_line[1]))
2943 return
2944
2945 if not self._description_lines:
2946 self._description_lines.append(line)
2947 return
2948
2949 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2950 if gerrit_footers:
2951 # git_footers.split_footers ensures that there is an empty line before
2952 # actual (gerrit) footers, if any. We have to keep it that way.
2953 assert top_lines and top_lines[-1] == ''
2954 top_lines, separator = top_lines[:-1], top_lines[-1:]
2955 else:
2956 separator = [] # No need for separator if there are no gerrit_footers.
2957
2958 prev_line = top_lines[-1] if top_lines else ''
2959 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2960 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2961 top_lines.append('')
2962 top_lines.append(line)
2963 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002964
tandrii99a72f22016-08-17 14:33:24 -07002965 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002966 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002967 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002968 reviewers = [match.group(2).strip()
2969 for match in matches
2970 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002971 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002972
bradnelsond975b302016-10-23 12:20:23 -07002973 def get_cced(self):
2974 """Retrieves the list of reviewers."""
2975 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2976 cced = [match.group(2).strip() for match in matches if match]
2977 return cleanup_list(cced)
2978
Nodir Turakulov23b82142017-11-16 11:04:25 -08002979 def get_hash_tags(self):
2980 """Extracts and sanitizes a list of Gerrit hashtags."""
2981 subject = (self._description_lines or ('',))[0]
2982 subject = re.sub(
2983 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2984
2985 tags = []
2986 start = 0
2987 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2988 while True:
2989 m = bracket_exp.match(subject, start)
2990 if not m:
2991 break
2992 tags.append(self.sanitize_hash_tag(m.group(1)))
2993 start = m.end()
2994
2995 if not tags:
2996 # Try "Tag: " prefix.
2997 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2998 if m:
2999 tags.append(self.sanitize_hash_tag(m.group(1)))
3000 return tags
3001
3002 @classmethod
3003 def sanitize_hash_tag(cls, tag):
3004 """Returns a sanitized Gerrit hash tag.
3005
3006 A sanitized hashtag can be used as a git push refspec parameter value.
3007 """
3008 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3009
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003010 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3011 """Updates this commit description given the parent.
3012
3013 This is essentially what Gnumbd used to do.
3014 Consult https://goo.gl/WMmpDe for more details.
3015 """
3016 assert parent_msg # No, orphan branch creation isn't supported.
3017 assert parent_hash
3018 assert dest_ref
3019 parent_footer_map = git_footers.parse_footers(parent_msg)
3020 # This will also happily parse svn-position, which GnumbD is no longer
3021 # supporting. While we'd generate correct footers, the verifier plugin
3022 # installed in Gerrit will block such commit (ie git push below will fail).
3023 parent_position = git_footers.get_position(parent_footer_map)
3024
3025 # Cherry-picks may have last line obscuring their prior footers,
3026 # from git_footers perspective. This is also what Gnumbd did.
3027 cp_line = None
3028 if (self._description_lines and
3029 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3030 cp_line = self._description_lines.pop()
3031
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003032 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003033
3034 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3035 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003036 for i, line in enumerate(footer_lines):
3037 k, v = git_footers.parse_footer(line) or (None, None)
3038 if k and k.startswith('Cr-'):
3039 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003040
3041 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003042 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003043 if parent_position[0] == dest_ref:
3044 # Same branch as parent.
3045 number = int(parent_position[1]) + 1
3046 else:
3047 number = 1 # New branch, and extra lineage.
3048 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3049 int(parent_position[1])))
3050
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003051 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3052 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003053
3054 self._description_lines = top_lines
3055 if cp_line:
3056 self._description_lines.append(cp_line)
3057 if self._description_lines[-1] != '':
3058 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003059 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003060
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003061
Aaron Gablea1bab272017-04-11 16:38:18 -07003062def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003063 """Retrieves the reviewers that approved a CL from the issue properties with
3064 messages.
3065
3066 Note that the list may contain reviewers that are not committer, thus are not
3067 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003068
3069 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003070 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003071 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003072 return sorted(
3073 set(
3074 message['sender']
3075 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003076 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003077 )
3078 )
3079
3080
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003081def FindCodereviewSettingsFile(filename='codereview.settings'):
3082 """Finds the given file starting in the cwd and going up.
3083
3084 Only looks up to the top of the repository unless an
3085 'inherit-review-settings-ok' file exists in the root of the repository.
3086 """
3087 inherit_ok_file = 'inherit-review-settings-ok'
3088 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003089 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003090 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3091 root = '/'
3092 while True:
3093 if filename in os.listdir(cwd):
3094 if os.path.isfile(os.path.join(cwd, filename)):
3095 return open(os.path.join(cwd, filename))
3096 if cwd == root:
3097 break
3098 cwd = os.path.dirname(cwd)
3099
3100
3101def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003102 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003103 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003105 def SetProperty(name, setting, unset_error_ok=False):
3106 fullname = 'rietveld.' + name
3107 if setting in keyvals:
3108 RunGit(['config', fullname, keyvals[setting]])
3109 else:
3110 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3111
tandrii48df5812016-10-17 03:55:37 -07003112 if not keyvals.get('GERRIT_HOST', False):
3113 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003114 # Only server setting is required. Other settings can be absent.
3115 # In that case, we ignore errors raised during option deletion attempt.
3116 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3117 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3118 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003119 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003120 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3121 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003122 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3123 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003124
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003125 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003126 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003127
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003128 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003129 RunGit(['config', 'gerrit.squash-uploads',
3130 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003131
tandrii@chromium.org28253532016-04-14 13:46:56 +00003132 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003133 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003134 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3135
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003136 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003137 # should be of the form
3138 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3139 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3141 keyvals['ORIGIN_URL_CONFIG']])
3142
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003143
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003144def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003145 """Downloads a network object to a local file, like urllib.urlretrieve.
3146
3147 This is necessary because urllib is broken for SSL connections via a proxy.
3148 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003149 with open(destination, 'w') as f:
3150 f.write(urllib2.urlopen(source).read())
3151
3152
ukai@chromium.org712d6102013-11-27 00:52:58 +00003153def hasSheBang(fname):
3154 """Checks fname is a #! script."""
3155 with open(fname) as f:
3156 return f.read(2).startswith('#!')
3157
3158
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003159# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3160def DownloadHooks(*args, **kwargs):
3161 pass
3162
3163
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003164def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003165 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003166
3167 Args:
3168 force: True to update hooks. False to install hooks if not present.
3169 """
3170 if not settings.GetIsGerrit():
3171 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003172 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003173 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3174 if not os.access(dst, os.X_OK):
3175 if os.path.exists(dst):
3176 if not force:
3177 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003178 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003179 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003180 if not hasSheBang(dst):
3181 DieWithError('Not a script: %s\n'
3182 'You need to download from\n%s\n'
3183 'into .git/hooks/commit-msg and '
3184 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003185 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3186 except Exception:
3187 if os.path.exists(dst):
3188 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003189 DieWithError('\nFailed to download hooks.\n'
3190 'You need to download from\n%s\n'
3191 'into .git/hooks/commit-msg and '
3192 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003193
3194
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003195class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003196 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003197
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003198 _GOOGLESOURCE = 'googlesource.com'
3199
3200 def __init__(self):
3201 # Cached list of [host, identity, source], where source is either
3202 # .gitcookies or .netrc.
3203 self._all_hosts = None
3204
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003205 def ensure_configured_gitcookies(self):
3206 """Runs checks and suggests fixes to make git use .gitcookies from default
3207 path."""
3208 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3209 configured_path = RunGitSilent(
3210 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003211 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003212 if configured_path:
3213 self._ensure_default_gitcookies_path(configured_path, default)
3214 else:
3215 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003216
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003217 @staticmethod
3218 def _ensure_default_gitcookies_path(configured_path, default_path):
3219 assert configured_path
3220 if configured_path == default_path:
3221 print('git is already configured to use your .gitcookies from %s' %
3222 configured_path)
3223 return
3224
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003225 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003226 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3227 (configured_path, default_path))
3228
3229 if not os.path.exists(configured_path):
3230 print('However, your configured .gitcookies file is missing.')
3231 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3232 action='reconfigure')
3233 RunGit(['config', '--global', 'http.cookiefile', default_path])
3234 return
3235
3236 if os.path.exists(default_path):
3237 print('WARNING: default .gitcookies file already exists %s' %
3238 default_path)
3239 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3240 default_path)
3241
3242 confirm_or_exit('Move existing .gitcookies to default location?',
3243 action='move')
3244 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003245 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003246 print('Moved and reconfigured git to use .gitcookies from %s' %
3247 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003248
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003249 @staticmethod
3250 def _configure_gitcookies_path(default_path):
3251 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3252 if os.path.exists(netrc_path):
3253 print('You seem to be using outdated .netrc for git credentials: %s' %
3254 netrc_path)
3255 print('This tool will guide you through setting up recommended '
3256 '.gitcookies store for git credentials.\n'
3257 '\n'
3258 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3259 ' git config --global --unset http.cookiefile\n'
3260 ' mv %s %s.backup\n\n' % (default_path, default_path))
3261 confirm_or_exit(action='setup .gitcookies')
3262 RunGit(['config', '--global', 'http.cookiefile', default_path])
3263 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003264
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003265 def get_hosts_with_creds(self, include_netrc=False):
3266 if self._all_hosts is None:
3267 a = gerrit_util.CookiesAuthenticator()
3268 self._all_hosts = [
3269 (h, u, s)
3270 for h, u, s in itertools.chain(
3271 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3272 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3273 )
3274 if h.endswith(self._GOOGLESOURCE)
3275 ]
3276
3277 if include_netrc:
3278 return self._all_hosts
3279 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3280
3281 def print_current_creds(self, include_netrc=False):
3282 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3283 if not hosts:
3284 print('No Git/Gerrit credentials found')
3285 return
3286 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3287 header = [('Host', 'User', 'Which file'),
3288 ['=' * l for l in lengths]]
3289 for row in (header + hosts):
3290 print('\t'.join((('%%+%ds' % l) % s)
3291 for l, s in zip(lengths, row)))
3292
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003293 @staticmethod
3294 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003295 """Parses identity "git-<username>.domain" into <username> and domain."""
3296 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003297 # distinguishable from sub-domains. But we do know typical domains:
3298 if identity.endswith('.chromium.org'):
3299 domain = 'chromium.org'
3300 username = identity[:-len('.chromium.org')]
3301 else:
3302 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003303 if username.startswith('git-'):
3304 username = username[len('git-'):]
3305 return username, domain
3306
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003307 def _canonical_git_googlesource_host(self, host):
3308 """Normalizes Gerrit hosts (with '-review') to Git host."""
3309 assert host.endswith(self._GOOGLESOURCE)
3310 # Prefix doesn't include '.' at the end.
3311 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3312 if prefix.endswith('-review'):
3313 prefix = prefix[:-len('-review')]
3314 return prefix + '.' + self._GOOGLESOURCE
3315
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003316 def _canonical_gerrit_googlesource_host(self, host):
3317 git_host = self._canonical_git_googlesource_host(host)
3318 prefix = git_host.split('.', 1)[0]
3319 return prefix + '-review.' + self._GOOGLESOURCE
3320
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003321 def _get_counterpart_host(self, host):
3322 assert host.endswith(self._GOOGLESOURCE)
3323 git = self._canonical_git_googlesource_host(host)
3324 gerrit = self._canonical_gerrit_googlesource_host(git)
3325 return git if gerrit == host else gerrit
3326
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003327 def has_generic_host(self):
3328 """Returns whether generic .googlesource.com has been configured.
3329
3330 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3331 """
3332 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3333 if host == '.' + self._GOOGLESOURCE:
3334 return True
3335 return False
3336
3337 def _get_git_gerrit_identity_pairs(self):
3338 """Returns map from canonic host to pair of identities (Git, Gerrit).
3339
3340 One of identities might be None, meaning not configured.
3341 """
3342 host_to_identity_pairs = {}
3343 for host, identity, _ in self.get_hosts_with_creds():
3344 canonical = self._canonical_git_googlesource_host(host)
3345 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3346 idx = 0 if canonical == host else 1
3347 pair[idx] = identity
3348 return host_to_identity_pairs
3349
3350 def get_partially_configured_hosts(self):
3351 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003352 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3353 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3354 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003355
3356 def get_conflicting_hosts(self):
3357 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003358 host
3359 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003360 if None not in (i1, i2) and i1 != i2)
3361
3362 def get_duplicated_hosts(self):
3363 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3364 return set(host for host, count in counters.iteritems() if count > 1)
3365
3366 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3367 'chromium.googlesource.com': 'chromium.org',
3368 'chrome-internal.googlesource.com': 'google.com',
3369 }
3370
3371 def get_hosts_with_wrong_identities(self):
3372 """Finds hosts which **likely** reference wrong identities.
3373
3374 Note: skips hosts which have conflicting identities for Git and Gerrit.
3375 """
3376 hosts = set()
3377 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3378 pair = self._get_git_gerrit_identity_pairs().get(host)
3379 if pair and pair[0] == pair[1]:
3380 _, domain = self._parse_identity(pair[0])
3381 if domain != expected:
3382 hosts.add(host)
3383 return hosts
3384
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003385 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003386 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003387 hosts = sorted(hosts)
3388 assert hosts
3389 if extra_column_func is None:
3390 extras = [''] * len(hosts)
3391 else:
3392 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003393 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3394 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003395 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 lines.append(tmpl % he)
3397 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003399 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003400 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003401 yield ('.googlesource.com wildcard record detected',
3402 ['Chrome Infrastructure team recommends to list full host names '
3403 'explicitly.'],
3404 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003405
3406 dups = self.get_duplicated_hosts()
3407 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 yield ('The following hosts were defined twice',
3409 self._format_hosts(dups),
3410 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003411
3412 partial = self.get_partially_configured_hosts()
3413 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003414 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3415 'These hosts are missing',
3416 self._format_hosts(partial, lambda host: 'but %s defined' %
3417 self._get_counterpart_host(host)),
3418 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003419
3420 conflicting = self.get_conflicting_hosts()
3421 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003422 yield ('The following Git hosts have differing credentials from their '
3423 'Gerrit counterparts',
3424 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3425 tuple(self._get_git_gerrit_identity_pairs()[host])),
3426 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427
3428 wrong = self.get_hosts_with_wrong_identities()
3429 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003430 yield ('These hosts likely use wrong identity',
3431 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3432 (self._get_git_gerrit_identity_pairs()[host][0],
3433 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3434 wrong)
3435
3436 def find_and_report_problems(self):
3437 """Returns True if there was at least one problem, else False."""
3438 found = False
3439 bad_hosts = set()
3440 for title, sublines, hosts in self._find_problems():
3441 if not found:
3442 found = True
3443 print('\n\n.gitcookies problem report:\n')
3444 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003445 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003446 if sublines:
3447 print()
3448 print(' %s' % '\n '.join(sublines))
3449 print()
3450
3451 if bad_hosts:
3452 assert found
3453 print(' You can manually remove corresponding lines in your %s file and '
3454 'visit the following URLs with correct account to generate '
3455 'correct credential lines:\n' %
3456 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3457 print(' %s' % '\n '.join(sorted(set(
3458 gerrit_util.CookiesAuthenticator().get_new_password_url(
3459 self._canonical_git_googlesource_host(host))
3460 for host in bad_hosts
3461 ))))
3462 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003463
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003464
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003465@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003466def CMDcreds_check(parser, args):
3467 """Checks credentials and suggests changes."""
3468 _, _ = parser.parse_args(args)
3469
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003470 # Code below checks .gitcookies. Abort if using something else.
3471 authn = gerrit_util.Authenticator.get()
3472 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3473 if isinstance(authn, gerrit_util.GceAuthenticator):
3474 DieWithError(
3475 'This command is not designed for GCE, are you on a bot?\n'
3476 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3477 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003478 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003479 'This command is not designed for bot environment. It checks '
3480 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003481
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003482 checker = _GitCookiesChecker()
3483 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003484
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003485 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003486 checker.print_current_creds(include_netrc=True)
3487
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003488 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003489 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003490 return 0
3491 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003492
3493
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003494@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003495def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003496 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003497 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3498 branch = ShortBranchName(branchref)
3499 _, args = parser.parse_args(args)
3500 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003501 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003502 return RunGit(['config', 'branch.%s.base-url' % branch],
3503 error_ok=False).strip()
3504 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003505 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003506 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3507 error_ok=False).strip()
3508
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003509
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003510def color_for_status(status):
3511 """Maps a Changelist status to color, for CMDstatus and other tools."""
3512 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003513 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003514 'waiting': Fore.BLUE,
3515 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003516 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003517 'lgtm': Fore.GREEN,
3518 'commit': Fore.MAGENTA,
3519 'closed': Fore.CYAN,
3520 'error': Fore.WHITE,
3521 }.get(status, Fore.WHITE)
3522
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003523
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003524def get_cl_statuses(changes, fine_grained, max_processes=None):
3525 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003526
3527 If fine_grained is true, this will fetch CL statuses from the server.
3528 Otherwise, simply indicate if there's a matching url for the given branches.
3529
3530 If max_processes is specified, it is used as the maximum number of processes
3531 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3532 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003533
3534 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003535 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003536 if not changes:
3537 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003538
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003539 if not fine_grained:
3540 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003541 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003542 for cl in changes:
3543 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003544 return
3545
3546 # First, sort out authentication issues.
3547 logging.debug('ensuring credentials exist')
3548 for cl in changes:
3549 cl.EnsureAuthenticated(force=False, refresh=True)
3550
3551 def fetch(cl):
3552 try:
3553 return (cl, cl.GetStatus())
3554 except:
3555 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003556 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003557 raise
3558
3559 threads_count = len(changes)
3560 if max_processes:
3561 threads_count = max(1, min(threads_count, max_processes))
3562 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3563
3564 pool = ThreadPool(threads_count)
3565 fetched_cls = set()
3566 try:
3567 it = pool.imap_unordered(fetch, changes).__iter__()
3568 while True:
3569 try:
3570 cl, status = it.next(timeout=5)
3571 except multiprocessing.TimeoutError:
3572 break
3573 fetched_cls.add(cl)
3574 yield cl, status
3575 finally:
3576 pool.close()
3577
3578 # Add any branches that failed to fetch.
3579 for cl in set(changes) - fetched_cls:
3580 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003581
rmistry@google.com2dd99862015-06-22 12:22:18 +00003582
3583def upload_branch_deps(cl, args):
3584 """Uploads CLs of local branches that are dependents of the current branch.
3585
3586 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003587
3588 test1 -> test2.1 -> test3.1
3589 -> test3.2
3590 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003591
3592 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3593 run on the dependent branches in this order:
3594 test2.1, test3.1, test3.2, test2.2, test3.3
3595
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003596 Note: This function does not rebase your local dependent branches. Use it
3597 when you make a change to the parent branch that will not conflict
3598 with its dependent branches, and you would like their dependencies
3599 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003600 """
3601 if git_common.is_dirty_git_tree('upload-branch-deps'):
3602 return 1
3603
3604 root_branch = cl.GetBranch()
3605 if root_branch is None:
3606 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3607 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003608 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003609 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3610 'patchset dependencies without an uploaded CL.')
3611
3612 branches = RunGit(['for-each-ref',
3613 '--format=%(refname:short) %(upstream:short)',
3614 'refs/heads'])
3615 if not branches:
3616 print('No local branches found.')
3617 return 0
3618
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003619 # Create a dictionary of all local branches to the branches that are
3620 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003621 tracked_to_dependents = collections.defaultdict(list)
3622 for b in branches.splitlines():
3623 tokens = b.split()
3624 if len(tokens) == 2:
3625 branch_name, tracked = tokens
3626 tracked_to_dependents[tracked].append(branch_name)
3627
vapiera7fbd5a2016-06-16 09:17:49 -07003628 print()
3629 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003630 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003631
rmistry@google.com2dd99862015-06-22 12:22:18 +00003632 def traverse_dependents_preorder(branch, padding=''):
3633 dependents_to_process = tracked_to_dependents.get(branch, [])
3634 padding += ' '
3635 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003636 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003637 dependents.append(dependent)
3638 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003639
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003641 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642
3643 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003644 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003645 return 0
3646
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003647 confirm_or_exit('This command will checkout all dependent branches and run '
3648 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003649
rmistry@google.com2dd99862015-06-22 12:22:18 +00003650 # Record all dependents that failed to upload.
3651 failures = {}
3652 # Go through all dependents, checkout the branch and upload.
3653 try:
3654 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003655 print()
3656 print('--------------------------------------')
3657 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003658 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003659 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660 try:
3661 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003662 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003663 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003664 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003665 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003666 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003667 finally:
3668 # Swap back to the original root branch.
3669 RunGit(['checkout', '-q', root_branch])
3670
vapiera7fbd5a2016-06-16 09:17:49 -07003671 print()
3672 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003673 for dependent_branch in dependents:
3674 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003675 print(' %s : %s' % (dependent_branch, upload_status))
3676 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003677
3678 return 0
3679
3680
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003681@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003682def CMDarchive(parser, args):
3683 """Archives and deletes branches associated with closed changelists."""
3684 parser.add_option(
3685 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003686 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003687 parser.add_option(
3688 '-f', '--force', action='store_true',
3689 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003690 parser.add_option(
3691 '-d', '--dry-run', action='store_true',
3692 help='Skip the branch tagging and removal steps.')
3693 parser.add_option(
3694 '-t', '--notags', action='store_true',
3695 help='Do not tag archived branches. '
3696 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003697
kmarshall3bff56b2016-06-06 18:31:47 -07003698 options, args = parser.parse_args(args)
3699 if args:
3700 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003701
3702 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3703 if not branches:
3704 return 0
3705
vapiera7fbd5a2016-06-16 09:17:49 -07003706 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003707 changes = [Changelist(branchref=b)
3708 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003709 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3710 statuses = get_cl_statuses(changes,
3711 fine_grained=True,
3712 max_processes=options.maxjobs)
3713 proposal = [(cl.GetBranch(),
3714 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3715 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003716 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003717 proposal.sort()
3718
3719 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003721 return 0
3722
3723 current_branch = GetCurrentBranch()
3724
vapiera7fbd5a2016-06-16 09:17:49 -07003725 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003726 if options.notags:
3727 for next_item in proposal:
3728 print(' ' + next_item[0])
3729 else:
3730 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3731 for next_item in proposal:
3732 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003733
kmarshall9249e012016-08-23 12:02:16 -07003734 # Quit now on precondition failure or if instructed by the user, either
3735 # via an interactive prompt or by command line flags.
3736 if options.dry_run:
3737 print('\nNo changes were made (dry run).\n')
3738 return 0
3739 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003740 print('You are currently on a branch \'%s\' which is associated with a '
3741 'closed codereview issue, so archive cannot proceed. Please '
3742 'checkout another branch and run this command again.' %
3743 current_branch)
3744 return 1
kmarshall9249e012016-08-23 12:02:16 -07003745 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003746 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3747 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003748 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003749 return 1
3750
3751 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003752 if not options.notags:
3753 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003754 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003755
vapiera7fbd5a2016-06-16 09:17:49 -07003756 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003757
3758 return 0
3759
3760
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003761@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003762def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003763 """Show status of changelists.
3764
3765 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003766 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003767 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003768 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003769 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003770 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003771 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003772 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003773
3774 Also see 'git cl comments'.
3775 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003776 parser.add_option(
3777 '--no-branch-color',
3778 action='store_true',
3779 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003780 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003781 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003782 parser.add_option('-f', '--fast', action='store_true',
3783 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003784 parser.add_option(
3785 '-j', '--maxjobs', action='store', type=int,
3786 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003787
iannuccie53c9352016-08-17 14:40:40 -07003788 _add_codereview_issue_select_options(
3789 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003790 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003791 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003792 if args:
3793 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003794
iannuccie53c9352016-08-17 14:40:40 -07003795 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003796 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003797
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003798 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003799 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003800 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003801 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003802 elif options.field == 'id':
3803 issueid = cl.GetIssue()
3804 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003805 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003806 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003807 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003808 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003810 elif options.field == 'status':
3811 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003812 elif options.field == 'url':
3813 url = cl.GetIssueURL()
3814 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003816 return 0
3817
3818 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3819 if not branches:
3820 print('No local branch found.')
3821 return 0
3822
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003823 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003824 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003825 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003827 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003828 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003829 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003830
Daniel McArdlea23bf592019-02-12 00:25:12 +00003831 current_branch = GetCurrentBranch()
3832
3833 def FormatBranchName(branch, colorize=False):
3834 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3835 an asterisk when it is the current branch."""
3836
3837 asterisk = ""
3838 color = Fore.RESET
3839 if branch == current_branch:
3840 asterisk = "* "
3841 color = Fore.GREEN
3842 branch_name = ShortBranchName(branch)
3843
3844 if colorize:
3845 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003846 return asterisk + branch_name
3847
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003848 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003849
3850 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003851 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3852 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003853 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003854 c, status = output.next()
3855 branch_statuses[c.GetBranch()] = status
3856 status = branch_statuses.pop(branch)
3857 url = cl.GetIssueURL()
3858 if url and (not status or status == 'error'):
3859 # The issue probably doesn't exist anymore.
3860 url += ' (broken)'
3861
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003862 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003863 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003864 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003865 color = ''
3866 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003867 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003868
Alan Cuttera3be9a52019-03-04 18:50:33 +00003869 branch_display = FormatBranchName(branch)
3870 padding = ' ' * (alignment - len(branch_display))
3871 if not options.no_branch_color:
3872 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003873
Alan Cuttera3be9a52019-03-04 18:50:33 +00003874 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3875 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003876
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003878 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003879 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003880 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003881 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003882 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003883 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003884 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003886 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print('Issue description:')
3888 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889 return 0
3890
3891
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003892def colorize_CMDstatus_doc():
3893 """To be called once in main() to add colors to git cl status help."""
3894 colors = [i for i in dir(Fore) if i[0].isupper()]
3895
3896 def colorize_line(line):
3897 for color in colors:
3898 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003899 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003900 indent = len(line) - len(line.lstrip(' ')) + 1
3901 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3902 return line
3903
3904 lines = CMDstatus.__doc__.splitlines()
3905 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3906
3907
phajdan.jre328cf92016-08-22 04:12:17 -07003908def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003909 if path == '-':
3910 json.dump(contents, sys.stdout)
3911 else:
3912 with open(path, 'w') as f:
3913 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003914
3915
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003916@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003917@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003918def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003919 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003920
3921 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003922 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003923 parser.add_option('-r', '--reverse', action='store_true',
3924 help='Lookup the branch(es) for the specified issues. If '
3925 'no issues are specified, all branches with mapped '
3926 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003927 parser.add_option('--json',
3928 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003929 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003930 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003931 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003932
dnj@chromium.org406c4402015-03-03 17:22:28 +00003933 if options.reverse:
3934 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003935 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003936 # Reverse issue lookup.
3937 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003938
3939 git_config = {}
3940 for config in RunGit(['config', '--get-regexp',
3941 r'branch\..*issue']).splitlines():
3942 name, _space, val = config.partition(' ')
3943 git_config[name] = val
3944
dnj@chromium.org406c4402015-03-03 17:22:28 +00003945 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003946 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3947 config_key = _git_branch_config_key(ShortBranchName(branch),
3948 cls.IssueConfigKey())
3949 issue = git_config.get(config_key)
3950 if issue:
3951 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003952 if not args:
3953 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003954 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003955 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003956 try:
3957 issue_num = int(issue)
3958 except ValueError:
3959 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003960 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003961 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003962 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003963 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003964 if options.json:
3965 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003966 return 0
3967
3968 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003969 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003970 if not issue.valid:
3971 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3972 'or no argument to list it.\n'
3973 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003974 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003975 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003976 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003977 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003978 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3979 if options.json:
3980 write_json(options.json, {
3981 'issue': cl.GetIssue(),
3982 'issue_url': cl.GetIssueURL(),
3983 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003984 return 0
3985
3986
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003987@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003988def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003989 """Shows or posts review comments for any changelist."""
3990 parser.add_option('-a', '--add-comment', dest='comment',
3991 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003992 parser.add_option('-p', '--publish', action='store_true',
3993 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003994 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003995 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003996 parser.add_option('-m', '--machine-readable', dest='readable',
3997 action='store_false', default=True,
3998 help='output comments in a format compatible with '
3999 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004000 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004001 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004002 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004003 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004004 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004005
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004006 issue = None
4007 if options.issue:
4008 try:
4009 issue = int(options.issue)
4010 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004011 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004012
Edward Lemur934836a2019-09-09 20:16:54 +00004013 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004014
4015 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004016 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004017 return 0
4018
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004019 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4020 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004021 for comment in summary:
4022 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004023 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004024 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004025 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004026 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004027 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004028 elif comment.autogenerated:
4029 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004030 else:
4031 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004032 print('\n%s%s %s%s\n%s' % (
4033 color,
4034 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4035 comment.sender,
4036 Fore.RESET,
4037 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4038
smut@google.comc85ac942015-09-15 16:34:43 +00004039 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004040 def pre_serialize(c):
4041 dct = c.__dict__.copy()
4042 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4043 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004044 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004045 return 0
4046
4047
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004048@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004049@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004050def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004051 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004052 parser.add_option('-d', '--display', action='store_true',
4053 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004054 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004055 help='New description to set for this issue (- for stdin, '
4056 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004057 parser.add_option('-f', '--force', action='store_true',
4058 help='Delete any unpublished Gerrit edits for this issue '
4059 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004060
4061 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004062 options, args = parser.parse_args(args)
4063 _process_codereview_select_options(parser, options)
4064
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004065 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004066 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004067 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004068 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004069 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004070
Edward Lemur934836a2019-09-09 20:16:54 +00004071 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004072 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004073 if target_issue_arg:
4074 kwargs['issue'] = target_issue_arg.issue
4075 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004076 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004077 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004078
4079 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004080 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004081 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004082 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004083
4084 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004085 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004086
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004087 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004088
smut@google.com34fb6b12015-07-13 20:03:26 +00004089 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004090 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004091 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004092
4093 if options.new_description:
4094 text = options.new_description
4095 if text == '-':
4096 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004097 elif text == '+':
4098 base_branch = cl.GetCommonAncestorWithUpstream()
4099 change = cl.GetChange(base_branch, None, local_description=True)
4100 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004101
4102 description.set_description(text)
4103 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004104 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004105 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004106 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004107 return 0
4108
4109
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004110@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004111def CMDlint(parser, args):
4112 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004113 parser.add_option('--filter', action='append', metavar='-x,+y',
4114 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004115 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004116
4117 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004118 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004119 try:
4120 import cpplint
4121 import cpplint_chromium
4122 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004124 return 1
4125
4126 # Change the current working directory before calling lint so that it
4127 # shows the correct base.
4128 previous_cwd = os.getcwd()
4129 os.chdir(settings.GetRoot())
4130 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004131 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004132 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4133 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004134 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004135 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004136 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004137
4138 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004139 command = args + files
4140 if options.filter:
4141 command = ['--filter=' + ','.join(options.filter)] + command
4142 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004143
4144 white_regex = re.compile(settings.GetLintRegex())
4145 black_regex = re.compile(settings.GetLintIgnoreRegex())
4146 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4147 for filename in filenames:
4148 if white_regex.match(filename):
4149 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004151 else:
4152 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4153 extra_check_functions)
4154 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004156 finally:
4157 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004158 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004159 if cpplint._cpplint_state.error_count != 0:
4160 return 1
4161 return 0
4162
4163
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004164@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004166 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004167 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004168 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004169 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004170 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004171 parser.add_option('--all', action='store_true',
4172 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004173 parser.add_option('--parallel', action='store_true',
4174 help='Run all tests specified by input_api.RunTests in all '
4175 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004176 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004177
sbc@chromium.org71437c02015-04-09 19:29:40 +00004178 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004179 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004180 return 1
4181
Edward Lemur934836a2019-09-09 20:16:54 +00004182 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004183 if args:
4184 base_branch = args[0]
4185 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004186 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004187 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188
Aaron Gable8076c282017-11-29 14:39:41 -08004189 if options.all:
4190 base_change = cl.GetChange(base_branch, None)
4191 files = [('M', f) for f in base_change.AllFiles()]
4192 change = presubmit_support.GitChange(
4193 base_change.Name(),
4194 base_change.FullDescriptionText(),
4195 base_change.RepositoryRoot(),
4196 files,
4197 base_change.issue,
4198 base_change.patchset,
4199 base_change.author_email,
4200 base_change._upstream)
4201 else:
4202 change = cl.GetChange(base_branch, None)
4203
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004204 cl.RunHook(
4205 committing=not options.upload,
4206 may_prompt=False,
4207 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004208 change=change,
4209 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004210 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004211
4212
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004213def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004214 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004215
4216 Works the same way as
4217 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4218 but can be called on demand on all platforms.
4219
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004220 The basic idea is to generate git hash of a state of the tree, original
4221 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004222 """
4223 lines = []
4224 tree_hash = RunGitSilent(['write-tree'])
4225 lines.append('tree %s' % tree_hash.strip())
4226 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4227 if code == 0:
4228 lines.append('parent %s' % parent.strip())
4229 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4230 lines.append('author %s' % author.strip())
4231 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4232 lines.append('committer %s' % committer.strip())
4233 lines.append('')
4234 # Note: Gerrit's commit-hook actually cleans message of some lines and
4235 # whitespace. This code is not doing this, but it clearly won't decrease
4236 # entropy.
4237 lines.append(message)
4238 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004239 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004240 return 'I%s' % change_hash.strip()
4241
4242
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004243def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004244 """Computes the remote branch ref to use for the CL.
4245
4246 Args:
4247 remote (str): The git remote for the CL.
4248 remote_branch (str): The git remote branch for the CL.
4249 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004250 """
4251 if not (remote and remote_branch):
4252 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004253
wittman@chromium.org455dc922015-01-26 20:15:50 +00004254 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004255 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004256 # refs, which are then translated into the remote full symbolic refs
4257 # below.
4258 if '/' not in target_branch:
4259 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4260 else:
4261 prefix_replacements = (
4262 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4263 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4264 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4265 )
4266 match = None
4267 for regex, replacement in prefix_replacements:
4268 match = re.search(regex, target_branch)
4269 if match:
4270 remote_branch = target_branch.replace(match.group(0), replacement)
4271 break
4272 if not match:
4273 # This is a branch path but not one we recognize; use as-is.
4274 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004275 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4276 # Handle the refs that need to land in different refs.
4277 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004278
wittman@chromium.org455dc922015-01-26 20:15:50 +00004279 # Create the true path to the remote branch.
4280 # Does the following translation:
4281 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4282 # * refs/remotes/origin/master -> refs/heads/master
4283 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4284 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4285 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4286 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4287 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4288 'refs/heads/')
4289 elif remote_branch.startswith('refs/remotes/branch-heads'):
4290 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004291
wittman@chromium.org455dc922015-01-26 20:15:50 +00004292 return remote_branch
4293
4294
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004295def cleanup_list(l):
4296 """Fixes a list so that comma separated items are put as individual items.
4297
4298 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4299 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4300 """
4301 items = sum((i.split(',') for i in l), [])
4302 stripped_items = (i.strip() for i in items)
4303 return sorted(filter(None, stripped_items))
4304
4305
Aaron Gable4db38df2017-11-03 14:59:07 -07004306@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004307@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004308def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004309 """Uploads the current changelist to codereview.
4310
4311 Can skip dependency patchset uploads for a branch by running:
4312 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004313 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004314 git config --unset branch.branch_name.skip-deps-uploads
4315 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004316
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004317 If the name of the checked out branch starts with "bug-" or "fix-" followed
4318 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004319 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004320
4321 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004322 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004323 [git-cl] add support for hashtags
4324 Foo bar: implement foo
4325 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004326 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004327 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4328 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004329 parser.add_option('--bypass-watchlists', action='store_true',
4330 dest='bypass_watchlists',
4331 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004332 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004333 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004334 parser.add_option('--message', '-m', dest='message',
4335 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004336 parser.add_option('-b', '--bug',
4337 help='pre-populate the bug number(s) for this issue. '
4338 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004339 parser.add_option('--message-file', dest='message_file',
4340 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004341 parser.add_option('--title', '-t', dest='title',
4342 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004343 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004344 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004345 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004346 parser.add_option('--tbrs',
4347 action='append', default=[],
4348 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004349 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004350 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004351 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004352 parser.add_option('--hashtag', dest='hashtags',
4353 action='append', default=[],
4354 help=('Gerrit hashtag for new CL; '
4355 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004356 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004357 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004358 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004359 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004360 metavar='TARGET',
4361 help='Apply CL to remote ref TARGET. ' +
4362 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004363 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004364 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004365 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004366 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004367 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004368 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004369 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4370 const='TBR', help='add a set of OWNERS to TBR')
4371 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4372 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004373 parser.add_option('-c', '--use-commit-queue', action='store_true',
4374 help='tell the CQ to commit this patchset; '
4375 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004376 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4377 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004378 help='Send the patchset to do a CQ dry run right after '
4379 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004380 parser.add_option('--preserve-tryjobs', action='store_true',
4381 help='instruct the CQ to let tryjobs running even after '
4382 'new patchsets are uploaded instead of canceling '
4383 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004384 parser.add_option('--dependencies', action='store_true',
4385 help='Uploads CLs of all the local branches that depend on '
4386 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004387 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4388 help='Sends your change to the CQ after an approval. Only '
4389 'works on repos that have the Auto-Submit label '
4390 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004391 parser.add_option('--parallel', action='store_true',
4392 help='Run all tests specified by input_api.RunTests in all '
4393 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004394
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004395 parser.add_option('--no-autocc', action='store_true',
4396 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004397 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004398 help='Set the review private. This implies --no-autocc.')
4399
rmistry@google.com2dd99862015-06-22 12:22:18 +00004400 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004401 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004402 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004403 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004404
sbc@chromium.org71437c02015-04-09 19:29:40 +00004405 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004406 return 1
4407
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004408 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004409 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004410 options.cc = cleanup_list(options.cc)
4411
tandriib80458a2016-06-23 12:20:07 -07004412 if options.message_file:
4413 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004414 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004415 options.message = gclient_utils.FileRead(options.message_file)
4416 options.message_file = None
4417
tandrii4d0545a2016-07-06 03:56:49 -07004418 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004419 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004420
Aaron Gableedbc4132017-09-11 13:22:28 -07004421 if options.use_commit_queue:
4422 options.send_mail = True
4423
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004424 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4425 settings.GetIsGerrit()
4426
Edward Lemur934836a2019-09-09 20:16:54 +00004427 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004428
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004429 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004430
4431
Francois Dorayd42c6812017-05-30 15:10:20 -04004432@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004433@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004434def CMDsplit(parser, args):
4435 """Splits a branch into smaller branches and uploads CLs.
4436
4437 Creates a branch and uploads a CL for each group of files modified in the
4438 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004439 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004440 the shared OWNERS file.
4441 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004442 parser.add_option('-d', '--description', dest='description_file',
4443 help='A text file containing a CL description in which '
4444 '$directory will be replaced by each CL\'s directory.')
4445 parser.add_option('-c', '--comment', dest='comment_file',
4446 help='A text file containing a CL comment.')
4447 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004448 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004449 help='List the files and reviewers for each CL that would '
4450 'be created, but don\'t create branches or CLs.')
4451 parser.add_option('--cq-dry-run', action='store_true',
4452 help='If set, will do a cq dry run for each uploaded CL. '
4453 'Please be careful when doing this; more than ~10 CLs '
4454 'has the potential to overload our build '
4455 'infrastructure. Try to upload these not during high '
4456 'load times (usually 11-3 Mountain View time). Email '
4457 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004458 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4459 default=True,
4460 help='Sends your change to the CQ after an approval. Only '
4461 'works on repos that have the Auto-Submit label '
4462 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004463 options, _ = parser.parse_args(args)
4464
4465 if not options.description_file:
4466 parser.error('No --description flag specified.')
4467
4468 def WrappedCMDupload(args):
4469 return CMDupload(OptionParser(), args)
4470
4471 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004472 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004473 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004474
4475
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004476@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004477@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004479 """DEPRECATED: Used to commit the current changelist via git-svn."""
4480 message = ('git-cl no longer supports committing to SVN repositories via '
4481 'git-svn. You probably want to use `git cl land` instead.')
4482 print(message)
4483 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004484
4485
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004486@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004487@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004488def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004489 """Commits the current changelist via git.
4490
4491 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4492 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004493 """
4494 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4495 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004496 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004497 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004498 parser.add_option('--parallel', action='store_true',
4499 help='Run all tests specified by input_api.RunTests in all '
4500 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004501 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004502
Edward Lemur934836a2019-09-09 20:16:54 +00004503 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004504
Robert Iannucci2e73d432018-03-14 01:10:47 -07004505 if not cl.GetIssue():
4506 DieWithError('You must upload the change first to Gerrit.\n'
4507 ' If you would rather have `git cl land` upload '
4508 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004509 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004510 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004511
4512
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004513@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004514@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004515def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004516 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004517 parser.add_option('-b', dest='newbranch',
4518 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004519 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004520 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004521 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004522 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004523
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004524 group = optparse.OptionGroup(
4525 parser,
4526 'Options for continuing work on the current issue uploaded from a '
4527 'different clone (e.g. different machine). Must be used independently '
4528 'from the other options. No issue number should be specified, and the '
4529 'branch must have an issue number associated with it')
4530 group.add_option('--reapply', action='store_true', dest='reapply',
4531 help='Reset the branch and reapply the issue.\n'
4532 'CAUTION: This will undo any local changes in this '
4533 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004534
4535 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004536 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004537 parser.add_option_group(group)
4538
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004539 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004540 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004541 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004542
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004543 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004544 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004545 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004546 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004547 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004548
Edward Lemur934836a2019-09-09 20:16:54 +00004549 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004550 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004551 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004552
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004553 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004554 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004555 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004556
4557 RunGit(['reset', '--hard', upstream])
4558 if options.pull:
4559 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004560
Edward Lemurf38bc172019-09-03 21:02:13 +00004561 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004562
4563 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004564 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004565
Edward Lemurf38bc172019-09-03 21:02:13 +00004566 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004567 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004568 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004569
4570 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004571 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004572 }
4573 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004574 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004575 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004576 cl_kwargs['issue'] = target_issue_arg.issue
4577
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004578 # We don't want uncommitted changes mixed up with the patch.
4579 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004580 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004582 if options.newbranch:
4583 if options.force:
4584 RunGit(['branch', '-D', options.newbranch],
4585 stderr=subprocess2.PIPE, error_ok=True)
4586 RunGit(['new-branch', options.newbranch])
4587
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004588 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004589
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004590 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004591 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004592
Edward Lemurf38bc172019-09-03 21:02:13 +00004593 return cl.CMDPatchWithParsedIssue(
4594 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004595
4596
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004597def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598 """Fetches the tree status and returns either 'open', 'closed',
4599 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004600 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004601 if url:
4602 status = urllib2.urlopen(url).read().lower()
4603 if status.find('closed') != -1 or status == '0':
4604 return 'closed'
4605 elif status.find('open') != -1 or status == '1':
4606 return 'open'
4607 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 return 'unset'
4609
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004610
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611def GetTreeStatusReason():
4612 """Fetches the tree status from a json url and returns the message
4613 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004614 url = settings.GetTreeStatusUrl()
4615 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616 connection = urllib2.urlopen(json_url)
4617 status = json.loads(connection.read())
4618 connection.close()
4619 return status['message']
4620
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004621
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004622@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004624 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004625 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 status = GetTreeStatus()
4627 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004628 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629 return 2
4630
vapiera7fbd5a2016-06-16 09:17:49 -07004631 print('The tree is %s' % status)
4632 print()
4633 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 if status != 'open':
4635 return 1
4636 return 0
4637
4638
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004639@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004640def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004641 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4642 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004643 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004644 '-b', '--bot', action='append',
4645 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4646 'times to specify multiple builders. ex: '
4647 '"-b win_rel -b win_layout". See '
4648 'the try server waterfall for the builders name and the tests '
4649 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004650 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004651 '-B', '--bucket', default='',
4652 help=('Buildbucket bucket to send the try requests.'))
4653 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004654 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004655 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004656 'be determined by the try recipe that builder runs, which usually '
4657 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004658 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004659 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004660 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004661 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004662 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004663 '--category', default='git_cl_try', help='Specify custom build category.')
4664 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004665 '--project',
4666 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004667 'in recipe to determine to which repository or directory to '
4668 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004669 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004670 '-p', '--property', dest='properties', action='append', default=[],
4671 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004672 'key2=value2 etc. The value will be treated as '
4673 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004674 'NOTE: using this may make your tryjob not usable for CQ, '
4675 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004676 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004677 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4678 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004679 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004680 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004681 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004682 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004683 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004684 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004685
machenbach@chromium.org45453142015-09-15 08:45:22 +00004686 # Make sure that all properties are prop=value pairs.
4687 bad_params = [x for x in options.properties if '=' not in x]
4688 if bad_params:
4689 parser.error('Got properties with missing "=": %s' % bad_params)
4690
maruel@chromium.org15192402012-09-06 12:38:29 +00004691 if args:
4692 parser.error('Unknown arguments: %s' % args)
4693
Edward Lemur934836a2019-09-09 20:16:54 +00004694 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004695 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004696 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004697
Edward Lemurf38bc172019-09-03 21:02:13 +00004698 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004699 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004700
tandriie113dfd2016-10-11 10:20:12 -07004701 error_message = cl.CannotTriggerTryJobReason()
4702 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004703 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004704
qyearsley1fdfcb62016-10-24 13:22:03 -07004705 buckets = _get_bucket_map(cl, options, parser)
Edward Lemurc8b67ed2019-09-12 20:28:58 +00004706 if buckets and any(b.startswith('master.') for b in buckets):
4707 print('ERROR: Buildbot masters are not supported.')
4708 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004709
qyearsleydd49f942016-10-28 11:57:22 -07004710 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4711 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004712 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004713 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004714 print('git cl try with no bots now defaults to CQ dry run.')
4715 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4716 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004717
borenet6c0efe62016-10-19 08:13:29 -07004718 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004719 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004720 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004721 'of bot requires an initial job from a parent (usually a builder). '
4722 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004723 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004724 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004725
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004726 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004727 try:
4728 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4729 except BuildbucketResponseException as ex:
4730 print('ERROR: %s' % ex)
4731 return 1
4732 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004733
4734
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004735@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004736def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004737 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004738 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004739 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004740 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004741 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004742 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004743 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004744 '--color', action='store_true', default=setup_color.IS_TTY,
4745 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004746 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004747 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4748 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004749 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004750 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004751 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752 parser.add_option_group(group)
4753 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004754 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004755 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004756 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004757 if args:
4758 parser.error('Unrecognized args: %s' % ' '.join(args))
4759
4760 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004761 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004762 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004763 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004764
tandrii221ab252016-10-06 08:12:04 -07004765 patchset = options.patchset
4766 if not patchset:
4767 patchset = cl.GetMostRecentPatchset()
4768 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004769 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004770 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004771 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004772 cl.GetIssue())
4773
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004774 try:
tandrii221ab252016-10-06 08:12:04 -07004775 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004776 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004777 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004778 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004779 if options.json:
4780 write_try_results_json(options.json, jobs)
4781 else:
4782 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004783 return 0
4784
4785
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004786@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004787@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004788def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004789 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004790 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004791 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004792 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004793
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004794 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004795 if args:
4796 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004797 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004798 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004799 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004800 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004801
4802 # Clear configured merge-base, if there is one.
4803 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004804 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004805 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004806 return 0
4807
4808
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004809@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004810def CMDweb(parser, args):
4811 """Opens the current CL in the web browser."""
4812 _, args = parser.parse_args(args)
4813 if args:
4814 parser.error('Unrecognized args: %s' % ' '.join(args))
4815
4816 issue_url = Changelist().GetIssueURL()
4817 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004818 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004819 return 1
4820
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004821 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004822 # allows us to hide the "Created new window in existing browser session."
4823 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004824 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004825 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004826 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004827 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004828 os.open(os.devnull, os.O_RDWR)
4829 try:
4830 webbrowser.open(issue_url)
4831 finally:
4832 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004833 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004834 return 0
4835
4836
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004837@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004838def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004839 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004840 parser.add_option('-d', '--dry-run', action='store_true',
4841 help='trigger in dry run mode')
4842 parser.add_option('-c', '--clear', action='store_true',
4843 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004844 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004845 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004846 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004847 if args:
4848 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004849 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004850 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004851
Edward Lemur934836a2019-09-09 20:16:54 +00004852 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004853 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004854 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004855 elif options.dry_run:
4856 state = _CQState.DRY_RUN
4857 else:
4858 state = _CQState.COMMIT
4859 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004860 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004861 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004862 return 0
4863
4864
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004865@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004866def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004867 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004868 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004869 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004870 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004871 if args:
4872 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004873 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004874 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004875 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004876 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004877 cl.CloseIssue()
4878 return 0
4879
4880
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004881@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004882def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004883 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004884 parser.add_option(
4885 '--stat',
4886 action='store_true',
4887 dest='stat',
4888 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004889 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004890 if args:
4891 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004892
Edward Lemur934836a2019-09-09 20:16:54 +00004893 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004894 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004895 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004896 if not issue:
4897 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004898
Aaron Gablea718c3e2017-08-28 17:47:28 -07004899 base = cl._GitGetBranchConfigValue('last-upload-hash')
4900 if not base:
4901 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4902 if not base:
4903 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4904 revision_info = detail['revisions'][detail['current_revision']]
4905 fetch_info = revision_info['fetch']['http']
4906 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4907 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004908
Aaron Gablea718c3e2017-08-28 17:47:28 -07004909 cmd = ['git', 'diff']
4910 if options.stat:
4911 cmd.append('--stat')
4912 cmd.append(base)
4913 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004914
4915 return 0
4916
4917
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004918@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004919def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004920 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004921 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004922 '--ignore-current',
4923 action='store_true',
4924 help='Ignore the CL\'s current reviewers and start from scratch.')
4925 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004926 '--ignore-self',
4927 action='store_true',
4928 help='Do not consider CL\'s author as an owners.')
4929 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004930 '--no-color',
4931 action='store_true',
4932 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004933 parser.add_option(
4934 '--batch',
4935 action='store_true',
4936 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004937 # TODO: Consider moving this to another command, since other
4938 # git-cl owners commands deal with owners for a given CL.
4939 parser.add_option(
4940 '--show-all',
4941 action='store_true',
4942 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004943 options, args = parser.parse_args(args)
4944
4945 author = RunGit(['config', 'user.email']).strip() or None
4946
Edward Lemur934836a2019-09-09 20:16:54 +00004947 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004948
Yang Guo6e269a02019-06-26 11:17:02 +00004949 if options.show_all:
4950 for arg in args:
4951 base_branch = cl.GetCommonAncestorWithUpstream()
4952 change = cl.GetChange(base_branch, None)
4953 database = owners.Database(change.RepositoryRoot(), file, os.path)
4954 database.load_data_needed_for([arg])
4955 print('Owners for %s:' % arg)
4956 for owner in sorted(database.all_possible_owners([arg], None)):
4957 print(' - %s' % owner)
4958 return 0
4959
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004960 if args:
4961 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004962 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004963 base_branch = args[0]
4964 else:
4965 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004966 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004967
4968 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004969 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4970
4971 if options.batch:
4972 db = owners.Database(change.RepositoryRoot(), file, os.path)
4973 print('\n'.join(db.reviewers_for(affected_files, author)))
4974 return 0
4975
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004976 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004977 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004978 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004979 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004980 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004981 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004982 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004983 override_files=change.OriginalOwnersFiles(),
4984 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004985
4986
Aiden Bennerc08566e2018-10-03 17:52:42 +00004987def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004988 """Generates a diff command."""
4989 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004990 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4991
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004992 if allow_prefix:
4993 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4994 # case that diff.noprefix is set in the user's git config.
4995 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4996 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004997 diff_cmd += ['--no-prefix']
4998
4999 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005000
5001 if args:
5002 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005003 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005004 diff_cmd.append(arg)
5005 else:
5006 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005007
5008 return diff_cmd
5009
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005010
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005011def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005012 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005013 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005014
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005015
enne@chromium.org555cfe42014-01-29 18:21:39 +00005016@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005017@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005018def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005019 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005020 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005021 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005022 parser.add_option('--full', action='store_true',
5023 help='Reformat the full content of all touched files')
5024 parser.add_option('--dry-run', action='store_true',
5025 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005026 parser.add_option(
5027 '--python',
5028 action='store_true',
5029 default=None,
5030 help='Enables python formatting on all python files.')
5031 parser.add_option(
5032 '--no-python',
5033 action='store_true',
5034 dest='python',
5035 help='Disables python formatting on all python files. '
5036 'Takes precedence over --python. '
5037 'If neither --python or --no-python are set, python '
5038 'files that have a .style.yapf file in an ancestor '
5039 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005040 parser.add_option('--js', action='store_true',
5041 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005042 parser.add_option('--diff', action='store_true',
5043 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005044 parser.add_option('--presubmit', action='store_true',
5045 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005046 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005047
Daniel Chengc55eecf2016-12-30 03:11:02 -08005048 # Normalize any remaining args against the current path, so paths relative to
5049 # the current directory are still resolved as expected.
5050 args = [os.path.join(os.getcwd(), arg) for arg in args]
5051
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005052 # git diff generates paths against the root of the repository. Change
5053 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005054 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005055 if rel_base_path:
5056 os.chdir(rel_base_path)
5057
digit@chromium.org29e47272013-05-17 17:01:46 +00005058 # Grab the merge-base commit, i.e. the upstream commit of the current
5059 # branch when it was created or the last time it was rebased. This is
5060 # to cover the case where the user may have called "git fetch origin",
5061 # moving the origin branch to a newer commit, but hasn't rebased yet.
5062 upstream_commit = None
5063 cl = Changelist()
5064 upstream_branch = cl.GetUpstreamBranch()
5065 if upstream_branch:
5066 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5067 upstream_commit = upstream_commit.strip()
5068
5069 if not upstream_commit:
5070 DieWithError('Could not find base commit for this branch. '
5071 'Are you in detached state?')
5072
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005073 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5074 diff_output = RunGit(changed_files_cmd)
5075 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005076 # Filter out files deleted by this CL
5077 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005078
Christopher Lamc5ba6922017-01-24 11:19:14 +11005079 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005080 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005081
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005082 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5083 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5084 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005085 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005086
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005087 top_dir = os.path.normpath(
5088 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5089
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005090 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5091 # formatted. This is used to block during the presubmit.
5092 return_value = 0
5093
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005094 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005095 # Locate the clang-format binary in the checkout
5096 try:
5097 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005098 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005099 DieWithError(e)
5100
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005101 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005102 cmd = [clang_format_tool]
5103 if not opts.dry_run and not opts.diff:
5104 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005105 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005106 if opts.diff:
5107 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005108 else:
5109 env = os.environ.copy()
5110 env['PATH'] = str(os.path.dirname(clang_format_tool))
5111 try:
5112 script = clang_format.FindClangFormatScriptInChromiumTree(
5113 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005114 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005115 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005116
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005117 cmd = [sys.executable, script, '-p0']
5118 if not opts.dry_run and not opts.diff:
5119 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005120
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005121 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5122 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005123
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005124 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5125 if opts.diff:
5126 sys.stdout.write(stdout)
5127 if opts.dry_run and len(stdout) > 0:
5128 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005129
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005130 # Similar code to above, but using yapf on .py files rather than clang-format
5131 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005132 py_explicitly_disabled = opts.python is not None and not opts.python
5133 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005134 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5135 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5136 if sys.platform.startswith('win'):
5137 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005138
Aiden Bennerc08566e2018-10-03 17:52:42 +00005139 # If we couldn't find a yapf file we'll default to the chromium style
5140 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005141 chromium_default_yapf_style = os.path.join(depot_tools_path,
5142 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005143 # Used for caching.
5144 yapf_configs = {}
5145 for f in python_diff_files:
5146 # Find the yapf style config for the current file, defaults to depot
5147 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005148 _FindYapfConfigFile(f, yapf_configs, top_dir)
5149
5150 # Turn on python formatting by default if a yapf config is specified.
5151 # This breaks in the case of this repo though since the specified
5152 # style file is also the global default.
5153 if opts.python is None:
5154 filtered_py_files = []
5155 for f in python_diff_files:
5156 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5157 filtered_py_files.append(f)
5158 else:
5159 filtered_py_files = python_diff_files
5160
5161 # Note: yapf still seems to fix indentation of the entire file
5162 # even if line ranges are specified.
5163 # See https://github.com/google/yapf/issues/499
5164 if not opts.full and filtered_py_files:
5165 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5166
5167 for f in filtered_py_files:
5168 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5169 if yapf_config is None:
5170 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005171
5172 cmd = [yapf_tool, '--style', yapf_config, f]
5173
5174 has_formattable_lines = False
5175 if not opts.full:
5176 # Only run yapf over changed line ranges.
5177 for diff_start, diff_len in py_line_diffs[f]:
5178 diff_end = diff_start + diff_len - 1
5179 # Yapf errors out if diff_end < diff_start but this
5180 # is a valid line range diff for a removal.
5181 if diff_end >= diff_start:
5182 has_formattable_lines = True
5183 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5184 # If all line diffs were removals we have nothing to format.
5185 if not has_formattable_lines:
5186 continue
5187
5188 if opts.diff or opts.dry_run:
5189 cmd += ['--diff']
5190 # Will return non-zero exit code if non-empty diff.
5191 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5192 if opts.diff:
5193 sys.stdout.write(stdout)
5194 elif len(stdout) > 0:
5195 return_value = 2
5196 else:
5197 cmd += ['-i']
5198 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005199
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005200 # Dart's formatter does not have the nice property of only operating on
5201 # modified chunks, so hard code full.
5202 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005203 try:
5204 command = [dart_format.FindDartFmtToolInChromiumTree()]
5205 if not opts.dry_run and not opts.diff:
5206 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005207 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005208
ppi@chromium.org6593d932016-03-03 15:41:15 +00005209 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005210 if opts.dry_run and stdout:
5211 return_value = 2
5212 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005213 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5214 'found in this checkout. Files in other languages are still '
5215 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005216
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005217 # Format GN build files. Always run on full build files for canonical form.
5218 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005219 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005220 if opts.dry_run or opts.diff:
5221 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005222 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005223 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5224 shell=sys.platform == 'win32',
5225 cwd=top_dir)
5226 if opts.dry_run and gn_ret == 2:
5227 return_value = 2 # Not formatted.
5228 elif opts.diff and gn_ret == 2:
5229 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005230 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005231 elif gn_ret != 0:
5232 # For non-dry run cases (and non-2 return values for dry-run), a
5233 # nonzero error code indicates a failure, probably because the file
5234 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005235 DieWithError('gn format failed on ' + gn_diff_file +
5236 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005237
Ilya Shermane081cbe2017-08-15 17:51:04 -07005238 # Skip the metrics formatting from the global presubmit hook. These files have
5239 # a separate presubmit hook that issues an error if the files need formatting,
5240 # whereas the top-level presubmit script merely issues a warning. Formatting
5241 # these files is somewhat slow, so it's important not to duplicate the work.
5242 if not opts.presubmit:
5243 for xml_dir in GetDirtyMetricsDirs(diff_files):
5244 tool_dir = os.path.join(top_dir, xml_dir)
5245 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5246 if opts.dry_run or opts.diff:
5247 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005248 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005249 if opts.diff:
5250 sys.stdout.write(stdout)
5251 if opts.dry_run and stdout:
5252 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005253
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005254 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005255
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005256
Steven Holte2e664bf2017-04-21 13:10:47 -07005257def GetDirtyMetricsDirs(diff_files):
5258 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5259 metrics_xml_dirs = [
5260 os.path.join('tools', 'metrics', 'actions'),
5261 os.path.join('tools', 'metrics', 'histograms'),
5262 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005263 os.path.join('tools', 'metrics', 'ukm'),
5264 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005265 for xml_dir in metrics_xml_dirs:
5266 if any(file.startswith(xml_dir) for file in xml_diff_files):
5267 yield xml_dir
5268
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005269
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005270@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005271@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005272def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005273 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005274 _, args = parser.parse_args(args)
5275
5276 if len(args) != 1:
5277 parser.print_help()
5278 return 1
5279
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005280 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005281 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005282 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005283
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005284 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005285
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005286 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005287 output = RunGit(['config', '--local', '--get-regexp',
5288 r'branch\..*\.%s' % issueprefix],
5289 error_ok=True)
5290 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005291 if issue == target_issue:
5292 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005293
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005294 branches = []
5295 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005296 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005297 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005298 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005299 return 1
5300 if len(branches) == 1:
5301 RunGit(['checkout', branches[0]])
5302 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005303 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005304 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005305 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005306 which = raw_input('Choose by index: ')
5307 try:
5308 RunGit(['checkout', branches[int(which)]])
5309 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005310 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005311 return 1
5312
5313 return 0
5314
5315
maruel@chromium.org29404b52014-09-08 22:58:00 +00005316def CMDlol(parser, args):
5317 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005318 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005319 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5320 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5321 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005322 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005323 return 0
5324
5325
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005326class OptionParser(optparse.OptionParser):
5327 """Creates the option parse and add --verbose support."""
5328 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005329 optparse.OptionParser.__init__(
5330 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005331 self.add_option(
5332 '-v', '--verbose', action='count', default=0,
5333 help='Use 2 times for more debugging info')
5334
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005335 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005336 try:
5337 return self._parse_args(args)
5338 finally:
5339 # Regardless of success or failure of args parsing, we want to report
5340 # metrics, but only after logging has been initialized (if parsing
5341 # succeeded).
5342 global settings
5343 settings = Settings()
5344
5345 if not metrics.DISABLE_METRICS_COLLECTION:
5346 # GetViewVCUrl ultimately calls logging method.
5347 project_url = settings.GetViewVCUrl().strip('/+')
5348 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5349 metrics.collector.add('project_urls', [project_url])
5350
5351 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005352 # Create an optparse.Values object that will store only the actual passed
5353 # options, without the defaults.
5354 actual_options = optparse.Values()
5355 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5356 # Create an optparse.Values object with the default options.
5357 options = optparse.Values(self.get_default_values().__dict__)
5358 # Update it with the options passed by the user.
5359 options._update_careful(actual_options.__dict__)
5360 # Store the options passed by the user in an _actual_options attribute.
5361 # We store only the keys, and not the values, since the values can contain
5362 # arbitrary information, which might be PII.
5363 metrics.collector.add('arguments', actual_options.__dict__.keys())
5364
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005365 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005366 logging.basicConfig(
5367 level=levels[min(options.verbose, len(levels) - 1)],
5368 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5369 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005370
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005371 return options, args
5372
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005373
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005374def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005375 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005376 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005377 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005378 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005379
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005380 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005381 dispatcher = subcommand.CommandDispatcher(__name__)
5382 try:
5383 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005384 except auth.AuthenticationError as e:
5385 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005386 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005387 if e.code != 500:
5388 raise
5389 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005390 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005391 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005392 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005393
5394
5395if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005396 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5397 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005398 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005399 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005400 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005401 sys.exit(main(sys.argv[1:]))