blob: 3ddb9d14c608c31f154e9242aa3759ba76869fba [file] [log] [blame]
Edward Lesmes98eda3f2019-08-12 21:09:53 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000017import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000038from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000039from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000040import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000041import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000042import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000043import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000044import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000045import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000047import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000048import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000049import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000050import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000051import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000052import presubmit_support
53import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000054import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040055import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000056import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000057import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import watchlists
59
tandrii7400cf02016-06-21 08:48:07 -070060__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061
Edward Lemur0f58ae42019-04-30 17:24:12 +000062# Traces for git push will be stored in a traces directory inside the
63# depot_tools checkout.
64DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
65TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
66
67# When collecting traces, Git hashes will be reduced to 6 characters to reduce
68# the size after compression.
69GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
70# Used to redact the cookies from the gitcookies file.
71GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
72
Edward Lemurd4d1ba42019-09-20 21:46:37 +000073MAX_ATTEMPTS = 3
74
Edward Lemur1b52d872019-05-09 21:12:12 +000075# The maximum number of traces we will keep. Multiplied by 3 since we store
76# 3 files per trace.
77MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000078# Message to be displayed to the user to inform where to find the traces for a
79# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000080TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000081'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000082'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000083' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000084'Copies of your gitcookies file and git config have been recorded at:\n'
85' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000086# Format of the message to be stored as part of the traces to give developers a
87# better context when they go through traces.
88TRACES_README_FORMAT = (
89'Date: %(now)s\n'
90'\n'
91'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
92'Title: %(title)s\n'
93'\n'
94'%(description)s\n'
95'\n'
96'Execution time: %(execution_time)s\n'
97'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000098
tandrii9d2c7a32016-06-22 03:42:45 -070099COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800100POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000101DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000102REFS_THAT_ALIAS_TO_OTHER_REFS = {
103 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
104 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
105}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000106
thestig@chromium.org44202a22014-03-11 19:22:18 +0000107# Valid extensions for files we want to lint.
108DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
109DEFAULT_LINT_IGNORE_REGEX = r"$^"
110
Aiden Bennerc08566e2018-10-03 17:52:42 +0000111# File name for yapf style config files.
112YAPF_CONFIG_FILENAME = '.style.yapf'
113
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000114# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000115Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000116
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000117# Initialized in main()
118settings = None
119
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100120# Used by tests/git_cl_test.py to add extra logging.
121# Inside the weirdly failing test, add this:
122# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700123# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100124_IS_BEING_TESTED = False
125
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000126
Christopher Lamf732cd52017-01-24 12:40:11 +1100127def DieWithError(message, change_desc=None):
128 if change_desc:
129 SaveDescriptionBackup(change_desc)
130
vapiera7fbd5a2016-06-16 09:17:49 -0700131 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132 sys.exit(1)
133
134
Christopher Lamf732cd52017-01-24 12:40:11 +1100135def SaveDescriptionBackup(change_desc):
136 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000137 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100138 backup_file = open(backup_path, 'w')
139 backup_file.write(change_desc.description)
140 backup_file.close()
141
142
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000143def GetNoGitPagerEnv():
144 env = os.environ.copy()
145 # 'cat' is a magical git string that disables pagers on all platforms.
146 env['GIT_PAGER'] = 'cat'
147 return env
148
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000149
bsep@chromium.org627d9002016-04-29 00:00:52 +0000150def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000151 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000152 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000153 except subprocess2.CalledProcessError as e:
154 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000155 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000157 'Command "%s" failed.\n%s' % (
158 ' '.join(args), error_message or e.stdout or ''))
159 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160
161
162def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000164 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000167def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700169 if suppress_stderr:
170 stderr = subprocess2.VOID
171 else:
172 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000173 try:
tandrii5d48c322016-08-18 16:19:37 -0700174 (out, _), code = subprocess2.communicate(['git'] + args,
175 env=GetNoGitPagerEnv(),
176 stdout=subprocess2.PIPE,
177 stderr=stderr)
178 return code, out
179 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900180 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700181 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000182
183
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000184def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000185 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000186 return RunGitWithCode(args, suppress_stderr=True)[1]
187
188
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000189def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000190 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000191 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000192 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000193 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194
195
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000196def BranchExists(branch):
197 """Return True if specified branch exists."""
198 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
199 suppress_stderr=True)
200 return not code
201
202
tandrii2a16b952016-10-19 07:09:44 -0700203def time_sleep(seconds):
204 # Use this so that it can be mocked in tests without interfering with python
205 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700206 return time.sleep(seconds)
207
208
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000209def time_time():
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
212 return time.time()
213
214
Edward Lemur1b52d872019-05-09 21:12:12 +0000215def datetime_now():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return datetime.datetime.now()
219
220
maruel@chromium.org90541732011-04-01 17:54:18 +0000221def ask_for_data(prompt):
222 try:
223 return raw_input(prompt)
224 except KeyboardInterrupt:
225 # Hide the exception.
226 sys.exit(1)
227
228
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100229def confirm_or_exit(prefix='', action='confirm'):
230 """Asks user to press enter to continue or press Ctrl+C to abort."""
231 if not prefix or prefix.endswith('\n'):
232 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100233 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234 mid = ' Press'
235 elif prefix.endswith(' '):
236 mid = 'press'
237 else:
238 mid = ' press'
239 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
240
241
242def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000243 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
245 while True:
246 if 'yes'.startswith(result):
247 return True
248 if 'no'.startswith(result):
249 return False
250 result = ask_for_data('Please, type yes or no: ').lower()
251
252
tandrii5d48c322016-08-18 16:19:37 -0700253def _git_branch_config_key(branch, key):
254 """Helper method to return Git config key for a branch."""
255 assert branch, 'branch name is required to set git config for it'
256 return 'branch.%s.%s' % (branch, key)
257
258
259def _git_get_branch_config_value(key, default=None, value_type=str,
260 branch=False):
261 """Returns git config value of given or current branch if any.
262
263 Returns default in all other cases.
264 """
265 assert value_type in (int, str, bool)
266 if branch is False: # Distinguishing default arg value from None.
267 branch = GetCurrentBranch()
268
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000269 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700270 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000271
tandrii5d48c322016-08-18 16:19:37 -0700272 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700273 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700274 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000275 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 args.append(_git_branch_config_key(branch, key))
278 code, out = RunGitWithCode(args)
279 if code == 0:
280 value = out.strip()
281 if value_type == int:
282 return int(value)
283 if value_type == bool:
284 return bool(value.lower() == 'true')
285 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000286 return default
287
288
tandrii5d48c322016-08-18 16:19:37 -0700289def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000290 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700291
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000292 If value is None, the key will be unset, otherwise it will be set.
293 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700294 """
295 if not branch:
296 branch = GetCurrentBranch()
297 assert branch, 'a branch name OR currently checked out branch is required'
298 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700299 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700300 if value is None:
301 args.append('--unset')
302 elif isinstance(value, bool):
303 args.append('--bool')
304 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700305 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000306 # `git config` also has --int, but apparently git config suffers from
307 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700308 value = str(value)
309 args.append(_git_branch_config_key(branch, key))
310 if value is not None:
311 args.append(value)
312 RunGit(args, **kwargs)
313
314
machenbach@chromium.org45453142015-09-15 08:45:22 +0000315def _get_properties_from_options(options):
316 properties = dict(x.split('=', 1) for x in options.properties)
317 for key, val in properties.iteritems():
318 try:
319 properties[key] = json.loads(val)
320 except ValueError:
321 pass # If a value couldn't be evaluated, treat it as a string.
322 return properties
323
324
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325# TODO(crbug.com/976104): Remove this function once git-cl try-results has
326# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000327def _buildbucket_retry(operation_name, http, *args, **kwargs):
328 """Retries requests to buildbucket service and returns parsed json content."""
329 try_count = 0
330 while True:
331 response, content = http.request(*args, **kwargs)
332 try:
333 content_json = json.loads(content)
334 except ValueError:
335 content_json = None
336
337 # Buildbucket could return an error even if status==200.
338 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000339 error = content_json.get('error')
340 if error.get('code') == 403:
341 raise BuildbucketResponseException(
342 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000343 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000344 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000345 raise BuildbucketResponseException(msg)
346
347 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700348 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000349 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000350 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700351 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000352 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000353 content)
354 return content_json
355 if response.status < 500 or try_count >= 2:
356 raise httplib2.HttpLib2Error(content)
357
358 # status >= 500 means transient failures.
359 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000360 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000361 try_count += 1
362 assert False, 'unreachable'
363
364
Edward Lemur4c707a22019-09-24 21:13:43 +0000365def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000366 """Calls a buildbucket v2 method and returns the parsed json response."""
367 headers = {
368 'Accept': 'application/json',
369 'Content-Type': 'application/json',
370 }
371 request = json.dumps(request)
372 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
373
374 logging.info('POST %s with %s' % (url, request))
375
376 attempts = 1
377 time_to_sleep = 1
378 while True:
379 response, content = http.request(url, 'POST', body=request, headers=headers)
380 if response.status == 200:
381 return json.loads(content[4:])
382 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
383 msg = '%s error when calling POST %s with %s: %s' % (
384 response.status, url, request, content)
385 raise BuildbucketResponseException(msg)
386 logging.debug(
387 '%s error when calling POST %s with %s. '
388 'Sleeping for %d seconds and retrying...' % (
389 response.status, url, request, time_to_sleep))
390 time.sleep(time_to_sleep)
391 time_to_sleep *= 2
392 attempts += 1
393
394 assert False, 'unreachable'
395
396
qyearsley1fdfcb62016-10-24 13:22:03 -0700397def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700398 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000399 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 """
qyearsleydd49f942016-10-28 11:57:22 -0700401 # If no bots are listed, we try to get a set of builders and tests based
402 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700403 if not options.bot:
404 change = changelist.GetChange(
405 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700406 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700407 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700408 change=change,
409 changed_files=change.LocalPaths(),
410 repository_root=settings.GetRoot(),
411 default_presubmit=None,
412 project=None,
413 verbose=options.verbose,
414 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700415 if masters is None:
416 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000417 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700418
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 if options.bucket:
420 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000421 option_parser.error(
422 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700423
424
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425def _parse_bucket(bucket):
426 if '/' in bucket:
427 return tuple(bucket.split('/', 1))
428 # Legacy buckets.
429 print('WARNING Please specify buckets as <project>/<bucket>.')
430 # Assume luci.<project>.<bucket>.
431 if bucket.startswith('luci.'):
432 return tuple(bucket[len('luci.'):].split('.', 1))
433 # Otherwise, assume prefix is also the project name.
434 if '.' in bucket:
435 project = bucket.split('.')[0]
436 return project, bucket
437 return None, None
438
439
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800440def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000441 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700442
443 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700444 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000445 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700446 buckets: A nested dict mapping bucket names to builders to tests.
447 options: Command-line options.
448 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449 print('Scheduling jobs on:')
450 for bucket, builders_and_tests in sorted(buckets.iteritems()):
451 print('Bucket:', bucket)
452 print('\n'.join(
453 ' %s: %s' % (builder, tests)
454 for builder, tests in sorted(builders_and_tests.iteritems())))
455 print('To see results here, run: git cl try-results')
456 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700457
Edward Lemurf0faf482019-09-25 20:40:17 +0000458 gerrit_changes = [changelist.GetGerritChange(patchset)]
459 shared_properties = {'category': options.category}
460 shared_properties.update(changelist.GetLegacyProperties(patchset))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 if options.clobber:
462 shared_properties['clobber'] = True
463 shared_properties.update(_get_properties_from_options(options) or {})
464
465 requests = []
466 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
467 project, bucket = _parse_bucket(raw_bucket)
468 if not project or not bucket:
469 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
470 continue
471
472 for builder, tests in sorted(builders_and_tests.iteritems()):
473 properties = shared_properties.copy()
474 if 'presubmit' in builder.lower():
475 properties['dry_run'] = 'true'
476 if tests:
477 properties['testfilter'] = tests
478
479 requests.append({
480 'scheduleBuild': {
481 'requestId': str(uuid.uuid4()),
482 'builder': {
483 'project': options.project or project,
484 'bucket': bucket,
485 'builder': builder,
486 },
487 'gerritChanges': gerrit_changes,
488 'properties': properties,
489 'tags': [
490 {'key': 'builder', 'value': builder},
491 {'key': 'user_agent', 'value': 'git_cl_try'},
492 ],
493 }
494 })
495
496 if not requests:
497 return
498
499 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000500 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000501
Edward Lemur2c210a42019-09-16 23:58:35 +0000502 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
503 http = authenticator.authorize(httplib2.Http())
504 http.force_exception_to_status_code = True
505
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000506 batch_request = {'requests': requests}
507 batch_response = _call_buildbucket(
Edward Lemur4c707a22019-09-24 21:13:43 +0000508 http, options.buildbucket_host, 'Batch', batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000509
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 errors = [
511 ' ' + response['error']['message']
512 for response in batch_response.get('responses', [])
513 if 'error' in response
514 ]
515 if errors:
516 raise BuildbucketResponseException(
517 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000518
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000519
tandrii221ab252016-10-06 08:12:04 -0700520def fetch_try_jobs(auth_config, changelist, buildbucket_host,
521 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000522 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523
qyearsley53f48a12016-09-01 10:45:13 -0700524 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000525 """
tandrii221ab252016-10-06 08:12:04 -0700526 assert buildbucket_host
527 assert changelist.GetIssue(), 'CL must be uploaded first'
528 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
529 patchset = patchset or changelist.GetMostRecentPatchset()
530 assert patchset, 'CL must be uploaded first'
531
532 codereview_url = changelist.GetCodereviewServer()
533 codereview_host = urlparse.urlparse(codereview_url).hostname
534 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 if authenticator.has_cached_credentials():
536 http = authenticator.authorize(httplib2.Http())
537 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700538 print('Warning: Some results might be missing because %s' %
539 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000540 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541 http = httplib2.Http()
542
543 http.force_exception_to_status_code = True
544
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000545 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700546 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000547 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700548 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 params = {'tag': 'buildset:%s' % buildset}
550
551 builds = {}
552 while True:
553 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700554 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000556 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 for build in content.get('builds', []):
558 builds[build['id']] = build
559 if 'next_cursor' in content:
560 params['start_cursor'] = content['next_cursor']
561 else:
562 break
563 return builds
564
565
qyearsleyeab3c042016-08-24 09:18:28 -0700566def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 """Prints nicely result of fetch_try_jobs."""
568 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000569 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570 return
571
572 # Make a copy, because we'll be modifying builds dictionary.
573 builds = builds.copy()
574 builder_names_cache = {}
575
576 def get_builder(b):
577 try:
578 return builder_names_cache[b['id']]
579 except KeyError:
580 try:
581 parameters = json.loads(b['parameters_json'])
582 name = parameters['builder_name']
583 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700584 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700585 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586 name = None
587 builder_names_cache[b['id']] = name
588 return name
589
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590 if options.print_master:
591 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000592 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 max(len(str(get_builder(b))) for b in builds.itervalues()))
594 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000595 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596 else:
597 name_fmt = '%%-%ds' % (
598 max(len(str(get_builder(b))) for b in builds.itervalues()))
599 def get_name(b):
600 return name_fmt % get_builder(b)
601
602 def sort_key(b):
603 return b['status'], b.get('result'), get_name(b), b.get('url')
604
605 def pop(title, f, color=None, **kwargs):
606 """Pop matching builds from `builds` dict and print them."""
607
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000608 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000609 colorize = str
610 else:
611 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
612
613 result = []
614 for b in builds.values():
615 if all(b.get(k) == v for k, v in kwargs.iteritems()):
616 builds.pop(b['id'])
617 result.append(b)
618 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700619 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000620 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700621 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000622
623 total = len(builds)
624 pop(status='COMPLETED', result='SUCCESS',
625 title='Successes:', color=Fore.GREEN,
626 f=lambda b: (get_name(b), b.get('url')))
627 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
628 title='Infra Failures:', color=Fore.MAGENTA,
629 f=lambda b: (get_name(b), b.get('url')))
630 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
631 title='Failures:', color=Fore.RED,
632 f=lambda b: (get_name(b), b.get('url')))
633 pop(status='COMPLETED', result='CANCELED',
634 title='Canceled:', color=Fore.MAGENTA,
635 f=lambda b: (get_name(b),))
636 pop(status='COMPLETED', result='FAILURE',
637 failure_reason='INVALID_BUILD_DEFINITION',
638 title='Wrong master/builder name:', color=Fore.MAGENTA,
639 f=lambda b: (get_name(b),))
640 pop(status='COMPLETED', result='FAILURE',
641 title='Other failures:',
642 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
643 pop(status='COMPLETED',
644 title='Other finished:',
645 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
646 pop(status='STARTED',
647 title='Started:', color=Fore.YELLOW,
648 f=lambda b: (get_name(b), b.get('url')))
649 pop(status='SCHEDULED',
650 title='Scheduled:',
651 f=lambda b: (get_name(b), 'id=%s' % b['id']))
652 # The last section is just in case buildbucket API changes OR there is a bug.
653 pop(title='Other:',
654 f=lambda b: (get_name(b), 'id=%s' % b['id']))
655 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000656 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000657
658
Aiden Bennerc08566e2018-10-03 17:52:42 +0000659def _ComputeDiffLineRanges(files, upstream_commit):
660 """Gets the changed line ranges for each file since upstream_commit.
661
662 Parses a git diff on provided files and returns a dict that maps a file name
663 to an ordered list of range tuples in the form (start_line, count).
664 Ranges are in the same format as a git diff.
665 """
666 # If files is empty then diff_output will be a full diff.
667 if len(files) == 0:
668 return {}
669
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000670 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
672 diff_output = RunGit(diff_cmd)
673
674 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
675 # 2 capture groups
676 # 0 == fname of diff file
677 # 1 == 'diff_start,diff_count' or 'diff_start'
678 # will match each of
679 # diff --git a/foo.foo b/foo.py
680 # @@ -12,2 +14,3 @@
681 # @@ -12,2 +17 @@
682 # running re.findall on the above string with pattern will give
683 # [('foo.py', ''), ('', '14,3'), ('', '17')]
684
685 curr_file = None
686 line_diffs = {}
687 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
688 if match[0] != '':
689 # Will match the second filename in diff --git a/a.py b/b.py.
690 curr_file = match[0]
691 line_diffs[curr_file] = []
692 else:
693 # Matches +14,3
694 if ',' in match[1]:
695 diff_start, diff_count = match[1].split(',')
696 else:
697 # Single line changes are of the form +12 instead of +12,1.
698 diff_start = match[1]
699 diff_count = 1
700
701 diff_start = int(diff_start)
702 diff_count = int(diff_count)
703
704 # If diff_count == 0 this is a removal we can ignore.
705 line_diffs[curr_file].append((diff_start, diff_count))
706
707 return line_diffs
708
709
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000710def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000711 """Checks if a yapf file is in any parent directory of fpath until top_dir.
712
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000713 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000714 is found returns None. Uses yapf_config_cache as a cache for previously found
715 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000716 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000717 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000718 # Return result if we've already computed it.
719 if fpath in yapf_config_cache:
720 return yapf_config_cache[fpath]
721
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000722 parent_dir = os.path.dirname(fpath)
723 if os.path.isfile(fpath):
724 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000725 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000726 # Otherwise fpath is a directory
727 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
728 if os.path.isfile(yapf_file):
729 ret = yapf_file
730 elif fpath == top_dir or parent_dir == fpath:
731 # If we're at the top level directory, or if we're at root
732 # there is no provided style.
733 ret = None
734 else:
735 # Otherwise recurse on the current directory.
736 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000737 yapf_config_cache[fpath] = ret
738 return ret
739
740
qyearsley53f48a12016-09-01 10:45:13 -0700741def write_try_results_json(output_file, builds):
742 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
743
744 The input |builds| dict is assumed to be generated by Buildbucket.
745 Buildbucket documentation: http://goo.gl/G0s101
746 """
747
748 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800749 """Extracts some of the information from one build dict."""
750 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700751 return {
752 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700753 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800754 'builder_name': parameters.get('builder_name'),
755 'created_ts': build.get('created_ts'),
756 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700757 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800758 'result': build.get('result'),
759 'status': build.get('status'),
760 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700761 'url': build.get('url'),
762 }
763
764 converted = []
765 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000766 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700767 write_json(output_file, converted)
768
769
Aaron Gable13101a62018-02-09 13:20:41 -0800770def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000771 """Prints statistics about the change to the user."""
772 # --no-ext-diff is broken in some versions of Git, so try to work around
773 # this by overriding the environment (but there is still a problem if the
774 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000775 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000776 if 'GIT_EXTERNAL_DIFF' in env:
777 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000778
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000779 try:
780 stdout = sys.stdout.fileno()
781 except AttributeError:
782 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000783 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800784 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000785 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000786
787
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000788class BuildbucketResponseException(Exception):
789 pass
790
791
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792class Settings(object):
793 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000795 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 self.tree_status_url = None
797 self.viewvc_url = None
798 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000799 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000800 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000801 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000802 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803
804 def LazyUpdateIfNeeded(self):
805 """Updates the settings from a codereview.settings file, if available."""
806 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000807 # The only value that actually changes the behavior is
808 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000809 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000810 error_ok=True
811 ).strip().lower()
812
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000814 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815 LoadCodereviewSettingsFromFile(cr_settings_file)
816 self.updated = True
817
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000818 @staticmethod
819 def GetRelativeRoot():
820 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000821
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000823 if self.root is None:
824 self.root = os.path.abspath(self.GetRelativeRoot())
825 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827 def GetTreeStatusUrl(self, error_ok=False):
828 if not self.tree_status_url:
829 error_message = ('You must configure your tree status URL by running '
830 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000831 self.tree_status_url = self._GetConfig(
832 'rietveld.tree-status-url', error_ok=error_ok,
833 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000838 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000842 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000843
rmistry@google.com5626a922015-02-26 14:03:30 +0000844 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000845 run_post_upload_hook = self._GetConfig(
846 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000847 return run_post_upload_hook == "True"
848
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000849 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000850 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000851
ukai@chromium.orge8077812012-02-03 03:41:46 +0000852 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000853 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000854 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700855 self.is_gerrit = (
856 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000857 return self.is_gerrit
858
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000859 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000860 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000861 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700862 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
863 if self.squash_gerrit_uploads is None:
864 # Default is squash now (http://crbug.com/611892#c23).
865 self.squash_gerrit_uploads = not (
866 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
867 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000868 return self.squash_gerrit_uploads
869
tandriia60502f2016-06-20 02:01:53 -0700870 def GetSquashGerritUploadsOverride(self):
871 """Return True or False if codereview.settings should be overridden.
872
873 Returns None if no override has been defined.
874 """
875 # See also http://crbug.com/611892#c23
876 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
877 error_ok=True).strip()
878 if result == 'true':
879 return True
880 if result == 'false':
881 return False
882 return None
883
tandrii@chromium.org28253532016-04-14 13:46:56 +0000884 def GetGerritSkipEnsureAuthenticated(self):
885 """Return True if EnsureAuthenticated should not be done for Gerrit
886 uploads."""
887 if self.gerrit_skip_ensure_authenticated is None:
888 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000889 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000890 error_ok=True).strip() == 'true')
891 return self.gerrit_skip_ensure_authenticated
892
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000893 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000894 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000895 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000896 # Git requires single quotes for paths with spaces. We need to replace
897 # them with double quotes for Windows to treat such paths as a single
898 # path.
899 self.git_editor = self._GetConfig(
900 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000901 return self.git_editor or None
902
thestig@chromium.org44202a22014-03-11 19:22:18 +0000903 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000904 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000905 DEFAULT_LINT_REGEX)
906
907 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000908 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000909 DEFAULT_LINT_IGNORE_REGEX)
910
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000911 def _GetConfig(self, param, **kwargs):
912 self.LazyUpdateIfNeeded()
913 return RunGit(['config', param], **kwargs).strip()
914
915
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000916def ShortBranchName(branch):
917 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000918 return branch.replace('refs/heads/', '', 1)
919
920
921def GetCurrentBranchRef():
922 """Returns branch ref (e.g., refs/heads/master) or None."""
923 return RunGit(['symbolic-ref', 'HEAD'],
924 stderr=subprocess2.VOID, error_ok=True).strip() or None
925
926
927def GetCurrentBranch():
928 """Returns current branch or None.
929
930 For refs/heads/* branches, returns just last part. For others, full ref.
931 """
932 branchref = GetCurrentBranchRef()
933 if branchref:
934 return ShortBranchName(branchref)
935 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000936
937
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000938class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000939 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000940 NONE = 'none'
941 DRY_RUN = 'dry_run'
942 COMMIT = 'commit'
943
944 ALL_STATES = [NONE, DRY_RUN, COMMIT]
945
946
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000948 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000949 self.issue = issue
950 self.patchset = patchset
951 self.hostname = hostname
952
953 @property
954 def valid(self):
955 return self.issue is not None
956
957
Edward Lemurf38bc172019-09-03 21:02:13 +0000958def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000959 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
960 fail_result = _ParsedIssueNumberArgument()
961
962 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000963 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000964 if not arg.startswith('http'):
965 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700966
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000967 url = gclient_utils.UpgradeToHttps(arg)
968 try:
969 parsed_url = urlparse.urlparse(url)
970 except ValueError:
971 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200972
Edward Lemur125d60a2019-09-13 18:25:41 +0000973 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000974
975
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000976def _create_description_from_log(args):
977 """Pulls out the commit log to use as a base for the CL description."""
978 log_args = []
979 if len(args) == 1 and not args[0].endswith('.'):
980 log_args = [args[0] + '..']
981 elif len(args) == 1 and args[0].endswith('...'):
982 log_args = [args[0][:-1]]
983 elif len(args) == 2:
984 log_args = [args[0] + '..' + args[1]]
985 else:
986 log_args = args[:] # Hope for the best!
987 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
988
989
Aaron Gablea45ee112016-11-22 15:14:38 -0800990class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700991 def __init__(self, issue, url):
992 self.issue = issue
993 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800994 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700995
996 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800997 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700998 self.issue, self.url)
999
1000
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001001_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001002 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001003 # TODO(tandrii): these two aren't known in Gerrit.
1004 'approval', 'disapproval'])
1005
1006
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001007class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001008 """Changelist works with one changelist in local branch.
1009
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001010 Notes:
1011 * Not safe for concurrent multi-{thread,process} use.
1012 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001013 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001014 """
1015
Edward Lemur125d60a2019-09-13 18:25:41 +00001016 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 """Create a new ChangeList instance.
1018
Edward Lemurf38bc172019-09-03 21:02:13 +00001019 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001020 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001021 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001022 global settings
1023 if not settings:
1024 # Happens when git_cl.py is used as a utility library.
1025 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001026
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001027 self.branchref = branchref
1028 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001029 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 self.branch = ShortBranchName(self.branchref)
1031 else:
1032 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001034 self.lookedup_issue = False
1035 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.has_description = False
1037 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001038 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001040 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001041 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001042 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001043 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001044
Edward Lemur125d60a2019-09-13 18:25:41 +00001045 # Lazily cached values.
1046 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1047 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1048 # Map from change number (issue) to its detail cache.
1049 self._detail_cache = {}
1050
1051 if codereview_host is not None:
1052 assert not codereview_host.startswith('https://'), codereview_host
1053 self._gerrit_host = codereview_host
1054 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001055
1056 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001057 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001058
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001059 The return value is a string suitable for passing to git cl with the --cc
1060 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061 """
1062 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001063 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001064 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1066 return self.cc
1067
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001068 def GetCCListWithoutDefault(self):
1069 """Return the users cc'd on this CL excluding default ones."""
1070 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001071 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001072 return self.cc
1073
Daniel Cheng7227d212017-11-17 08:12:37 -08001074 def ExtendCC(self, more_cc):
1075 """Extends the list of users to cc on this CL based on the changed files."""
1076 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001077
1078 def GetBranch(self):
1079 """Returns the short branch name, e.g. 'master'."""
1080 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001081 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001082 if not branchref:
1083 return None
1084 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 self.branch = ShortBranchName(self.branchref)
1086 return self.branch
1087
1088 def GetBranchRef(self):
1089 """Returns the full branch name, e.g. 'refs/heads/master'."""
1090 self.GetBranch() # Poke the lazy loader.
1091 return self.branchref
1092
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001093 def ClearBranch(self):
1094 """Clears cached branch data of this object."""
1095 self.branch = self.branchref = None
1096
tandrii5d48c322016-08-18 16:19:37 -07001097 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1098 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1099 kwargs['branch'] = self.GetBranch()
1100 return _git_get_branch_config_value(key, default, **kwargs)
1101
1102 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1103 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1104 assert self.GetBranch(), (
1105 'this CL must have an associated branch to %sset %s%s' %
1106 ('un' if value is None else '',
1107 key,
1108 '' if value is None else ' to %r' % value))
1109 kwargs['branch'] = self.GetBranch()
1110 return _git_set_branch_config_value(key, value, **kwargs)
1111
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 @staticmethod
1113 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001114 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 e.g. 'origin', 'refs/heads/master'
1116 """
1117 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001118 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1119
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001121 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001123 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1124 error_ok=True).strip()
1125 if upstream_branch:
1126 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001127 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001128 # Else, try to guess the origin remote.
1129 remote_branches = RunGit(['branch', '-r']).split()
1130 if 'origin/master' in remote_branches:
1131 # Fall back on origin/master if it exits.
1132 remote = 'origin'
1133 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001135 DieWithError(
1136 'Unable to determine default branch to diff against.\n'
1137 'Either pass complete "git diff"-style arguments, like\n'
1138 ' git cl upload origin/master\n'
1139 'or verify this branch is set up to track another \n'
1140 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141
1142 return remote, upstream_branch
1143
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001144 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001145 upstream_branch = self.GetUpstreamBranch()
1146 if not BranchExists(upstream_branch):
1147 DieWithError('The upstream for the current branch (%s) does not exist '
1148 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001149 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001150 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001151
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001152 def GetUpstreamBranch(self):
1153 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001154 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001155 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001156 upstream_branch = upstream_branch.replace('refs/heads/',
1157 'refs/remotes/%s/' % remote)
1158 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1159 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 self.upstream_branch = upstream_branch
1161 return self.upstream_branch
1162
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001164 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 remote, branch = None, self.GetBranch()
1166 seen_branches = set()
1167 while branch not in seen_branches:
1168 seen_branches.add(branch)
1169 remote, branch = self.FetchUpstreamTuple(branch)
1170 branch = ShortBranchName(branch)
1171 if remote != '.' or branch.startswith('refs/remotes'):
1172 break
1173 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001174 remotes = RunGit(['remote'], error_ok=True).split()
1175 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001176 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001177 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001179 logging.warn('Could not determine which remote this change is '
1180 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001181 else:
1182 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001183 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001184 branch = 'HEAD'
1185 if branch.startswith('refs/remotes'):
1186 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001187 elif branch.startswith('refs/branch-heads/'):
1188 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 else:
1190 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001191 return self._remote
1192
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 def GitSanityChecks(self, upstream_git_obj):
1194 """Checks git repo status and ensures diff is from local commits."""
1195
sbc@chromium.org79706062015-01-14 21:18:12 +00001196 if upstream_git_obj is None:
1197 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001198 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001199 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001200 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001201 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001202 return False
1203
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001204 # Verify the commit we're diffing against is in our current branch.
1205 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1206 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1207 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001208 print('ERROR: %s is not in the current branch. You may need to rebase '
1209 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001210 return False
1211
1212 # List the commits inside the diff, and verify they are all local.
1213 commits_in_diff = RunGit(
1214 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1215 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1216 remote_branch = remote_branch.strip()
1217 if code != 0:
1218 _, remote_branch = self.GetRemoteBranch()
1219
1220 commits_in_remote = RunGit(
1221 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1222
1223 common_commits = set(commits_in_diff) & set(commits_in_remote)
1224 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001225 print('ERROR: Your diff contains %d commits already in %s.\n'
1226 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1227 'the diff. If you are using a custom git flow, you can override'
1228 ' the reference used for this check with "git config '
1229 'gitcl.remotebranch <git-ref>".' % (
1230 len(common_commits), remote_branch, upstream_git_obj),
1231 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001232 return False
1233 return True
1234
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001235 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001236 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001237
1238 Returns None if it is not set.
1239 """
tandrii5d48c322016-08-18 16:19:37 -07001240 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001241
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 def GetRemoteUrl(self):
1243 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1244
1245 Returns None if there is no remote.
1246 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001247 is_cached, value = self._cached_remote_url
1248 if is_cached:
1249 return value
1250
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001251 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001252 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1253
Edward Lemur298f2cf2019-02-22 21:40:39 +00001254 # Check if the remote url can be parsed as an URL.
1255 host = urlparse.urlparse(url).netloc
1256 if host:
1257 self._cached_remote_url = (True, url)
1258 return url
1259
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001260 # If it cannot be parsed as an url, assume it is a local directory,
1261 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001262 logging.warning('"%s" doesn\'t appear to point to a git host. '
1263 'Interpreting it as a local directory.', url)
1264 if not os.path.isdir(url):
1265 logging.error(
1266 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001267 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001268 return None
1269
1270 cache_path = url
1271 url = RunGit(['config', 'remote.%s.url' % remote],
1272 error_ok=True,
1273 cwd=url).strip()
1274
1275 host = urlparse.urlparse(url).netloc
1276 if not host:
1277 logging.error(
1278 'Remote "%(remote)s" for branch "%(branch)s" points to '
1279 '"%(cache_path)s", but it is misconfigured.\n'
1280 '"%(cache_path)s" must be a git repo and must have a remote named '
1281 '"%(remote)s" pointing to the git host.', {
1282 'remote': remote,
1283 'cache_path': cache_path,
1284 'branch': self.GetBranch()})
1285 return None
1286
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001287 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001288 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001290 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001291 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001292 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001293 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001294 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 return self.issue
1297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 def GetIssueURL(self):
1299 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001300 issue = self.GetIssue()
1301 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001302 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001303 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001304
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001305 def GetDescription(self, pretty=False, force=False):
1306 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001308 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 self.has_description = True
1310 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001311 # Set width to 72 columns + 2 space indent.
1312 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001313 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001314 lines = self.description.splitlines()
1315 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316 return self.description
1317
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001318 def GetDescriptionFooters(self):
1319 """Returns (non_footer_lines, footers) for the commit message.
1320
1321 Returns:
1322 non_footer_lines (list(str)) - Simple list of description lines without
1323 any footer. The lines do not contain newlines, nor does the list contain
1324 the empty line between the message and the footers.
1325 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1326 [("Change-Id", "Ideadbeef...."), ...]
1327 """
1328 raw_description = self.GetDescription()
1329 msg_lines, _, footers = git_footers.split_footers(raw_description)
1330 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001331 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001332 return msg_lines, footers
1333
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001334 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001335 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001336 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001337 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001338 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001340 return self.patchset
1341
1342 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001343 """Set this branch's patchset. If patchset=0, clears the patchset."""
1344 assert self.GetBranch()
1345 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001346 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001347 else:
1348 self.patchset = int(patchset)
1349 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001350 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001351
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001352 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001353 """Set this branch's issue. If issue isn't given, clears the issue."""
1354 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001356 issue = int(issue)
1357 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001358 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001359 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001360 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001361 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001362 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001363 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001364 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001365 else:
tandrii5d48c322016-08-18 16:19:37 -07001366 # Reset all of these just to be clean.
1367 reset_suffixes = [
1368 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001369 self.IssueConfigKey(),
1370 self.PatchsetConfigKey(),
1371 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001372 ] + self._PostUnsetIssueProperties()
1373 for prop in reset_suffixes:
1374 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001375 msg = RunGit(['log', '-1', '--format=%B']).strip()
1376 if msg and git_footers.get_footer_change_id(msg):
1377 print('WARNING: The change patched into this branch has a Change-Id. '
1378 'Removing it.')
1379 RunGit(['commit', '--amend', '-m',
1380 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001381 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001382 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001383 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001384
dnjba1b0f32016-09-02 12:37:42 -07001385 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001386 if not self.GitSanityChecks(upstream_branch):
1387 DieWithError('\nGit sanity check failure')
1388
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001389 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001390 if not root:
1391 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001392 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001393
1394 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001395 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001396 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001397 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001398 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001399 except subprocess2.CalledProcessError:
1400 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001401 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001402 'This branch probably doesn\'t exist anymore. To reset the\n'
1403 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001404 ' git branch --set-upstream-to origin/master %s\n'
1405 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001406 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001407
maruel@chromium.org52424302012-08-29 15:14:30 +00001408 issue = self.GetIssue()
1409 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001410 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001411 description = self.GetDescription()
1412 else:
1413 # If the change was never uploaded, use the log messages of all commits
1414 # up to the branch point, as git cl upload will prefill the description
1415 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001416 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1417 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001418
1419 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001420 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001421 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001422 name,
1423 description,
1424 absroot,
1425 files,
1426 issue,
1427 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001428 author,
1429 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001430
dsansomee2d6fd92016-09-08 00:10:47 -07001431 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001432 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001433 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001434 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001435
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001436 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1437 """Sets the description for this CL remotely.
1438
1439 You can get description_lines and footers with GetDescriptionFooters.
1440
1441 Args:
1442 description_lines (list(str)) - List of CL description lines without
1443 newline characters.
1444 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1445 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1446 `List-Of-Tokens`). It will be case-normalized so that each token is
1447 title-cased.
1448 """
1449 new_description = '\n'.join(description_lines)
1450 if footers:
1451 new_description += '\n'
1452 for k, v in footers:
1453 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1454 if not git_footers.FOOTER_PATTERN.match(foot):
1455 raise ValueError('Invalid footer %r' % foot)
1456 new_description += foot + '\n'
1457 self.UpdateDescription(new_description, force)
1458
Edward Lesmes8e282792018-04-03 18:50:29 -04001459 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001460 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1461 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001462 start = time_time()
1463 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1465 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001466 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001467 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001468 metrics.collector.add_repeated('sub_commands', {
1469 'command': 'presubmit',
1470 'execution_time': time_time() - start,
1471 'exit_code': 0 if result.should_continue() else 1,
1472 })
1473 return result
vapierfd77ac72016-06-16 08:33:57 -07001474 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001475 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001476
Edward Lemurf38bc172019-09-03 21:02:13 +00001477 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001478 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001479 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1480 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001481 else:
1482 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001483 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001484 urlparse.urlparse(issue_arg))
1485 if not parsed_issue_arg or not parsed_issue_arg.valid:
1486 DieWithError('Failed to parse issue argument "%s". '
1487 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001488 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001489 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001490
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001491 def CMDUpload(self, options, git_diff_args, orig_args):
1492 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001493 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001494 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001495 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001496 else:
1497 if self.GetBranch() is None:
1498 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1499
1500 # Default to diffing against common ancestor of upstream branch
1501 base_branch = self.GetCommonAncestorWithUpstream()
1502 git_diff_args = [base_branch, 'HEAD']
1503
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001504 # Fast best-effort checks to abort before running potentially expensive
1505 # hooks if uploading is likely to fail anyway. Passing these checks does
1506 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001507 self.EnsureAuthenticated(force=options.force)
1508 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509
1510 # Apply watchlists on upload.
1511 change = self.GetChange(base_branch, None)
1512 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1513 files = [f.LocalPath() for f in change.AffectedFiles()]
1514 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001515 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001516
1517 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001518 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001519 # Set the reviewer list now so that presubmit checks can access it.
1520 change_description = ChangeDescription(change.FullDescriptionText())
1521 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001522 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001523 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524 change)
1525 change.SetDescriptionText(change_description.description)
1526 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001527 may_prompt=not options.force,
1528 verbose=options.verbose,
1529 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001530 if not hook_results.should_continue():
1531 return 1
1532 if not options.reviewers and hook_results.reviewers:
1533 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001534 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001535
Aaron Gable13101a62018-02-09 13:20:41 -08001536 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001537 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001538 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001539 _git_set_branch_config_value('last-upload-hash',
1540 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 # Run post upload hooks, if specified.
1542 if settings.GetRunPostUploadHook():
1543 presubmit_support.DoPostUploadExecuter(
1544 change,
1545 self,
1546 settings.GetRoot(),
1547 options.verbose,
1548 sys.stdout)
1549
1550 # Upload all dependencies if specified.
1551 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001552 print()
1553 print('--dependencies has been specified.')
1554 print('All dependent local branches will be re-uploaded.')
1555 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001556 # Remove the dependencies flag from args so that we do not end up in a
1557 # loop.
1558 orig_args.remove('--dependencies')
1559 ret = upload_branch_deps(self, orig_args)
1560 return ret
1561
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001562 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001563 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001564
1565 Issue must have been already uploaded and known.
1566 """
1567 assert new_state in _CQState.ALL_STATES
1568 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001569 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001570 vote_map = {
1571 _CQState.NONE: 0,
1572 _CQState.DRY_RUN: 1,
1573 _CQState.COMMIT: 2,
1574 }
1575 labels = {'Commit-Queue': vote_map[new_state]}
1576 notify = False if new_state == _CQState.DRY_RUN else None
1577 gerrit_util.SetReview(
1578 self._GetGerritHost(), self._GerritChangeIdentifier(),
1579 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001580 return 0
1581 except KeyboardInterrupt:
1582 raise
1583 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001584 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001585 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001586 ' * Your project has no CQ,\n'
1587 ' * You don\'t have permission to change the CQ state,\n'
1588 ' * There\'s a bug in this code (see stack trace below).\n'
1589 'Consider specifying which bots to trigger manually or asking your '
1590 'project owners for permissions or contacting Chrome Infra at:\n'
1591 'https://www.chromium.org/infra\n\n' %
1592 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001593 # Still raise exception so that stack trace is printed.
1594 raise
1595
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001596 def _GetGerritHost(self):
1597 # Lazy load of configs.
1598 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001599 if self._gerrit_host and '.' not in self._gerrit_host:
1600 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1601 # This happens for internal stuff http://crbug.com/614312.
1602 parsed = urlparse.urlparse(self.GetRemoteUrl())
1603 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001604 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001605 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001606 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1607 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001608 return self._gerrit_host
1609
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001610 def _GetGitHost(self):
1611 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001612 remote_url = self.GetRemoteUrl()
1613 if not remote_url:
1614 return None
1615 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001616
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617 def GetCodereviewServer(self):
1618 if not self._gerrit_server:
1619 # If we're on a branch then get the server potentially associated
1620 # with that branch.
1621 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001622 self._gerrit_server = self._GitGetBranchConfigValue(
1623 self.CodereviewServerConfigKey())
1624 if self._gerrit_server:
1625 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001626 if not self._gerrit_server:
1627 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1628 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001629 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001630 parts[0] = parts[0] + '-review'
1631 self._gerrit_host = '.'.join(parts)
1632 self._gerrit_server = 'https://%s' % self._gerrit_host
1633 return self._gerrit_server
1634
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001635 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001636 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001637 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001638 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001639 logging.warn('can\'t detect Gerrit project.')
1640 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001641 project = urlparse.urlparse(remote_url).path.strip('/')
1642 if project.endswith('.git'):
1643 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001644 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1645 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1646 # gitiles/git-over-https protocol. E.g.,
1647 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1648 # as
1649 # https://chromium.googlesource.com/v8/v8
1650 if project.startswith('a/'):
1651 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001652 return project
1653
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001654 def _GerritChangeIdentifier(self):
1655 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1656
1657 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001658 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001659 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001660 project = self._GetGerritProject()
1661 if project:
1662 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1663 # Fall back on still unique, but less efficient change number.
1664 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001665
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001666 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001667 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001668 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001669
tandrii5d48c322016-08-18 16:19:37 -07001670 @classmethod
1671 def PatchsetConfigKey(cls):
1672 return 'gerritpatchset'
1673
1674 @classmethod
1675 def CodereviewServerConfigKey(cls):
1676 return 'gerritserver'
1677
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001678 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001679 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001680 if settings.GetGerritSkipEnsureAuthenticated():
1681 # For projects with unusual authentication schemes.
1682 # See http://crbug.com/603378.
1683 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001684
1685 # Check presence of cookies only if using cookies-based auth method.
1686 cookie_auth = gerrit_util.Authenticator.get()
1687 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001688 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001689
Daniel Chengcf6269b2019-05-18 01:02:12 +00001690 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1691 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001692 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001693 return
1694
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001695 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001696 self.GetCodereviewServer()
1697 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001698 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699
1700 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1701 git_auth = cookie_auth.get_auth_header(git_host)
1702 if gerrit_auth and git_auth:
1703 if gerrit_auth == git_auth:
1704 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001705 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001706 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001707 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001708 ' %s\n'
1709 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001710 ' Consider running the following command:\n'
1711 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001712 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001713 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001714 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001715 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001716 cookie_auth.get_new_password_message(git_host)))
1717 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001718 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001719 return
1720 else:
1721 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001722 ([] if gerrit_auth else [self._gerrit_host]) +
1723 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001724 DieWithError('Credentials for the following hosts are required:\n'
1725 ' %s\n'
1726 'These are read from %s (or legacy %s)\n'
1727 '%s' % (
1728 '\n '.join(missing),
1729 cookie_auth.get_gitcookies_path(),
1730 cookie_auth.get_netrc_path(),
1731 cookie_auth.get_new_password_message(git_host)))
1732
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001733 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001734 if not self.GetIssue():
1735 return
1736
1737 # Warm change details cache now to avoid RPCs later, reducing latency for
1738 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001739 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001740 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001741
1742 status = self._GetChangeDetail()['status']
1743 if status in ('MERGED', 'ABANDONED'):
1744 DieWithError('Change %s has been %s, new uploads are not allowed' %
1745 (self.GetIssueURL(),
1746 'submitted' if status == 'MERGED' else 'abandoned'))
1747
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1749 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1750 # Apparently this check is not very important? Otherwise get_auth_email
1751 # could have been added to other implementations of Authenticator.
1752 cookies_auth = gerrit_util.Authenticator.get()
1753 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001754 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001755
1756 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 if self.GetIssueOwner() == cookies_user:
1758 return
1759 logging.debug('change %s owner is %s, cookies user is %s',
1760 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001761 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001762 # so ask what Gerrit thinks of this user.
1763 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1764 if details['email'] == self.GetIssueOwner():
1765 return
1766 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001768 'as %s.\n'
1769 'Uploading may fail due to lack of permissions.' %
1770 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1771 confirm_or_exit(action='upload')
1772
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001773 def _PostUnsetIssueProperties(self):
1774 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001775 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001776
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001777 def GetGerritObjForPresubmit(self):
1778 return presubmit_support.GerritAccessor(self._GetGerritHost())
1779
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001780 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001781 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001782 or CQ status, assuming adherence to a common workflow.
1783
1784 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001785 * 'error' - error from review tool (including deleted issues)
1786 * 'unsent' - no reviewers added
1787 * 'waiting' - waiting for review
1788 * 'reply' - waiting for uploader to reply to review
1789 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001790 * 'dry-run' - dry-running in the CQ
1791 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001792 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001793 """
1794 if not self.GetIssue():
1795 return None
1796
1797 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 data = self._GetChangeDetail([
1799 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001800 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001801 return 'error'
1802
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001803 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804 return 'closed'
1805
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001806 cq_label = data['labels'].get('Commit-Queue', {})
1807 max_cq_vote = 0
1808 for vote in cq_label.get('all', []):
1809 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1810 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001811 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001812 if max_cq_vote == 1:
1813 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001814
Aaron Gable9ab38c62017-04-06 14:36:33 -07001815 if data['labels'].get('Code-Review', {}).get('approved'):
1816 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001817
1818 if not data.get('reviewers', {}).get('REVIEWER', []):
1819 return 'unsent'
1820
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001821 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001822 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1823 last_message_author = messages.pop().get('author', {})
1824 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001825 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1826 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001827 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001828 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001829 if last_message_author.get('_account_id') == owner:
1830 # Most recent message was by owner.
1831 return 'waiting'
1832 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001833 # Some reply from non-owner.
1834 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001835
1836 # Somehow there are no messages even though there are reviewers.
1837 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001838
1839 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001840 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001841 patchset = data['revisions'][data['current_revision']]['_number']
1842 self.SetPatchset(patchset)
1843 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001844
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001845 def FetchDescription(self, force=False):
1846 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1847 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001848 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001849 return data['revisions'][current_rev]['commit']['message'].encode(
1850 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001851
dsansomee2d6fd92016-09-08 00:10:47 -07001852 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001853 if gerrit_util.HasPendingChangeEdit(
1854 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001855 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001856 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001857 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001858 'unpublished edit. Either publish the edit in the Gerrit web UI '
1859 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001860
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001861 gerrit_util.DeletePendingChangeEdit(
1862 self._GetGerritHost(), self._GerritChangeIdentifier())
1863 gerrit_util.SetCommitMessage(
1864 self._GetGerritHost(), self._GerritChangeIdentifier(),
1865 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001866
Aaron Gable636b13f2017-07-14 10:42:48 -07001867 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001868 gerrit_util.SetReview(
1869 self._GetGerritHost(), self._GerritChangeIdentifier(),
1870 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001871
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001872 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001873 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001874 # CURRENT_REVISION is included to get the latest patchset so that
1875 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001876 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001877 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1878 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001879 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001880 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001881 robot_file_comments = gerrit_util.GetChangeRobotComments(
1882 self._GetGerritHost(), self._GerritChangeIdentifier())
1883
1884 # Add the robot comments onto the list of comments, but only
1885 # keep those that are from the latest pachset.
1886 latest_patch_set = self.GetMostRecentPatchset()
1887 for path, robot_comments in robot_file_comments.iteritems():
1888 line_comments = file_comments.setdefault(path, [])
1889 line_comments.extend(
1890 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001891
1892 # Build dictionary of file comments for easy access and sorting later.
1893 # {author+date: {path: {patchset: {line: url+message}}}}
1894 comments = collections.defaultdict(
1895 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1896 for path, line_comments in file_comments.iteritems():
1897 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001898 tag = comment.get('tag', '')
1899 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001900 continue
1901 key = (comment['author']['email'], comment['updated'])
1902 if comment.get('side', 'REVISION') == 'PARENT':
1903 patchset = 'Base'
1904 else:
1905 patchset = 'PS%d' % comment['patch_set']
1906 line = comment.get('line', 0)
1907 url = ('https://%s/c/%s/%s/%s#%s%s' %
1908 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1909 'b' if comment.get('side') == 'PARENT' else '',
1910 str(line) if line else ''))
1911 comments[key][path][patchset][line] = (url, comment['message'])
1912
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001914 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001915 summary = self._BuildCommentSummary(msg, comments, readable)
1916 if summary:
1917 summaries.append(summary)
1918 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001919
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 @staticmethod
1921 def _BuildCommentSummary(msg, comments, readable):
1922 key = (msg['author']['email'], msg['date'])
1923 # Don't bother showing autogenerated messages that don't have associated
1924 # file or line comments. this will filter out most autogenerated
1925 # messages, but will keep robot comments like those from Tricium.
1926 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1927 if is_autogenerated and not comments.get(key):
1928 return None
1929 message = msg['message']
1930 # Gerrit spits out nanoseconds.
1931 assert len(msg['date'].split('.')[-1]) == 9
1932 date = datetime.datetime.strptime(msg['date'][:-3],
1933 '%Y-%m-%d %H:%M:%S.%f')
1934 if key in comments:
1935 message += '\n'
1936 for path, patchsets in sorted(comments.get(key, {}).items()):
1937 if readable:
1938 message += '\n%s' % path
1939 for patchset, lines in sorted(patchsets.items()):
1940 for line, (url, content) in sorted(lines.items()):
1941 if line:
1942 line_str = 'Line %d' % line
1943 path_str = '%s:%d:' % (path, line)
1944 else:
1945 line_str = 'File comment'
1946 path_str = '%s:0:' % path
1947 if readable:
1948 message += '\n %s, %s: %s' % (patchset, line_str, url)
1949 message += '\n %s\n' % content
1950 else:
1951 message += '\n%s ' % path_str
1952 message += '\n%s\n' % content
1953
1954 return _CommentSummary(
1955 date=date,
1956 message=message,
1957 sender=msg['author']['email'],
1958 autogenerated=is_autogenerated,
1959 # These could be inferred from the text messages and correlated with
1960 # Code-Review label maximum, however this is not reliable.
1961 # Leaving as is until the need arises.
1962 approval=False,
1963 disapproval=False,
1964 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001965
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001967 gerrit_util.AbandonChange(
1968 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001969
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001970 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001971 gerrit_util.SubmitChange(
1972 self._GetGerritHost(), self._GerritChangeIdentifier(),
1973 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001974
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001975 def _GetChangeDetail(self, options=None, no_cache=False):
1976 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001977
1978 If fresh data is needed, set no_cache=True which will clear cache and
1979 thus new data will be fetched from Gerrit.
1980 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001981 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001982 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001983
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001984 # Optimization to avoid multiple RPCs:
1985 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1986 'CURRENT_COMMIT' not in options):
1987 options.append('CURRENT_COMMIT')
1988
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001989 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001990 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001991 options = [o.upper() for o in options]
1992
1993 # Check in cache first unless no_cache is True.
1994 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001995 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001996 else:
1997 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001998 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001999 # Assumption: data fetched before with extra options is suitable
2000 # for return for a smaller set of options.
2001 # For example, if we cached data for
2002 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2003 # and request is for options=[CURRENT_REVISION],
2004 # THEN we can return prior cached data.
2005 if options_set.issubset(cached_options_set):
2006 return data
2007
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002008 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002009 data = gerrit_util.GetChangeDetail(
2010 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002011 except gerrit_util.GerritError as e:
2012 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002013 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002014 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002015
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002016 self._detail_cache.setdefault(cache_key, []).append(
2017 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002018 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002019
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002020 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002021 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002022 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002023 data = gerrit_util.GetChangeCommit(
2024 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002025 except gerrit_util.GerritError as e:
2026 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002027 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002028 raise
agable32978d92016-11-01 12:55:02 -07002029 return data
2030
Karen Qian40c19422019-03-13 21:28:29 +00002031 def _IsCqConfigured(self):
2032 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002033 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002034 return False
2035 # TODO(crbug/753213): Remove temporary hack
2036 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002037 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002038 detail['branch'].startswith('refs/branch-heads/')):
2039 return False
2040 return True
2041
Olivier Robin75ee7252018-04-13 10:02:56 +02002042 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002043 if git_common.is_dirty_git_tree('land'):
2044 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002045
tandriid60367b2016-06-22 05:25:12 -07002046 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002047 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002048 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002049 'which can test and land changes for you. '
2050 'Are you sure you wish to bypass it?\n',
2051 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002052 differs = True
tandriic4344b52016-08-29 06:04:54 -07002053 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002054 # Note: git diff outputs nothing if there is no diff.
2055 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002056 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002058 if detail['current_revision'] == last_upload:
2059 differs = False
2060 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002061 print('WARNING: Local branch contents differ from latest uploaded '
2062 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063 if differs:
2064 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002065 confirm_or_exit(
2066 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2067 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002068 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002069 elif not bypass_hooks:
2070 hook_results = self.RunHook(
2071 committing=True,
2072 may_prompt=not force,
2073 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002074 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2075 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002076 if not hook_results.should_continue():
2077 return 1
2078
2079 self.SubmitIssue(wait_for_merge=True)
2080 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002081 links = self._GetChangeCommit().get('web_links', [])
2082 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002083 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002084 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002085 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002086 return 0
2087
Edward Lemurf38bc172019-09-03 21:02:13 +00002088 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002089 assert parsed_issue_arg.valid
2090
Edward Lemur125d60a2019-09-13 18:25:41 +00002091 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002092
2093 if parsed_issue_arg.hostname:
2094 self._gerrit_host = parsed_issue_arg.hostname
2095 self._gerrit_server = 'https://%s' % self._gerrit_host
2096
tandriic2405f52016-10-10 08:13:15 -07002097 try:
2098 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002099 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002100 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002101
2102 if not parsed_issue_arg.patchset:
2103 # Use current revision by default.
2104 revision_info = detail['revisions'][detail['current_revision']]
2105 patchset = int(revision_info['_number'])
2106 else:
2107 patchset = parsed_issue_arg.patchset
2108 for revision_info in detail['revisions'].itervalues():
2109 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2110 break
2111 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002112 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 (parsed_issue_arg.patchset, self.GetIssue()))
2114
Edward Lemur125d60a2019-09-13 18:25:41 +00002115 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002116 if remote_url.endswith('.git'):
2117 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002118 remote_url = remote_url.rstrip('/')
2119
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002120 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002121 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002122
2123 if remote_url != fetch_info['url']:
2124 DieWithError('Trying to patch a change from %s but this repo appears '
2125 'to be %s.' % (fetch_info['url'], remote_url))
2126
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002128
Aaron Gable62619a32017-06-16 08:22:09 -07002129 if force:
2130 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2131 print('Checked out commit for change %i patchset %i locally' %
2132 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002133 elif nocommit:
2134 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2135 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002136 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002137 RunGit(['cherry-pick', 'FETCH_HEAD'])
2138 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002139 (parsed_issue_arg.issue, patchset))
2140 print('Note: this created a local commit which does not have '
2141 'the same hash as the one uploaded for review. This will make '
2142 'uploading changes based on top of this branch difficult.\n'
2143 'If you want to do that, use "git cl patch --force" instead.')
2144
Stefan Zagerd08043c2017-10-12 12:07:02 -07002145 if self.GetBranch():
2146 self.SetIssue(parsed_issue_arg.issue)
2147 self.SetPatchset(patchset)
2148 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2149 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2150 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2151 else:
2152 print('WARNING: You are in detached HEAD state.\n'
2153 'The patch has been applied to your checkout, but you will not be '
2154 'able to upload a new patch set to the gerrit issue.\n'
2155 'Try using the \'-b\' option if you would like to work on a '
2156 'branch and/or upload a new patch set.')
2157
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 return 0
2159
2160 @staticmethod
2161 def ParseIssueURL(parsed_url):
2162 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2163 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002164 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2165 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002166 # Short urls like https://domain/<issue_number> can be used, but don't allow
2167 # specifying the patchset (you'd 404), but we allow that here.
2168 if parsed_url.path == '/':
2169 part = parsed_url.fragment
2170 else:
2171 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002172 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002173 if match:
2174 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002175 issue=int(match.group(3)),
2176 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002177 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 return None
2179
tandrii16e0b4e2016-06-07 10:34:28 -07002180 def _GerritCommitMsgHookCheck(self, offer_removal):
2181 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2182 if not os.path.exists(hook):
2183 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002184 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2185 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002186 data = gclient_utils.FileRead(hook)
2187 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2188 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002189 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002190 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002191 'and may interfere with it in subtle ways.\n'
2192 'We recommend you remove the commit-msg hook.')
2193 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002194 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002195 gclient_utils.rm_file_or_tree(hook)
2196 print('Gerrit commit-msg hook removed.')
2197 else:
2198 print('OK, will keep Gerrit commit-msg hook in place.')
2199
Edward Lemur1b52d872019-05-09 21:12:12 +00002200 def _CleanUpOldTraces(self):
2201 """Keep only the last |MAX_TRACES| traces."""
2202 try:
2203 traces = sorted([
2204 os.path.join(TRACES_DIR, f)
2205 for f in os.listdir(TRACES_DIR)
2206 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2207 and not f.startswith('tmp'))
2208 ])
2209 traces_to_delete = traces[:-MAX_TRACES]
2210 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002211 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002212 except OSError:
2213 print('WARNING: Failed to remove old git traces from\n'
2214 ' %s'
2215 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002216
Edward Lemur5737f022019-05-17 01:24:00 +00002217 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002218 """Zip and write the git push traces stored in traces_dir."""
2219 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002220 traces_zip = trace_name + '-traces'
2221 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002222 # Create a temporary dir to store git config and gitcookies in. It will be
2223 # compressed and stored next to the traces.
2224 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002225 git_info_zip = trace_name + '-git-info'
2226
Edward Lemur5737f022019-05-17 01:24:00 +00002227 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002228 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002229 git_push_metadata['now'] = git_push_metadata['now'].decode(
2230 sys.stdin.encoding)
2231
Edward Lemur1b52d872019-05-09 21:12:12 +00002232 git_push_metadata['trace_name'] = trace_name
2233 gclient_utils.FileWrite(
2234 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2235
2236 # Keep only the first 6 characters of the git hashes on the packet
2237 # trace. This greatly decreases size after compression.
2238 packet_traces = os.path.join(traces_dir, 'trace-packet')
2239 if os.path.isfile(packet_traces):
2240 contents = gclient_utils.FileRead(packet_traces)
2241 gclient_utils.FileWrite(
2242 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2243 shutil.make_archive(traces_zip, 'zip', traces_dir)
2244
2245 # Collect and compress the git config and gitcookies.
2246 git_config = RunGit(['config', '-l'])
2247 gclient_utils.FileWrite(
2248 os.path.join(git_info_dir, 'git-config'),
2249 git_config)
2250
2251 cookie_auth = gerrit_util.Authenticator.get()
2252 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2253 gitcookies_path = cookie_auth.get_gitcookies_path()
2254 if os.path.isfile(gitcookies_path):
2255 gitcookies = gclient_utils.FileRead(gitcookies_path)
2256 gclient_utils.FileWrite(
2257 os.path.join(git_info_dir, 'gitcookies'),
2258 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2259 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2260
Edward Lemur1b52d872019-05-09 21:12:12 +00002261 gclient_utils.rmtree(git_info_dir)
2262
2263 def _RunGitPushWithTraces(
2264 self, change_desc, refspec, refspec_opts, git_push_metadata):
2265 """Run git push and collect the traces resulting from the execution."""
2266 # Create a temporary directory to store traces in. Traces will be compressed
2267 # and stored in a 'traces' dir inside depot_tools.
2268 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002269 trace_name = os.path.join(
2270 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002271
2272 env = os.environ.copy()
2273 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2274 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002275 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002276 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2277 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2278 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2279
2280 try:
2281 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002282 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002283 before_push = time_time()
2284 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002285 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002286 env=env,
2287 print_stdout=True,
2288 # Flush after every line: useful for seeing progress when running as
2289 # recipe.
2290 filter_fn=lambda _: sys.stdout.flush())
2291 except subprocess2.CalledProcessError as e:
2292 push_returncode = e.returncode
2293 DieWithError('Failed to create a change. Please examine output above '
2294 'for the reason of the failure.\n'
2295 'Hint: run command below to diagnose common Git/Gerrit '
2296 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002297 ' git cl creds-check\n'
2298 '\n'
2299 'If git-cl is not working correctly, file a bug under the '
2300 'Infra>SDK component including the files below.\n'
2301 'Review the files before upload, since they might contain '
2302 'sensitive information.\n'
2303 'Set the Restrict-View-Google label so that they are not '
2304 'publicly accessible.\n'
2305 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002306 change_desc)
2307 finally:
2308 execution_time = time_time() - before_push
2309 metrics.collector.add_repeated('sub_commands', {
2310 'command': 'git push',
2311 'execution_time': execution_time,
2312 'exit_code': push_returncode,
2313 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2314 })
2315
Edward Lemur1b52d872019-05-09 21:12:12 +00002316 git_push_metadata['execution_time'] = execution_time
2317 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002318 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002319
Edward Lemur1b52d872019-05-09 21:12:12 +00002320 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002321 gclient_utils.rmtree(traces_dir)
2322
2323 return push_stdout
2324
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002325 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002327 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002328 # Load default for user, repo, squash=true, in this order.
2329 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002330
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002332 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002333 # This may be None; default fallback value is determined in logic below.
2334 title = options.title
2335
Dominic Battre7d1c4842017-10-27 09:17:28 +02002336 # Extract bug number from branch name.
2337 bug = options.bug
2338 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2339 if not bug and match:
2340 bug = match.group(1)
2341
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002343 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 if self.GetIssue():
2345 # Try to get the message from a previous upload.
2346 message = self.GetDescription()
2347 if not message:
2348 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002349 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002351 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002352 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002353 # When uploading a subsequent patchset, -m|--message is taken
2354 # as the patchset title if --title was not provided.
2355 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002356 else:
2357 default_title = RunGit(
2358 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002359 if options.force:
2360 title = default_title
2361 else:
2362 title = ask_for_data(
2363 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002364 change_id = self._GetChangeDetail()['change_id']
2365 while True:
2366 footer_change_ids = git_footers.get_footer_change_id(message)
2367 if footer_change_ids == [change_id]:
2368 break
2369 if not footer_change_ids:
2370 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002371 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 continue
2373 # There is already a valid footer but with different or several ids.
2374 # Doing this automatically is non-trivial as we don't want to lose
2375 # existing other footers, yet we want to append just 1 desired
2376 # Change-Id. Thus, just create a new footer, but let user verify the
2377 # new description.
2378 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002379 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002381 print(
2382 'WARNING: change %s has Change-Id footer(s):\n'
2383 ' %s\n'
2384 'but change has Change-Id %s, according to Gerrit.\n'
2385 'Please, check the proposed correction to the description, '
2386 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2387 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2388 change_id))
2389 confirm_or_exit(action='edit')
2390 change_desc.prompt()
2391
2392 message = change_desc.description
2393 if not message:
2394 DieWithError("Description is empty. Aborting...")
2395
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 # Continue the while loop.
2397 # Sanity check of this code - we should end up with proper message
2398 # footer.
2399 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002400 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002401 else: # if not self.GetIssue()
2402 if options.message:
2403 message = options.message
2404 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002405 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002406 if options.title:
2407 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002408 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002410 change_desc.prompt()
2411
Aaron Gableb56ad332017-01-06 15:24:31 -08002412 # On first upload, patchset title is always this string, while
2413 # --title flag gets converted to first line of message.
2414 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 if not change_desc.description:
2416 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002417 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002418 if len(change_ids) > 1:
2419 DieWithError('too many Change-Id footers, at most 1 allowed.')
2420 if not change_ids:
2421 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002422 change_desc.set_description(git_footers.add_footer_change_id(
2423 change_desc.description,
2424 GenerateGerritChangeId(change_desc.description)))
2425 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 assert len(change_ids) == 1
2427 change_id = change_ids[0]
2428
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002429 if options.reviewers or options.tbrs or options.add_owners_to:
2430 change_desc.update_reviewers(options.reviewers, options.tbrs,
2431 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002432 if options.preserve_tryjobs:
2433 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002434
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002435 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002436 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2437 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002439 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2440 desc_tempfile.write(change_desc.description)
2441 desc_tempfile.close()
2442 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2443 '-F', desc_tempfile.name]).strip()
2444 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002445 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002446 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002447 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002448 if not change_desc.description:
2449 DieWithError("Description is empty. Aborting...")
2450
2451 if not git_footers.get_footer_change_id(change_desc.description):
2452 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002453 change_desc.set_description(
2454 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002455 if options.reviewers or options.tbrs or options.add_owners_to:
2456 change_desc.update_reviewers(options.reviewers, options.tbrs,
2457 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002458 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002459 # For no-squash mode, we assume the remote called "origin" is the one we
2460 # want. It is not worthwhile to support different workflows for
2461 # no-squash mode.
2462 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2464
2465 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002466 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002467 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2468 ref_to_push)]).splitlines()
2469 if len(commits) > 1:
2470 print('WARNING: This will upload %d commits. Run the following command '
2471 'to see which commits will be uploaded: ' % len(commits))
2472 print('git log %s..%s' % (parent, ref_to_push))
2473 print('You can also use `git squash-branch` to squash these into a '
2474 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002475 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002476
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002477 if options.reviewers or options.tbrs or options.add_owners_to:
2478 change_desc.update_reviewers(options.reviewers, options.tbrs,
2479 options.add_owners_to, change)
2480
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002481 reviewers = sorted(change_desc.get_reviewers())
2482 # Add cc's from the CC_LIST and --cc flag (if any).
2483 if not options.private and not options.no_autocc:
2484 cc = self.GetCCList().split(',')
2485 else:
2486 cc = []
2487 if options.cc:
2488 cc.extend(options.cc)
2489 cc = filter(None, [email.strip() for email in cc])
2490 if change_desc.get_cced():
2491 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002492 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2493 valid_accounts = set(reviewers + cc)
2494 # TODO(crbug/877717): relax this for all hosts.
2495 else:
2496 valid_accounts = gerrit_util.ValidAccounts(
2497 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002498 logging.info('accounts %s are recognized, %s invalid',
2499 sorted(valid_accounts),
2500 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002501
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002502 # Extra options that can be specified at push time. Doc:
2503 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002504 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002505
Aaron Gable844cf292017-06-28 11:32:59 -07002506 # By default, new changes are started in WIP mode, and subsequent patchsets
2507 # don't send email. At any time, passing --send-mail will mark the change
2508 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002509 if options.send_mail:
2510 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002511 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002512 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002513 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002514 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002515 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002516
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002517 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002518 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002519
Aaron Gable9b713dd2016-12-14 16:04:21 -08002520 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002521 # Punctuation and whitespace in |title| must be percent-encoded.
2522 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002523
agablec6787972016-09-09 16:13:34 -07002524 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002525 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002526
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002527 for r in sorted(reviewers):
2528 if r in valid_accounts:
2529 refspec_opts.append('r=%s' % r)
2530 reviewers.remove(r)
2531 else:
2532 # TODO(tandrii): this should probably be a hard failure.
2533 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2534 % r)
2535 for c in sorted(cc):
2536 # refspec option will be rejected if cc doesn't correspond to an
2537 # account, even though REST call to add such arbitrary cc may succeed.
2538 if c in valid_accounts:
2539 refspec_opts.append('cc=%s' % c)
2540 cc.remove(c)
2541
rmistry9eadede2016-09-19 11:22:43 -07002542 if options.topic:
2543 # Documentation on Gerrit topics is here:
2544 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002545 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002546
Edward Lemur687ca902018-12-05 02:30:30 +00002547 if options.enable_auto_submit:
2548 refspec_opts.append('l=Auto-Submit+1')
2549 if options.use_commit_queue:
2550 refspec_opts.append('l=Commit-Queue+2')
2551 elif options.cq_dry_run:
2552 refspec_opts.append('l=Commit-Queue+1')
2553
2554 if change_desc.get_reviewers(tbr_only=True):
2555 score = gerrit_util.GetCodeReviewTbrScore(
2556 self._GetGerritHost(),
2557 self._GetGerritProject())
2558 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002559
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002560 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002561 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002562 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002563 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002564 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2565
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002566 refspec_suffix = ''
2567 if refspec_opts:
2568 refspec_suffix = '%' + ','.join(refspec_opts)
2569 assert ' ' not in refspec_suffix, (
2570 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2571 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2572
Edward Lemur1b52d872019-05-09 21:12:12 +00002573 git_push_metadata = {
2574 'gerrit_host': self._GetGerritHost(),
2575 'title': title or '<untitled>',
2576 'change_id': change_id,
2577 'description': change_desc.description,
2578 }
2579 push_stdout = self._RunGitPushWithTraces(
2580 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002581
2582 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002583 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002584 change_numbers = [m.group(1)
2585 for m in map(regex.match, push_stdout.splitlines())
2586 if m]
2587 if len(change_numbers) != 1:
2588 DieWithError(
2589 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002590 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002591 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002592 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002593
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002594 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002595 # GetIssue() is not set in case of non-squash uploads according to tests.
2596 # TODO(agable): non-squash uploads in git cl should be removed.
2597 gerrit_util.AddReviewers(
2598 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002599 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002600 reviewers, cc,
2601 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002602
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002603 return 0
2604
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002605 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2606 change_desc):
2607 """Computes parent of the generated commit to be uploaded to Gerrit.
2608
2609 Returns revision or a ref name.
2610 """
2611 if custom_cl_base:
2612 # Try to avoid creating additional unintended CLs when uploading, unless
2613 # user wants to take this risk.
2614 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2615 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2616 local_ref_of_target_remote])
2617 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002618 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002619 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2620 'If you proceed with upload, more than 1 CL may be created by '
2621 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2622 'If you are certain that specified base `%s` has already been '
2623 'uploaded to Gerrit as another CL, you may proceed.\n' %
2624 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2625 if not force:
2626 confirm_or_exit(
2627 'Do you take responsibility for cleaning up potential mess '
2628 'resulting from proceeding with upload?',
2629 action='upload')
2630 return custom_cl_base
2631
Aaron Gablef97e33d2017-03-30 15:44:27 -07002632 if remote != '.':
2633 return self.GetCommonAncestorWithUpstream()
2634
2635 # If our upstream branch is local, we base our squashed commit on its
2636 # squashed version.
2637 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2638
Aaron Gablef97e33d2017-03-30 15:44:27 -07002639 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002640 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002641
2642 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002643 # TODO(tandrii): consider checking parent change in Gerrit and using its
2644 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2645 # the tree hash of the parent branch. The upside is less likely bogus
2646 # requests to reupload parent change just because it's uploadhash is
2647 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002648 parent = RunGit(['config',
2649 'branch.%s.gerritsquashhash' % upstream_branch_name],
2650 error_ok=True).strip()
2651 # Verify that the upstream branch has been uploaded too, otherwise
2652 # Gerrit will create additional CLs when uploading.
2653 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2654 RunGitSilent(['rev-parse', parent + ':'])):
2655 DieWithError(
2656 '\nUpload upstream branch %s first.\n'
2657 'It is likely that this branch has been rebased since its last '
2658 'upload, so you just need to upload it again.\n'
2659 '(If you uploaded it with --no-squash, then branch dependencies '
2660 'are not supported, and you should reupload with --squash.)'
2661 % upstream_branch_name,
2662 change_desc)
2663 return parent
2664
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002665 def _AddChangeIdToCommitMessage(self, options, args):
2666 """Re-commits using the current message, assumes the commit hook is in
2667 place.
2668 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002669 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002670 git_command = ['commit', '--amend', '-m', log_desc]
2671 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002672 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002673 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002674 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002675 return new_log_desc
2676 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002677 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002678
tandriie113dfd2016-10-11 10:20:12 -07002679 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002680 try:
2681 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002682 except GerritChangeNotExists:
2683 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002684
2685 if data['status'] in ('ABANDONED', 'MERGED'):
2686 return 'CL %s is closed' % self.GetIssue()
2687
Edward Lemurf0faf482019-09-25 20:40:17 +00002688 # TODO(1004447): Remove on Oct 9th, 2019.
2689 def GetLegacyProperties(self, patchset=None):
2690 host = self.GetCodereviewServer()
2691 issue = self.GetIssue()
2692 patchset = int(patchset or self.GetPatchset())
2693 data = self._GetChangeDetail(['ALL_REVISIONS'])
2694
2695 assert host and issue and patchset, 'CL must be uploaded first'
2696
2697 revision_data = None # Pylint wants it to be defined.
2698 for revision_data in data['revisions'].itervalues():
2699 if int(revision_data['_number']) == patchset:
2700 break
2701 else:
2702 raise Exception('Patchset %d is not known in Gerrit change %d' %
2703 (patchset, issue))
2704
2705 return {
2706 'patch_issue': issue,
2707 'patch_set': patchset,
2708 'patch_project': data['project'],
2709 'patch_storage': 'gerrit',
2710 'patch_ref': revision_data['fetch']['http']['ref'],
2711 'patch_repository_url': revision_data['fetch']['http']['url'],
2712 'patch_gerrit_url': host,
2713 }
2714
2715
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002716 def GetGerritChange(self, patchset=None):
2717 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2718 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2719 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002720 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002721 data = self._GetChangeDetail(['ALL_REVISIONS'])
2722
2723 assert host and issue and patchset, 'CL must be uploaded first'
2724
2725 has_patchset = any(
2726 int(revision_data['_number']) == patchset
2727 for revision_data in data['revisions'].itervalues())
2728 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002729 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002730 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002731
tandrii8c5a3532016-11-04 07:52:02 -07002732 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002733 'host': host,
2734 'change': issue,
2735 'project': data['project'],
2736 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002737 }
tandriie113dfd2016-10-11 10:20:12 -07002738
tandriide281ae2016-10-12 06:02:30 -07002739 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002740 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002741
Edward Lemur707d70b2018-02-07 00:50:14 +01002742 def GetReviewers(self):
2743 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002744 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002745
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002746
2747_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002748 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002749}
2750
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002751
iannuccie53c9352016-08-17 14:40:40 -07002752def _add_codereview_issue_select_options(parser, extra=""):
2753 _add_codereview_select_options(parser)
2754
2755 text = ('Operate on this issue number instead of the current branch\'s '
2756 'implicit issue.')
2757 if extra:
2758 text += ' '+extra
2759 parser.add_option('-i', '--issue', type=int, help=text)
2760
2761
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002762def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002763 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002764 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002765 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002766 parser.add_option_group(parser.codereview_group)
2767 parser.codereview_group.add_option(
2768 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002769 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002770
2771
2772def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002773 options.forced_codereview = None
2774 if options.gerrit:
2775 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002776
2777
tandriif9aefb72016-07-01 09:06:51 -07002778def _get_bug_line_values(default_project, bugs):
2779 """Given default_project and comma separated list of bugs, yields bug line
2780 values.
2781
2782 Each bug can be either:
2783 * a number, which is combined with default_project
2784 * string, which is left as is.
2785
2786 This function may produce more than one line, because bugdroid expects one
2787 project per line.
2788
2789 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2790 ['v8:123', 'chromium:789']
2791 """
2792 default_bugs = []
2793 others = []
2794 for bug in bugs.split(','):
2795 bug = bug.strip()
2796 if bug:
2797 try:
2798 default_bugs.append(int(bug))
2799 except ValueError:
2800 others.append(bug)
2801
2802 if default_bugs:
2803 default_bugs = ','.join(map(str, default_bugs))
2804 if default_project:
2805 yield '%s:%s' % (default_project, default_bugs)
2806 else:
2807 yield default_bugs
2808 for other in sorted(others):
2809 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2810 yield other
2811
2812
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002813class ChangeDescription(object):
2814 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002815 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002816 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002817 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002818 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002819 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2820 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2821 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2822 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002823
Anthony Polito8b955342019-09-24 19:01:36 +00002824 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002825 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002826 if bug:
2827 regexp = re.compile(self.BUG_LINE)
2828 prefix = settings.GetBugPrefix()
2829 if not any((regexp.match(line) for line in self._description_lines)):
2830 values = list(_get_bug_line_values(prefix, bug))
2831 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002832
agable@chromium.org42c20792013-09-12 17:34:49 +00002833 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002834 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002835 return '\n'.join(self._description_lines)
2836
2837 def set_description(self, desc):
2838 if isinstance(desc, basestring):
2839 lines = desc.splitlines()
2840 else:
2841 lines = [line.rstrip() for line in desc]
2842 while lines and not lines[0]:
2843 lines.pop(0)
2844 while lines and not lines[-1]:
2845 lines.pop(-1)
2846 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002848 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2849 """Rewrites the R=/TBR= line(s) as a single line each.
2850
2851 Args:
2852 reviewers (list(str)) - list of additional emails to use for reviewers.
2853 tbrs (list(str)) - list of additional emails to use for TBRs.
2854 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2855 the change that are missing OWNER coverage. If this is not None, you
2856 must also pass a value for `change`.
2857 change (Change) - The Change that should be used for OWNERS lookups.
2858 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002859 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002860 assert isinstance(tbrs, list), tbrs
2861
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002862 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002863 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002864
2865 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002867
2868 reviewers = set(reviewers)
2869 tbrs = set(tbrs)
2870 LOOKUP = {
2871 'TBR': tbrs,
2872 'R': reviewers,
2873 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002874
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002875 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002876 regexp = re.compile(self.R_LINE)
2877 matches = [regexp.match(line) for line in self._description_lines]
2878 new_desc = [l for i, l in enumerate(self._description_lines)
2879 if not matches[i]]
2880 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002881
agable@chromium.org42c20792013-09-12 17:34:49 +00002882 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002883
2884 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002885 for match in matches:
2886 if not match:
2887 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002888 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2889
2890 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002891 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002892 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002893 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002894 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002895 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002896 LOOKUP[add_owners_to].update(
2897 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002898
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002899 # If any folks ended up in both groups, remove them from tbrs.
2900 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002901
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002902 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2903 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002904
2905 # Put the new lines in the description where the old first R= line was.
2906 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2907 if 0 <= line_loc < len(self._description_lines):
2908 if new_tbr_line:
2909 self._description_lines.insert(line_loc, new_tbr_line)
2910 if new_r_line:
2911 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002912 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002913 if new_r_line:
2914 self.append_footer(new_r_line)
2915 if new_tbr_line:
2916 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002917
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002918 def set_preserve_tryjobs(self):
2919 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2920 footers = git_footers.parse_footers(self.description)
2921 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2922 if v.lower() == 'true':
2923 return
2924 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2925
Anthony Polito8b955342019-09-24 19:01:36 +00002926 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002927 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002928 self.set_description([
2929 '# Enter a description of the change.',
2930 '# This will be displayed on the codereview site.',
2931 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002932 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002933 '--------------------',
2934 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002935 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002936 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002937 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002938 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002939
agable@chromium.org42c20792013-09-12 17:34:49 +00002940 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002941 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002942 if not content:
2943 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002944 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002945
Bruce Dawson2377b012018-01-11 16:46:49 -08002946 # Strip off comments and default inserted "Bug:" line.
2947 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002948 (line.startswith('#') or
2949 line.rstrip() == "Bug:" or
2950 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002951 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002952 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002954
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002955 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002956 """Adds a footer line to the description.
2957
2958 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2959 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2960 that Gerrit footers are always at the end.
2961 """
2962 parsed_footer_line = git_footers.parse_footer(line)
2963 if parsed_footer_line:
2964 # Line is a gerrit footer in the form: Footer-Key: any value.
2965 # Thus, must be appended observing Gerrit footer rules.
2966 self.set_description(
2967 git_footers.add_footer(self.description,
2968 key=parsed_footer_line[0],
2969 value=parsed_footer_line[1]))
2970 return
2971
2972 if not self._description_lines:
2973 self._description_lines.append(line)
2974 return
2975
2976 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2977 if gerrit_footers:
2978 # git_footers.split_footers ensures that there is an empty line before
2979 # actual (gerrit) footers, if any. We have to keep it that way.
2980 assert top_lines and top_lines[-1] == ''
2981 top_lines, separator = top_lines[:-1], top_lines[-1:]
2982 else:
2983 separator = [] # No need for separator if there are no gerrit_footers.
2984
2985 prev_line = top_lines[-1] if top_lines else ''
2986 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2987 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2988 top_lines.append('')
2989 top_lines.append(line)
2990 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002991
tandrii99a72f22016-08-17 14:33:24 -07002992 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002993 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002994 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002995 reviewers = [match.group(2).strip()
2996 for match in matches
2997 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002998 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002999
bradnelsond975b302016-10-23 12:20:23 -07003000 def get_cced(self):
3001 """Retrieves the list of reviewers."""
3002 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3003 cced = [match.group(2).strip() for match in matches if match]
3004 return cleanup_list(cced)
3005
Nodir Turakulov23b82142017-11-16 11:04:25 -08003006 def get_hash_tags(self):
3007 """Extracts and sanitizes a list of Gerrit hashtags."""
3008 subject = (self._description_lines or ('',))[0]
3009 subject = re.sub(
3010 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3011
3012 tags = []
3013 start = 0
3014 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3015 while True:
3016 m = bracket_exp.match(subject, start)
3017 if not m:
3018 break
3019 tags.append(self.sanitize_hash_tag(m.group(1)))
3020 start = m.end()
3021
3022 if not tags:
3023 # Try "Tag: " prefix.
3024 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3025 if m:
3026 tags.append(self.sanitize_hash_tag(m.group(1)))
3027 return tags
3028
3029 @classmethod
3030 def sanitize_hash_tag(cls, tag):
3031 """Returns a sanitized Gerrit hash tag.
3032
3033 A sanitized hashtag can be used as a git push refspec parameter value.
3034 """
3035 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3036
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003037 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3038 """Updates this commit description given the parent.
3039
3040 This is essentially what Gnumbd used to do.
3041 Consult https://goo.gl/WMmpDe for more details.
3042 """
3043 assert parent_msg # No, orphan branch creation isn't supported.
3044 assert parent_hash
3045 assert dest_ref
3046 parent_footer_map = git_footers.parse_footers(parent_msg)
3047 # This will also happily parse svn-position, which GnumbD is no longer
3048 # supporting. While we'd generate correct footers, the verifier plugin
3049 # installed in Gerrit will block such commit (ie git push below will fail).
3050 parent_position = git_footers.get_position(parent_footer_map)
3051
3052 # Cherry-picks may have last line obscuring their prior footers,
3053 # from git_footers perspective. This is also what Gnumbd did.
3054 cp_line = None
3055 if (self._description_lines and
3056 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3057 cp_line = self._description_lines.pop()
3058
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003059 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003060
3061 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3062 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003063 for i, line in enumerate(footer_lines):
3064 k, v = git_footers.parse_footer(line) or (None, None)
3065 if k and k.startswith('Cr-'):
3066 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003067
3068 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003069 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003070 if parent_position[0] == dest_ref:
3071 # Same branch as parent.
3072 number = int(parent_position[1]) + 1
3073 else:
3074 number = 1 # New branch, and extra lineage.
3075 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3076 int(parent_position[1])))
3077
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003078 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3079 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003080
3081 self._description_lines = top_lines
3082 if cp_line:
3083 self._description_lines.append(cp_line)
3084 if self._description_lines[-1] != '':
3085 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003086 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003087
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003088
Aaron Gablea1bab272017-04-11 16:38:18 -07003089def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003090 """Retrieves the reviewers that approved a CL from the issue properties with
3091 messages.
3092
3093 Note that the list may contain reviewers that are not committer, thus are not
3094 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003095
3096 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003097 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003098 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003099 return sorted(
3100 set(
3101 message['sender']
3102 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003103 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003104 )
3105 )
3106
3107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003108def FindCodereviewSettingsFile(filename='codereview.settings'):
3109 """Finds the given file starting in the cwd and going up.
3110
3111 Only looks up to the top of the repository unless an
3112 'inherit-review-settings-ok' file exists in the root of the repository.
3113 """
3114 inherit_ok_file = 'inherit-review-settings-ok'
3115 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003116 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003117 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3118 root = '/'
3119 while True:
3120 if filename in os.listdir(cwd):
3121 if os.path.isfile(os.path.join(cwd, filename)):
3122 return open(os.path.join(cwd, filename))
3123 if cwd == root:
3124 break
3125 cwd = os.path.dirname(cwd)
3126
3127
3128def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003129 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003130 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003131
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003132 def SetProperty(name, setting, unset_error_ok=False):
3133 fullname = 'rietveld.' + name
3134 if setting in keyvals:
3135 RunGit(['config', fullname, keyvals[setting]])
3136 else:
3137 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3138
tandrii48df5812016-10-17 03:55:37 -07003139 if not keyvals.get('GERRIT_HOST', False):
3140 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003141 # Only server setting is required. Other settings can be absent.
3142 # In that case, we ignore errors raised during option deletion attempt.
3143 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3144 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3145 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003146 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003147 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3148 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003149 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3150 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003151
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003152 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003153 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003154
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003155 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003156 RunGit(['config', 'gerrit.squash-uploads',
3157 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003158
tandrii@chromium.org28253532016-04-14 13:46:56 +00003159 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003160 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003161 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3162
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003163 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003164 # should be of the form
3165 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3166 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003167 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3168 keyvals['ORIGIN_URL_CONFIG']])
3169
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003170
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003171def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003172 """Downloads a network object to a local file, like urllib.urlretrieve.
3173
3174 This is necessary because urllib is broken for SSL connections via a proxy.
3175 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003176 with open(destination, 'w') as f:
3177 f.write(urllib2.urlopen(source).read())
3178
3179
ukai@chromium.org712d6102013-11-27 00:52:58 +00003180def hasSheBang(fname):
3181 """Checks fname is a #! script."""
3182 with open(fname) as f:
3183 return f.read(2).startswith('#!')
3184
3185
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003186# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3187def DownloadHooks(*args, **kwargs):
3188 pass
3189
3190
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003191def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003192 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003193
3194 Args:
3195 force: True to update hooks. False to install hooks if not present.
3196 """
3197 if not settings.GetIsGerrit():
3198 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003199 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003200 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3201 if not os.access(dst, os.X_OK):
3202 if os.path.exists(dst):
3203 if not force:
3204 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003205 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003206 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003207 if not hasSheBang(dst):
3208 DieWithError('Not a script: %s\n'
3209 'You need to download from\n%s\n'
3210 'into .git/hooks/commit-msg and '
3211 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003212 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3213 except Exception:
3214 if os.path.exists(dst):
3215 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003216 DieWithError('\nFailed to download hooks.\n'
3217 'You need to download from\n%s\n'
3218 'into .git/hooks/commit-msg and '
3219 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003220
3221
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003222class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003223 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003224
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003225 _GOOGLESOURCE = 'googlesource.com'
3226
3227 def __init__(self):
3228 # Cached list of [host, identity, source], where source is either
3229 # .gitcookies or .netrc.
3230 self._all_hosts = None
3231
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003232 def ensure_configured_gitcookies(self):
3233 """Runs checks and suggests fixes to make git use .gitcookies from default
3234 path."""
3235 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3236 configured_path = RunGitSilent(
3237 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003238 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003239 if configured_path:
3240 self._ensure_default_gitcookies_path(configured_path, default)
3241 else:
3242 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003243
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003244 @staticmethod
3245 def _ensure_default_gitcookies_path(configured_path, default_path):
3246 assert configured_path
3247 if configured_path == default_path:
3248 print('git is already configured to use your .gitcookies from %s' %
3249 configured_path)
3250 return
3251
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003252 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003253 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3254 (configured_path, default_path))
3255
3256 if not os.path.exists(configured_path):
3257 print('However, your configured .gitcookies file is missing.')
3258 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3259 action='reconfigure')
3260 RunGit(['config', '--global', 'http.cookiefile', default_path])
3261 return
3262
3263 if os.path.exists(default_path):
3264 print('WARNING: default .gitcookies file already exists %s' %
3265 default_path)
3266 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3267 default_path)
3268
3269 confirm_or_exit('Move existing .gitcookies to default location?',
3270 action='move')
3271 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003272 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003273 print('Moved and reconfigured git to use .gitcookies from %s' %
3274 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003275
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003276 @staticmethod
3277 def _configure_gitcookies_path(default_path):
3278 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3279 if os.path.exists(netrc_path):
3280 print('You seem to be using outdated .netrc for git credentials: %s' %
3281 netrc_path)
3282 print('This tool will guide you through setting up recommended '
3283 '.gitcookies store for git credentials.\n'
3284 '\n'
3285 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3286 ' git config --global --unset http.cookiefile\n'
3287 ' mv %s %s.backup\n\n' % (default_path, default_path))
3288 confirm_or_exit(action='setup .gitcookies')
3289 RunGit(['config', '--global', 'http.cookiefile', default_path])
3290 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003291
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003292 def get_hosts_with_creds(self, include_netrc=False):
3293 if self._all_hosts is None:
3294 a = gerrit_util.CookiesAuthenticator()
3295 self._all_hosts = [
3296 (h, u, s)
3297 for h, u, s in itertools.chain(
3298 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3299 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3300 )
3301 if h.endswith(self._GOOGLESOURCE)
3302 ]
3303
3304 if include_netrc:
3305 return self._all_hosts
3306 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3307
3308 def print_current_creds(self, include_netrc=False):
3309 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3310 if not hosts:
3311 print('No Git/Gerrit credentials found')
3312 return
3313 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3314 header = [('Host', 'User', 'Which file'),
3315 ['=' * l for l in lengths]]
3316 for row in (header + hosts):
3317 print('\t'.join((('%%+%ds' % l) % s)
3318 for l, s in zip(lengths, row)))
3319
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003320 @staticmethod
3321 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003322 """Parses identity "git-<username>.domain" into <username> and domain."""
3323 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003324 # distinguishable from sub-domains. But we do know typical domains:
3325 if identity.endswith('.chromium.org'):
3326 domain = 'chromium.org'
3327 username = identity[:-len('.chromium.org')]
3328 else:
3329 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003330 if username.startswith('git-'):
3331 username = username[len('git-'):]
3332 return username, domain
3333
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003334 def _canonical_git_googlesource_host(self, host):
3335 """Normalizes Gerrit hosts (with '-review') to Git host."""
3336 assert host.endswith(self._GOOGLESOURCE)
3337 # Prefix doesn't include '.' at the end.
3338 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3339 if prefix.endswith('-review'):
3340 prefix = prefix[:-len('-review')]
3341 return prefix + '.' + self._GOOGLESOURCE
3342
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003343 def _canonical_gerrit_googlesource_host(self, host):
3344 git_host = self._canonical_git_googlesource_host(host)
3345 prefix = git_host.split('.', 1)[0]
3346 return prefix + '-review.' + self._GOOGLESOURCE
3347
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003348 def _get_counterpart_host(self, host):
3349 assert host.endswith(self._GOOGLESOURCE)
3350 git = self._canonical_git_googlesource_host(host)
3351 gerrit = self._canonical_gerrit_googlesource_host(git)
3352 return git if gerrit == host else gerrit
3353
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003354 def has_generic_host(self):
3355 """Returns whether generic .googlesource.com has been configured.
3356
3357 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3358 """
3359 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3360 if host == '.' + self._GOOGLESOURCE:
3361 return True
3362 return False
3363
3364 def _get_git_gerrit_identity_pairs(self):
3365 """Returns map from canonic host to pair of identities (Git, Gerrit).
3366
3367 One of identities might be None, meaning not configured.
3368 """
3369 host_to_identity_pairs = {}
3370 for host, identity, _ in self.get_hosts_with_creds():
3371 canonical = self._canonical_git_googlesource_host(host)
3372 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3373 idx = 0 if canonical == host else 1
3374 pair[idx] = identity
3375 return host_to_identity_pairs
3376
3377 def get_partially_configured_hosts(self):
3378 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003379 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3380 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3381 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003382
3383 def get_conflicting_hosts(self):
3384 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003385 host
3386 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003387 if None not in (i1, i2) and i1 != i2)
3388
3389 def get_duplicated_hosts(self):
3390 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3391 return set(host for host, count in counters.iteritems() if count > 1)
3392
3393 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3394 'chromium.googlesource.com': 'chromium.org',
3395 'chrome-internal.googlesource.com': 'google.com',
3396 }
3397
3398 def get_hosts_with_wrong_identities(self):
3399 """Finds hosts which **likely** reference wrong identities.
3400
3401 Note: skips hosts which have conflicting identities for Git and Gerrit.
3402 """
3403 hosts = set()
3404 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3405 pair = self._get_git_gerrit_identity_pairs().get(host)
3406 if pair and pair[0] == pair[1]:
3407 _, domain = self._parse_identity(pair[0])
3408 if domain != expected:
3409 hosts.add(host)
3410 return hosts
3411
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003412 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003413 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003414 hosts = sorted(hosts)
3415 assert hosts
3416 if extra_column_func is None:
3417 extras = [''] * len(hosts)
3418 else:
3419 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003420 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3421 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003422 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003423 lines.append(tmpl % he)
3424 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003425
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003426 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003428 yield ('.googlesource.com wildcard record detected',
3429 ['Chrome Infrastructure team recommends to list full host names '
3430 'explicitly.'],
3431 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003432
3433 dups = self.get_duplicated_hosts()
3434 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003435 yield ('The following hosts were defined twice',
3436 self._format_hosts(dups),
3437 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003438
3439 partial = self.get_partially_configured_hosts()
3440 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3442 'These hosts are missing',
3443 self._format_hosts(partial, lambda host: 'but %s defined' %
3444 self._get_counterpart_host(host)),
3445 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003446
3447 conflicting = self.get_conflicting_hosts()
3448 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003449 yield ('The following Git hosts have differing credentials from their '
3450 'Gerrit counterparts',
3451 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3452 tuple(self._get_git_gerrit_identity_pairs()[host])),
3453 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003454
3455 wrong = self.get_hosts_with_wrong_identities()
3456 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003457 yield ('These hosts likely use wrong identity',
3458 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3459 (self._get_git_gerrit_identity_pairs()[host][0],
3460 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3461 wrong)
3462
3463 def find_and_report_problems(self):
3464 """Returns True if there was at least one problem, else False."""
3465 found = False
3466 bad_hosts = set()
3467 for title, sublines, hosts in self._find_problems():
3468 if not found:
3469 found = True
3470 print('\n\n.gitcookies problem report:\n')
3471 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003472 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003473 if sublines:
3474 print()
3475 print(' %s' % '\n '.join(sublines))
3476 print()
3477
3478 if bad_hosts:
3479 assert found
3480 print(' You can manually remove corresponding lines in your %s file and '
3481 'visit the following URLs with correct account to generate '
3482 'correct credential lines:\n' %
3483 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3484 print(' %s' % '\n '.join(sorted(set(
3485 gerrit_util.CookiesAuthenticator().get_new_password_url(
3486 self._canonical_git_googlesource_host(host))
3487 for host in bad_hosts
3488 ))))
3489 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003490
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003491
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003492@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003493def CMDcreds_check(parser, args):
3494 """Checks credentials and suggests changes."""
3495 _, _ = parser.parse_args(args)
3496
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003497 # Code below checks .gitcookies. Abort if using something else.
3498 authn = gerrit_util.Authenticator.get()
3499 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3500 if isinstance(authn, gerrit_util.GceAuthenticator):
3501 DieWithError(
3502 'This command is not designed for GCE, are you on a bot?\n'
3503 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3504 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003505 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003506 'This command is not designed for bot environment. It checks '
3507 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003508
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003509 checker = _GitCookiesChecker()
3510 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003511
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003512 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003513 checker.print_current_creds(include_netrc=True)
3514
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003515 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003516 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003517 return 0
3518 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003519
3520
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003521@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003522def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003523 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003524 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3525 branch = ShortBranchName(branchref)
3526 _, args = parser.parse_args(args)
3527 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003529 return RunGit(['config', 'branch.%s.base-url' % branch],
3530 error_ok=False).strip()
3531 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003533 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3534 error_ok=False).strip()
3535
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003536
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003537def color_for_status(status):
3538 """Maps a Changelist status to color, for CMDstatus and other tools."""
3539 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003540 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003541 'waiting': Fore.BLUE,
3542 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003543 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003544 'lgtm': Fore.GREEN,
3545 'commit': Fore.MAGENTA,
3546 'closed': Fore.CYAN,
3547 'error': Fore.WHITE,
3548 }.get(status, Fore.WHITE)
3549
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003550
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003551def get_cl_statuses(changes, fine_grained, max_processes=None):
3552 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003553
3554 If fine_grained is true, this will fetch CL statuses from the server.
3555 Otherwise, simply indicate if there's a matching url for the given branches.
3556
3557 If max_processes is specified, it is used as the maximum number of processes
3558 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3559 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003560
3561 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003562 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003563 if not changes:
3564 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003565
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003566 if not fine_grained:
3567 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003568 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003569 for cl in changes:
3570 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003571 return
3572
3573 # First, sort out authentication issues.
3574 logging.debug('ensuring credentials exist')
3575 for cl in changes:
3576 cl.EnsureAuthenticated(force=False, refresh=True)
3577
3578 def fetch(cl):
3579 try:
3580 return (cl, cl.GetStatus())
3581 except:
3582 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003583 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003584 raise
3585
3586 threads_count = len(changes)
3587 if max_processes:
3588 threads_count = max(1, min(threads_count, max_processes))
3589 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3590
3591 pool = ThreadPool(threads_count)
3592 fetched_cls = set()
3593 try:
3594 it = pool.imap_unordered(fetch, changes).__iter__()
3595 while True:
3596 try:
3597 cl, status = it.next(timeout=5)
3598 except multiprocessing.TimeoutError:
3599 break
3600 fetched_cls.add(cl)
3601 yield cl, status
3602 finally:
3603 pool.close()
3604
3605 # Add any branches that failed to fetch.
3606 for cl in set(changes) - fetched_cls:
3607 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003608
rmistry@google.com2dd99862015-06-22 12:22:18 +00003609
3610def upload_branch_deps(cl, args):
3611 """Uploads CLs of local branches that are dependents of the current branch.
3612
3613 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003614
3615 test1 -> test2.1 -> test3.1
3616 -> test3.2
3617 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003618
3619 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3620 run on the dependent branches in this order:
3621 test2.1, test3.1, test3.2, test2.2, test3.3
3622
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003623 Note: This function does not rebase your local dependent branches. Use it
3624 when you make a change to the parent branch that will not conflict
3625 with its dependent branches, and you would like their dependencies
3626 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003627 """
3628 if git_common.is_dirty_git_tree('upload-branch-deps'):
3629 return 1
3630
3631 root_branch = cl.GetBranch()
3632 if root_branch is None:
3633 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3634 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003635 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003636 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3637 'patchset dependencies without an uploaded CL.')
3638
3639 branches = RunGit(['for-each-ref',
3640 '--format=%(refname:short) %(upstream:short)',
3641 'refs/heads'])
3642 if not branches:
3643 print('No local branches found.')
3644 return 0
3645
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003646 # Create a dictionary of all local branches to the branches that are
3647 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648 tracked_to_dependents = collections.defaultdict(list)
3649 for b in branches.splitlines():
3650 tokens = b.split()
3651 if len(tokens) == 2:
3652 branch_name, tracked = tokens
3653 tracked_to_dependents[tracked].append(branch_name)
3654
vapiera7fbd5a2016-06-16 09:17:49 -07003655 print()
3656 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003657 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003658
rmistry@google.com2dd99862015-06-22 12:22:18 +00003659 def traverse_dependents_preorder(branch, padding=''):
3660 dependents_to_process = tracked_to_dependents.get(branch, [])
3661 padding += ' '
3662 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003663 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003664 dependents.append(dependent)
3665 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003666
rmistry@google.com2dd99862015-06-22 12:22:18 +00003667 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003668 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003669
3670 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003671 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003672 return 0
3673
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003674 confirm_or_exit('This command will checkout all dependent branches and run '
3675 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003676
rmistry@google.com2dd99862015-06-22 12:22:18 +00003677 # Record all dependents that failed to upload.
3678 failures = {}
3679 # Go through all dependents, checkout the branch and upload.
3680 try:
3681 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003682 print()
3683 print('--------------------------------------')
3684 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003685 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 try:
3688 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003689 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003690 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003691 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003692 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003694 finally:
3695 # Swap back to the original root branch.
3696 RunGit(['checkout', '-q', root_branch])
3697
vapiera7fbd5a2016-06-16 09:17:49 -07003698 print()
3699 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 for dependent_branch in dependents:
3701 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print(' %s : %s' % (dependent_branch, upload_status))
3703 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003704
3705 return 0
3706
3707
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003708@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003709def CMDarchive(parser, args):
3710 """Archives and deletes branches associated with closed changelists."""
3711 parser.add_option(
3712 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003713 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003714 parser.add_option(
3715 '-f', '--force', action='store_true',
3716 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003717 parser.add_option(
3718 '-d', '--dry-run', action='store_true',
3719 help='Skip the branch tagging and removal steps.')
3720 parser.add_option(
3721 '-t', '--notags', action='store_true',
3722 help='Do not tag archived branches. '
3723 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003724
kmarshall3bff56b2016-06-06 18:31:47 -07003725 options, args = parser.parse_args(args)
3726 if args:
3727 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003728
3729 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3730 if not branches:
3731 return 0
3732
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003734 changes = [Changelist(branchref=b)
3735 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003736 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3737 statuses = get_cl_statuses(changes,
3738 fine_grained=True,
3739 max_processes=options.maxjobs)
3740 proposal = [(cl.GetBranch(),
3741 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3742 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003743 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003744 proposal.sort()
3745
3746 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003747 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003748 return 0
3749
3750 current_branch = GetCurrentBranch()
3751
vapiera7fbd5a2016-06-16 09:17:49 -07003752 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003753 if options.notags:
3754 for next_item in proposal:
3755 print(' ' + next_item[0])
3756 else:
3757 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3758 for next_item in proposal:
3759 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003760
kmarshall9249e012016-08-23 12:02:16 -07003761 # Quit now on precondition failure or if instructed by the user, either
3762 # via an interactive prompt or by command line flags.
3763 if options.dry_run:
3764 print('\nNo changes were made (dry run).\n')
3765 return 0
3766 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003767 print('You are currently on a branch \'%s\' which is associated with a '
3768 'closed codereview issue, so archive cannot proceed. Please '
3769 'checkout another branch and run this command again.' %
3770 current_branch)
3771 return 1
kmarshall9249e012016-08-23 12:02:16 -07003772 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003773 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3774 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003775 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003776 return 1
3777
3778 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003779 if not options.notags:
3780 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003781 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003782
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003784
3785 return 0
3786
3787
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003788@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003789def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003790 """Show status of changelists.
3791
3792 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003793 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003794 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003795 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003796 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003797 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003798 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003799 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003800
3801 Also see 'git cl comments'.
3802 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003803 parser.add_option(
3804 '--no-branch-color',
3805 action='store_true',
3806 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003808 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003809 parser.add_option('-f', '--fast', action='store_true',
3810 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003811 parser.add_option(
3812 '-j', '--maxjobs', action='store', type=int,
3813 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003814
iannuccie53c9352016-08-17 14:40:40 -07003815 _add_codereview_issue_select_options(
3816 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003817 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003818 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003819 if args:
3820 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003821
iannuccie53c9352016-08-17 14:40:40 -07003822 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003823 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003824
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003825 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003826 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003828 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003829 elif options.field == 'id':
3830 issueid = cl.GetIssue()
3831 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003833 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003834 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003836 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003837 elif options.field == 'status':
3838 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003839 elif options.field == 'url':
3840 url = cl.GetIssueURL()
3841 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003842 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003843 return 0
3844
3845 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3846 if not branches:
3847 print('No local branch found.')
3848 return 0
3849
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003850 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003851 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003852 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003854 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003855 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003856 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003857
Daniel McArdlea23bf592019-02-12 00:25:12 +00003858 current_branch = GetCurrentBranch()
3859
3860 def FormatBranchName(branch, colorize=False):
3861 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3862 an asterisk when it is the current branch."""
3863
3864 asterisk = ""
3865 color = Fore.RESET
3866 if branch == current_branch:
3867 asterisk = "* "
3868 color = Fore.GREEN
3869 branch_name = ShortBranchName(branch)
3870
3871 if colorize:
3872 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003873 return asterisk + branch_name
3874
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003875 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003876
3877 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003878 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3879 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003880 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003881 c, status = output.next()
3882 branch_statuses[c.GetBranch()] = status
3883 status = branch_statuses.pop(branch)
3884 url = cl.GetIssueURL()
3885 if url and (not status or status == 'error'):
3886 # The issue probably doesn't exist anymore.
3887 url += ' (broken)'
3888
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003889 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003890 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003891 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003892 color = ''
3893 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003894 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003895
Alan Cuttera3be9a52019-03-04 18:50:33 +00003896 branch_display = FormatBranchName(branch)
3897 padding = ' ' * (alignment - len(branch_display))
3898 if not options.no_branch_color:
3899 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003900
Alan Cuttera3be9a52019-03-04 18:50:33 +00003901 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3902 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003903
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003905 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003906 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003907 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003908 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003909 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003910 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003911 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003913 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003914 print('Issue description:')
3915 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003916 return 0
3917
3918
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003919def colorize_CMDstatus_doc():
3920 """To be called once in main() to add colors to git cl status help."""
3921 colors = [i for i in dir(Fore) if i[0].isupper()]
3922
3923 def colorize_line(line):
3924 for color in colors:
3925 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003926 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003927 indent = len(line) - len(line.lstrip(' ')) + 1
3928 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3929 return line
3930
3931 lines = CMDstatus.__doc__.splitlines()
3932 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3933
3934
phajdan.jre328cf92016-08-22 04:12:17 -07003935def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003936 if path == '-':
3937 json.dump(contents, sys.stdout)
3938 else:
3939 with open(path, 'w') as f:
3940 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003941
3942
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003943@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003944@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003945def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003946 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003947
3948 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003949 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003950 parser.add_option('-r', '--reverse', action='store_true',
3951 help='Lookup the branch(es) for the specified issues. If '
3952 'no issues are specified, all branches with mapped '
3953 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003954 parser.add_option('--json',
3955 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003956 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003957 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003958 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003959
dnj@chromium.org406c4402015-03-03 17:22:28 +00003960 if options.reverse:
3961 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003962 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003963 # Reverse issue lookup.
3964 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003965
3966 git_config = {}
3967 for config in RunGit(['config', '--get-regexp',
3968 r'branch\..*issue']).splitlines():
3969 name, _space, val = config.partition(' ')
3970 git_config[name] = val
3971
dnj@chromium.org406c4402015-03-03 17:22:28 +00003972 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003973 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3974 config_key = _git_branch_config_key(ShortBranchName(branch),
3975 cls.IssueConfigKey())
3976 issue = git_config.get(config_key)
3977 if issue:
3978 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003979 if not args:
3980 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003981 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003982 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003983 try:
3984 issue_num = int(issue)
3985 except ValueError:
3986 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003987 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003988 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003990 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003991 if options.json:
3992 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003993 return 0
3994
3995 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003996 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003997 if not issue.valid:
3998 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3999 'or no argument to list it.\n'
4000 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004001 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004002 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004003 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004004 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004005 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4006 if options.json:
4007 write_json(options.json, {
4008 'issue': cl.GetIssue(),
4009 'issue_url': cl.GetIssueURL(),
4010 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004011 return 0
4012
4013
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004014@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004015def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004016 """Shows or posts review comments for any changelist."""
4017 parser.add_option('-a', '--add-comment', dest='comment',
4018 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004019 parser.add_option('-p', '--publish', action='store_true',
4020 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004021 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004022 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004023 parser.add_option('-m', '--machine-readable', dest='readable',
4024 action='store_false', default=True,
4025 help='output comments in a format compatible with '
4026 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004027 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004028 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004029 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004030 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004031 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004032
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004033 issue = None
4034 if options.issue:
4035 try:
4036 issue = int(options.issue)
4037 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004038 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004039
Edward Lemur934836a2019-09-09 20:16:54 +00004040 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004041
4042 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004043 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004044 return 0
4045
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004046 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4047 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004048 for comment in summary:
4049 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004050 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004051 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004052 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004053 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004054 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004055 elif comment.autogenerated:
4056 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004057 else:
4058 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004059 print('\n%s%s %s%s\n%s' % (
4060 color,
4061 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4062 comment.sender,
4063 Fore.RESET,
4064 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4065
smut@google.comc85ac942015-09-15 16:34:43 +00004066 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004067 def pre_serialize(c):
4068 dct = c.__dict__.copy()
4069 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4070 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004071 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004072 return 0
4073
4074
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004075@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004076@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004077def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004078 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004079 parser.add_option('-d', '--display', action='store_true',
4080 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004081 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004082 help='New description to set for this issue (- for stdin, '
4083 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004084 parser.add_option('-f', '--force', action='store_true',
4085 help='Delete any unpublished Gerrit edits for this issue '
4086 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004087
4088 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004089 options, args = parser.parse_args(args)
4090 _process_codereview_select_options(parser, options)
4091
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004092 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004093 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004094 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004095 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004096 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004097
Edward Lemur934836a2019-09-09 20:16:54 +00004098 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004099 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004100 if target_issue_arg:
4101 kwargs['issue'] = target_issue_arg.issue
4102 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004103 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004104 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004105
4106 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004107 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004108 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004109 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004110
4111 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004112 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004113
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004114 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004115
smut@google.com34fb6b12015-07-13 20:03:26 +00004116 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004117 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004118 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004119
4120 if options.new_description:
4121 text = options.new_description
4122 if text == '-':
4123 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004124 elif text == '+':
4125 base_branch = cl.GetCommonAncestorWithUpstream()
4126 change = cl.GetChange(base_branch, None, local_description=True)
4127 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004128
4129 description.set_description(text)
4130 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004131 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004132 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004133 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004134 return 0
4135
4136
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004137@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004138def CMDlint(parser, args):
4139 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004140 parser.add_option('--filter', action='append', metavar='-x,+y',
4141 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004142 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004143
4144 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004145 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004146 try:
4147 import cpplint
4148 import cpplint_chromium
4149 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004151 return 1
4152
4153 # Change the current working directory before calling lint so that it
4154 # shows the correct base.
4155 previous_cwd = os.getcwd()
4156 os.chdir(settings.GetRoot())
4157 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004158 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004159 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4160 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004161 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004163 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004164
4165 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004166 command = args + files
4167 if options.filter:
4168 command = ['--filter=' + ','.join(options.filter)] + command
4169 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004170
4171 white_regex = re.compile(settings.GetLintRegex())
4172 black_regex = re.compile(settings.GetLintIgnoreRegex())
4173 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4174 for filename in filenames:
4175 if white_regex.match(filename):
4176 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004178 else:
4179 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4180 extra_check_functions)
4181 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004183 finally:
4184 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004185 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004186 if cpplint._cpplint_state.error_count != 0:
4187 return 1
4188 return 0
4189
4190
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004191@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004193 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004194 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004195 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004196 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004197 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004198 parser.add_option('--all', action='store_true',
4199 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004200 parser.add_option('--parallel', action='store_true',
4201 help='Run all tests specified by input_api.RunTests in all '
4202 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004203 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204
sbc@chromium.org71437c02015-04-09 19:29:40 +00004205 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004206 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207 return 1
4208
Edward Lemur934836a2019-09-09 20:16:54 +00004209 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004210 if args:
4211 base_branch = args[0]
4212 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004213 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004214 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004215
Aaron Gable8076c282017-11-29 14:39:41 -08004216 if options.all:
4217 base_change = cl.GetChange(base_branch, None)
4218 files = [('M', f) for f in base_change.AllFiles()]
4219 change = presubmit_support.GitChange(
4220 base_change.Name(),
4221 base_change.FullDescriptionText(),
4222 base_change.RepositoryRoot(),
4223 files,
4224 base_change.issue,
4225 base_change.patchset,
4226 base_change.author_email,
4227 base_change._upstream)
4228 else:
4229 change = cl.GetChange(base_branch, None)
4230
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004231 cl.RunHook(
4232 committing=not options.upload,
4233 may_prompt=False,
4234 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004235 change=change,
4236 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004237 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238
4239
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004240def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004241 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004242
4243 Works the same way as
4244 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4245 but can be called on demand on all platforms.
4246
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004247 The basic idea is to generate git hash of a state of the tree, original
4248 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004249 """
4250 lines = []
4251 tree_hash = RunGitSilent(['write-tree'])
4252 lines.append('tree %s' % tree_hash.strip())
4253 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4254 if code == 0:
4255 lines.append('parent %s' % parent.strip())
4256 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4257 lines.append('author %s' % author.strip())
4258 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4259 lines.append('committer %s' % committer.strip())
4260 lines.append('')
4261 # Note: Gerrit's commit-hook actually cleans message of some lines and
4262 # whitespace. This code is not doing this, but it clearly won't decrease
4263 # entropy.
4264 lines.append(message)
4265 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004266 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004267 return 'I%s' % change_hash.strip()
4268
4269
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004270def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004271 """Computes the remote branch ref to use for the CL.
4272
4273 Args:
4274 remote (str): The git remote for the CL.
4275 remote_branch (str): The git remote branch for the CL.
4276 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004277 """
4278 if not (remote and remote_branch):
4279 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004280
wittman@chromium.org455dc922015-01-26 20:15:50 +00004281 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004282 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004283 # refs, which are then translated into the remote full symbolic refs
4284 # below.
4285 if '/' not in target_branch:
4286 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4287 else:
4288 prefix_replacements = (
4289 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4290 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4291 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4292 )
4293 match = None
4294 for regex, replacement in prefix_replacements:
4295 match = re.search(regex, target_branch)
4296 if match:
4297 remote_branch = target_branch.replace(match.group(0), replacement)
4298 break
4299 if not match:
4300 # This is a branch path but not one we recognize; use as-is.
4301 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004302 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4303 # Handle the refs that need to land in different refs.
4304 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004305
wittman@chromium.org455dc922015-01-26 20:15:50 +00004306 # Create the true path to the remote branch.
4307 # Does the following translation:
4308 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4309 # * refs/remotes/origin/master -> refs/heads/master
4310 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4311 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4312 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4313 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4314 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4315 'refs/heads/')
4316 elif remote_branch.startswith('refs/remotes/branch-heads'):
4317 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004318
wittman@chromium.org455dc922015-01-26 20:15:50 +00004319 return remote_branch
4320
4321
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004322def cleanup_list(l):
4323 """Fixes a list so that comma separated items are put as individual items.
4324
4325 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4326 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4327 """
4328 items = sum((i.split(',') for i in l), [])
4329 stripped_items = (i.strip() for i in items)
4330 return sorted(filter(None, stripped_items))
4331
4332
Aaron Gable4db38df2017-11-03 14:59:07 -07004333@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004334@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004335def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004336 """Uploads the current changelist to codereview.
4337
4338 Can skip dependency patchset uploads for a branch by running:
4339 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004340 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004341 git config --unset branch.branch_name.skip-deps-uploads
4342 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004343
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004344 If the name of the checked out branch starts with "bug-" or "fix-" followed
4345 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004346 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004347
4348 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004349 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004350 [git-cl] add support for hashtags
4351 Foo bar: implement foo
4352 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004353 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004354 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4355 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004356 parser.add_option('--bypass-watchlists', action='store_true',
4357 dest='bypass_watchlists',
4358 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004359 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004360 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004361 parser.add_option('--message', '-m', dest='message',
4362 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004363 parser.add_option('-b', '--bug',
4364 help='pre-populate the bug number(s) for this issue. '
4365 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004366 parser.add_option('--message-file', dest='message_file',
4367 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004368 parser.add_option('--title', '-t', dest='title',
4369 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004370 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004371 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004372 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004373 parser.add_option('--tbrs',
4374 action='append', default=[],
4375 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004376 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004377 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004378 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004379 parser.add_option('--hashtag', dest='hashtags',
4380 action='append', default=[],
4381 help=('Gerrit hashtag for new CL; '
4382 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004383 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004384 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004385 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004386 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004387 metavar='TARGET',
4388 help='Apply CL to remote ref TARGET. ' +
4389 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004390 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004391 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004392 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004393 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004394 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004395 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004396 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4397 const='TBR', help='add a set of OWNERS to TBR')
4398 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4399 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004400 parser.add_option('-c', '--use-commit-queue', action='store_true',
4401 help='tell the CQ to commit this patchset; '
4402 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004403 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4404 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004405 help='Send the patchset to do a CQ dry run right after '
4406 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004407 parser.add_option('--preserve-tryjobs', action='store_true',
4408 help='instruct the CQ to let tryjobs running even after '
4409 'new patchsets are uploaded instead of canceling '
4410 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004411 parser.add_option('--dependencies', action='store_true',
4412 help='Uploads CLs of all the local branches that depend on '
4413 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004414 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4415 help='Sends your change to the CQ after an approval. Only '
4416 'works on repos that have the Auto-Submit label '
4417 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004418 parser.add_option('--parallel', action='store_true',
4419 help='Run all tests specified by input_api.RunTests in all '
4420 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004421
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004422 parser.add_option('--no-autocc', action='store_true',
4423 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004424 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004425 help='Set the review private. This implies --no-autocc.')
4426
rmistry@google.com2dd99862015-06-22 12:22:18 +00004427 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004428 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004429 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004430 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004431
sbc@chromium.org71437c02015-04-09 19:29:40 +00004432 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004433 return 1
4434
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004435 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004436 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004437 options.cc = cleanup_list(options.cc)
4438
tandriib80458a2016-06-23 12:20:07 -07004439 if options.message_file:
4440 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004441 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004442 options.message = gclient_utils.FileRead(options.message_file)
4443 options.message_file = None
4444
tandrii4d0545a2016-07-06 03:56:49 -07004445 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004446 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004447
Aaron Gableedbc4132017-09-11 13:22:28 -07004448 if options.use_commit_queue:
4449 options.send_mail = True
4450
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004451 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4452 settings.GetIsGerrit()
4453
Edward Lemur934836a2019-09-09 20:16:54 +00004454 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004455
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004456 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004457
4458
Francois Dorayd42c6812017-05-30 15:10:20 -04004459@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004460@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004461def CMDsplit(parser, args):
4462 """Splits a branch into smaller branches and uploads CLs.
4463
4464 Creates a branch and uploads a CL for each group of files modified in the
4465 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004466 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004467 the shared OWNERS file.
4468 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004469 parser.add_option('-d', '--description', dest='description_file',
4470 help='A text file containing a CL description in which '
4471 '$directory will be replaced by each CL\'s directory.')
4472 parser.add_option('-c', '--comment', dest='comment_file',
4473 help='A text file containing a CL comment.')
4474 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004475 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004476 help='List the files and reviewers for each CL that would '
4477 'be created, but don\'t create branches or CLs.')
4478 parser.add_option('--cq-dry-run', action='store_true',
4479 help='If set, will do a cq dry run for each uploaded CL. '
4480 'Please be careful when doing this; more than ~10 CLs '
4481 'has the potential to overload our build '
4482 'infrastructure. Try to upload these not during high '
4483 'load times (usually 11-3 Mountain View time). Email '
4484 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004485 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4486 default=True,
4487 help='Sends your change to the CQ after an approval. Only '
4488 'works on repos that have the Auto-Submit label '
4489 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004490 options, _ = parser.parse_args(args)
4491
4492 if not options.description_file:
4493 parser.error('No --description flag specified.')
4494
4495 def WrappedCMDupload(args):
4496 return CMDupload(OptionParser(), args)
4497
4498 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004499 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004500 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004501
4502
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004503@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004504@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004506 """DEPRECATED: Used to commit the current changelist via git-svn."""
4507 message = ('git-cl no longer supports committing to SVN repositories via '
4508 'git-svn. You probably want to use `git cl land` instead.')
4509 print(message)
4510 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004511
4512
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004513@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004514@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004515def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004516 """Commits the current changelist via git.
4517
4518 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4519 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004520 """
4521 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4522 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004523 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004524 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004525 parser.add_option('--parallel', action='store_true',
4526 help='Run all tests specified by input_api.RunTests in all '
4527 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004528 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004529
Edward Lemur934836a2019-09-09 20:16:54 +00004530 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004531
Robert Iannucci2e73d432018-03-14 01:10:47 -07004532 if not cl.GetIssue():
4533 DieWithError('You must upload the change first to Gerrit.\n'
4534 ' If you would rather have `git cl land` upload '
4535 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004536 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004537 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538
4539
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004540@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004541@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004543 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004544 parser.add_option('-b', dest='newbranch',
4545 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004546 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004547 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004549 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004550
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004551 group = optparse.OptionGroup(
4552 parser,
4553 'Options for continuing work on the current issue uploaded from a '
4554 'different clone (e.g. different machine). Must be used independently '
4555 'from the other options. No issue number should be specified, and the '
4556 'branch must have an issue number associated with it')
4557 group.add_option('--reapply', action='store_true', dest='reapply',
4558 help='Reset the branch and reapply the issue.\n'
4559 'CAUTION: This will undo any local changes in this '
4560 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004561
4562 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004563 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004564 parser.add_option_group(group)
4565
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004566 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004567 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004568 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004569
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004570 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004571 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004572 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004573 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004574 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004575
Edward Lemur934836a2019-09-09 20:16:54 +00004576 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004577 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004578 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004579
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004580 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004581 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004582 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004583
4584 RunGit(['reset', '--hard', upstream])
4585 if options.pull:
4586 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004587
Edward Lemurf38bc172019-09-03 21:02:13 +00004588 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004589
4590 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004591 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004592
Edward Lemurf38bc172019-09-03 21:02:13 +00004593 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004594 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004595 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004596
4597 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004598 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004599 }
4600 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004601 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004602 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004603 cl_kwargs['issue'] = target_issue_arg.issue
4604
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004605 # We don't want uncommitted changes mixed up with the patch.
4606 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004607 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004609 if options.newbranch:
4610 if options.force:
4611 RunGit(['branch', '-D', options.newbranch],
4612 stderr=subprocess2.PIPE, error_ok=True)
4613 RunGit(['new-branch', options.newbranch])
4614
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004615 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004616
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004617 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004618 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004619
Edward Lemurf38bc172019-09-03 21:02:13 +00004620 return cl.CMDPatchWithParsedIssue(
4621 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004622
4623
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004624def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004625 """Fetches the tree status and returns either 'open', 'closed',
4626 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004627 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004628 if url:
4629 status = urllib2.urlopen(url).read().lower()
4630 if status.find('closed') != -1 or status == '0':
4631 return 'closed'
4632 elif status.find('open') != -1 or status == '1':
4633 return 'open'
4634 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004635 return 'unset'
4636
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004637
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004638def GetTreeStatusReason():
4639 """Fetches the tree status from a json url and returns the message
4640 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004641 url = settings.GetTreeStatusUrl()
4642 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004643 connection = urllib2.urlopen(json_url)
4644 status = json.loads(connection.read())
4645 connection.close()
4646 return status['message']
4647
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004648
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004649@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004651 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004652 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004653 status = GetTreeStatus()
4654 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004655 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004656 return 2
4657
vapiera7fbd5a2016-06-16 09:17:49 -07004658 print('The tree is %s' % status)
4659 print()
4660 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661 if status != 'open':
4662 return 1
4663 return 0
4664
4665
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004666@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004667def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004668 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4669 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004670 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004671 '-b', '--bot', action='append',
4672 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4673 'times to specify multiple builders. ex: '
4674 '"-b win_rel -b win_layout". See '
4675 'the try server waterfall for the builders name and the tests '
4676 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004677 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004678 '-B', '--bucket', default='',
4679 help=('Buildbucket bucket to send the try requests.'))
4680 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004681 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004682 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004683 'be determined by the try recipe that builder runs, which usually '
4684 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004685 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004686 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004687 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004688 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004689 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004690 '--category', default='git_cl_try', help='Specify custom build category.')
4691 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004692 '--project',
4693 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004694 'in recipe to determine to which repository or directory to '
4695 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004696 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004697 '-p', '--property', dest='properties', action='append', default=[],
4698 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004699 'key2=value2 etc. The value will be treated as '
4700 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004701 'NOTE: using this may make your tryjob not usable for CQ, '
4702 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004703 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004704 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4705 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004706 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004707 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004708 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004709 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004710 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004711 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004712
machenbach@chromium.org45453142015-09-15 08:45:22 +00004713 # Make sure that all properties are prop=value pairs.
4714 bad_params = [x for x in options.properties if '=' not in x]
4715 if bad_params:
4716 parser.error('Got properties with missing "=": %s' % bad_params)
4717
maruel@chromium.org15192402012-09-06 12:38:29 +00004718 if args:
4719 parser.error('Unknown arguments: %s' % args)
4720
Edward Lemur934836a2019-09-09 20:16:54 +00004721 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004722 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004723 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004724
Edward Lemurf38bc172019-09-03 21:02:13 +00004725 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004726 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004727
tandriie113dfd2016-10-11 10:20:12 -07004728 error_message = cl.CannotTriggerTryJobReason()
4729 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004730 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004731
qyearsley1fdfcb62016-10-24 13:22:03 -07004732 buckets = _get_bucket_map(cl, options, parser)
Edward Lemurc8b67ed2019-09-12 20:28:58 +00004733 if buckets and any(b.startswith('master.') for b in buckets):
4734 print('ERROR: Buildbot masters are not supported.')
4735 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004736
qyearsleydd49f942016-10-28 11:57:22 -07004737 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4738 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004739 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004740 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004741 print('git cl try with no bots now defaults to CQ dry run.')
4742 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4743 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004744
borenet6c0efe62016-10-19 08:13:29 -07004745 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004746 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004747 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004748 'of bot requires an initial job from a parent (usually a builder). '
4749 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004750 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004751 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004752
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004753 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004754 try:
4755 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4756 except BuildbucketResponseException as ex:
4757 print('ERROR: %s' % ex)
4758 return 1
4759 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004760
4761
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004762@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004763def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004764 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004765 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004766 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004767 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004768 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004769 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004770 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004771 '--color', action='store_true', default=setup_color.IS_TTY,
4772 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004773 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004774 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4775 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004776 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004777 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004778 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004779 parser.add_option_group(group)
4780 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004781 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004782 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004783 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004784 if args:
4785 parser.error('Unrecognized args: %s' % ' '.join(args))
4786
4787 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004788 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004789 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004790 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004791
tandrii221ab252016-10-06 08:12:04 -07004792 patchset = options.patchset
4793 if not patchset:
4794 patchset = cl.GetMostRecentPatchset()
4795 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004796 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004797 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004798 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004799 cl.GetIssue())
4800
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004801 try:
tandrii221ab252016-10-06 08:12:04 -07004802 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004803 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004804 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004805 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004806 if options.json:
4807 write_try_results_json(options.json, jobs)
4808 else:
4809 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004810 return 0
4811
4812
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004813@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004814@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004815def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004816 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004817 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004818 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004819 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004820
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004821 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004822 if args:
4823 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004824 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004825 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004826 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004827 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004828
4829 # Clear configured merge-base, if there is one.
4830 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004831 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004832 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004833 return 0
4834
4835
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004836@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004837def CMDweb(parser, args):
4838 """Opens the current CL in the web browser."""
4839 _, args = parser.parse_args(args)
4840 if args:
4841 parser.error('Unrecognized args: %s' % ' '.join(args))
4842
4843 issue_url = Changelist().GetIssueURL()
4844 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004845 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004846 return 1
4847
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004848 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004849 # allows us to hide the "Created new window in existing browser session."
4850 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004851 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004852 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004853 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004854 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004855 os.open(os.devnull, os.O_RDWR)
4856 try:
4857 webbrowser.open(issue_url)
4858 finally:
4859 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004860 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004861 return 0
4862
4863
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004864@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004865def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004866 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004867 parser.add_option('-d', '--dry-run', action='store_true',
4868 help='trigger in dry run mode')
4869 parser.add_option('-c', '--clear', action='store_true',
4870 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004871 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004872 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004873 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004874 if args:
4875 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004876 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004877 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004878
Edward Lemur934836a2019-09-09 20:16:54 +00004879 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004880 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004881 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004882 elif options.dry_run:
4883 state = _CQState.DRY_RUN
4884 else:
4885 state = _CQState.COMMIT
4886 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004887 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004888 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004889 return 0
4890
4891
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004892@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004893def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004894 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004895 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004896 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004897 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004898 if args:
4899 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004900 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004901 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004902 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004903 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004904 cl.CloseIssue()
4905 return 0
4906
4907
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004908@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004909def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004910 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004911 parser.add_option(
4912 '--stat',
4913 action='store_true',
4914 dest='stat',
4915 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004916 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004917 if args:
4918 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004919
Edward Lemur934836a2019-09-09 20:16:54 +00004920 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004921 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004922 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004923 if not issue:
4924 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004925
Aaron Gablea718c3e2017-08-28 17:47:28 -07004926 base = cl._GitGetBranchConfigValue('last-upload-hash')
4927 if not base:
4928 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4929 if not base:
4930 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4931 revision_info = detail['revisions'][detail['current_revision']]
4932 fetch_info = revision_info['fetch']['http']
4933 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4934 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004935
Aaron Gablea718c3e2017-08-28 17:47:28 -07004936 cmd = ['git', 'diff']
4937 if options.stat:
4938 cmd.append('--stat')
4939 cmd.append(base)
4940 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004941
4942 return 0
4943
4944
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004945@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004946def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004947 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004948 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004949 '--ignore-current',
4950 action='store_true',
4951 help='Ignore the CL\'s current reviewers and start from scratch.')
4952 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004953 '--ignore-self',
4954 action='store_true',
4955 help='Do not consider CL\'s author as an owners.')
4956 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004957 '--no-color',
4958 action='store_true',
4959 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004960 parser.add_option(
4961 '--batch',
4962 action='store_true',
4963 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004964 # TODO: Consider moving this to another command, since other
4965 # git-cl owners commands deal with owners for a given CL.
4966 parser.add_option(
4967 '--show-all',
4968 action='store_true',
4969 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970 options, args = parser.parse_args(args)
4971
4972 author = RunGit(['config', 'user.email']).strip() or None
4973
Edward Lemur934836a2019-09-09 20:16:54 +00004974 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004975
Yang Guo6e269a02019-06-26 11:17:02 +00004976 if options.show_all:
4977 for arg in args:
4978 base_branch = cl.GetCommonAncestorWithUpstream()
4979 change = cl.GetChange(base_branch, None)
4980 database = owners.Database(change.RepositoryRoot(), file, os.path)
4981 database.load_data_needed_for([arg])
4982 print('Owners for %s:' % arg)
4983 for owner in sorted(database.all_possible_owners([arg], None)):
4984 print(' - %s' % owner)
4985 return 0
4986
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004987 if args:
4988 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004989 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004990 base_branch = args[0]
4991 else:
4992 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004993 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004994
4995 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004996 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4997
4998 if options.batch:
4999 db = owners.Database(change.RepositoryRoot(), file, os.path)
5000 print('\n'.join(db.reviewers_for(affected_files, author)))
5001 return 0
5002
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005003 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005004 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005005 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005006 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005007 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005008 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005009 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005010 override_files=change.OriginalOwnersFiles(),
5011 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005012
5013
Aiden Bennerc08566e2018-10-03 17:52:42 +00005014def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005015 """Generates a diff command."""
5016 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005017 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5018
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005019 if allow_prefix:
5020 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5021 # case that diff.noprefix is set in the user's git config.
5022 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5023 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005024 diff_cmd += ['--no-prefix']
5025
5026 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005027
5028 if args:
5029 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005030 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005031 diff_cmd.append(arg)
5032 else:
5033 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005034
5035 return diff_cmd
5036
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005037
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005038def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005039 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005040 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005041
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005042
enne@chromium.org555cfe42014-01-29 18:21:39 +00005043@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005044@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005045def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005046 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005047 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005048 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005049 parser.add_option('--full', action='store_true',
5050 help='Reformat the full content of all touched files')
5051 parser.add_option('--dry-run', action='store_true',
5052 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005053 parser.add_option(
5054 '--python',
5055 action='store_true',
5056 default=None,
5057 help='Enables python formatting on all python files.')
5058 parser.add_option(
5059 '--no-python',
5060 action='store_true',
5061 dest='python',
5062 help='Disables python formatting on all python files. '
5063 'Takes precedence over --python. '
5064 'If neither --python or --no-python are set, python '
5065 'files that have a .style.yapf file in an ancestor '
5066 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005067 parser.add_option('--js', action='store_true',
5068 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005069 parser.add_option('--diff', action='store_true',
5070 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005071 parser.add_option('--presubmit', action='store_true',
5072 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005073 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005074
Daniel Chengc55eecf2016-12-30 03:11:02 -08005075 # Normalize any remaining args against the current path, so paths relative to
5076 # the current directory are still resolved as expected.
5077 args = [os.path.join(os.getcwd(), arg) for arg in args]
5078
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005079 # git diff generates paths against the root of the repository. Change
5080 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005081 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005082 if rel_base_path:
5083 os.chdir(rel_base_path)
5084
digit@chromium.org29e47272013-05-17 17:01:46 +00005085 # Grab the merge-base commit, i.e. the upstream commit of the current
5086 # branch when it was created or the last time it was rebased. This is
5087 # to cover the case where the user may have called "git fetch origin",
5088 # moving the origin branch to a newer commit, but hasn't rebased yet.
5089 upstream_commit = None
5090 cl = Changelist()
5091 upstream_branch = cl.GetUpstreamBranch()
5092 if upstream_branch:
5093 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5094 upstream_commit = upstream_commit.strip()
5095
5096 if not upstream_commit:
5097 DieWithError('Could not find base commit for this branch. '
5098 'Are you in detached state?')
5099
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005100 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5101 diff_output = RunGit(changed_files_cmd)
5102 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005103 # Filter out files deleted by this CL
5104 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005105
Christopher Lamc5ba6922017-01-24 11:19:14 +11005106 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005107 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005108
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005109 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5110 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5111 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005112 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005113
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005114 top_dir = os.path.normpath(
5115 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5116
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005117 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5118 # formatted. This is used to block during the presubmit.
5119 return_value = 0
5120
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005121 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005122 # Locate the clang-format binary in the checkout
5123 try:
5124 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005125 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005126 DieWithError(e)
5127
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005128 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005129 cmd = [clang_format_tool]
5130 if not opts.dry_run and not opts.diff:
5131 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005132 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005133 if opts.diff:
5134 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005135 else:
5136 env = os.environ.copy()
5137 env['PATH'] = str(os.path.dirname(clang_format_tool))
5138 try:
5139 script = clang_format.FindClangFormatScriptInChromiumTree(
5140 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005141 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005142 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005143
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005144 cmd = [sys.executable, script, '-p0']
5145 if not opts.dry_run and not opts.diff:
5146 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005147
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005148 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5149 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005150
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005151 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5152 if opts.diff:
5153 sys.stdout.write(stdout)
5154 if opts.dry_run and len(stdout) > 0:
5155 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005156
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005157 # Similar code to above, but using yapf on .py files rather than clang-format
5158 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005159 py_explicitly_disabled = opts.python is not None and not opts.python
5160 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005161 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5162 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5163 if sys.platform.startswith('win'):
5164 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005165
Aiden Bennerc08566e2018-10-03 17:52:42 +00005166 # If we couldn't find a yapf file we'll default to the chromium style
5167 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005168 chromium_default_yapf_style = os.path.join(depot_tools_path,
5169 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005170 # Used for caching.
5171 yapf_configs = {}
5172 for f in python_diff_files:
5173 # Find the yapf style config for the current file, defaults to depot
5174 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005175 _FindYapfConfigFile(f, yapf_configs, top_dir)
5176
5177 # Turn on python formatting by default if a yapf config is specified.
5178 # This breaks in the case of this repo though since the specified
5179 # style file is also the global default.
5180 if opts.python is None:
5181 filtered_py_files = []
5182 for f in python_diff_files:
5183 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5184 filtered_py_files.append(f)
5185 else:
5186 filtered_py_files = python_diff_files
5187
5188 # Note: yapf still seems to fix indentation of the entire file
5189 # even if line ranges are specified.
5190 # See https://github.com/google/yapf/issues/499
5191 if not opts.full and filtered_py_files:
5192 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5193
5194 for f in filtered_py_files:
5195 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5196 if yapf_config is None:
5197 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005198
5199 cmd = [yapf_tool, '--style', yapf_config, f]
5200
5201 has_formattable_lines = False
5202 if not opts.full:
5203 # Only run yapf over changed line ranges.
5204 for diff_start, diff_len in py_line_diffs[f]:
5205 diff_end = diff_start + diff_len - 1
5206 # Yapf errors out if diff_end < diff_start but this
5207 # is a valid line range diff for a removal.
5208 if diff_end >= diff_start:
5209 has_formattable_lines = True
5210 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5211 # If all line diffs were removals we have nothing to format.
5212 if not has_formattable_lines:
5213 continue
5214
5215 if opts.diff or opts.dry_run:
5216 cmd += ['--diff']
5217 # Will return non-zero exit code if non-empty diff.
5218 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5219 if opts.diff:
5220 sys.stdout.write(stdout)
5221 elif len(stdout) > 0:
5222 return_value = 2
5223 else:
5224 cmd += ['-i']
5225 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005226
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005227 # Dart's formatter does not have the nice property of only operating on
5228 # modified chunks, so hard code full.
5229 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005230 try:
5231 command = [dart_format.FindDartFmtToolInChromiumTree()]
5232 if not opts.dry_run and not opts.diff:
5233 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005234 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005235
ppi@chromium.org6593d932016-03-03 15:41:15 +00005236 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005237 if opts.dry_run and stdout:
5238 return_value = 2
5239 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005240 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5241 'found in this checkout. Files in other languages are still '
5242 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005243
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005244 # Format GN build files. Always run on full build files for canonical form.
5245 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005246 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005247 if opts.dry_run or opts.diff:
5248 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005249 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005250 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5251 shell=sys.platform == 'win32',
5252 cwd=top_dir)
5253 if opts.dry_run and gn_ret == 2:
5254 return_value = 2 # Not formatted.
5255 elif opts.diff and gn_ret == 2:
5256 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005257 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005258 elif gn_ret != 0:
5259 # For non-dry run cases (and non-2 return values for dry-run), a
5260 # nonzero error code indicates a failure, probably because the file
5261 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005262 DieWithError('gn format failed on ' + gn_diff_file +
5263 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005264
Ilya Shermane081cbe2017-08-15 17:51:04 -07005265 # Skip the metrics formatting from the global presubmit hook. These files have
5266 # a separate presubmit hook that issues an error if the files need formatting,
5267 # whereas the top-level presubmit script merely issues a warning. Formatting
5268 # these files is somewhat slow, so it's important not to duplicate the work.
5269 if not opts.presubmit:
5270 for xml_dir in GetDirtyMetricsDirs(diff_files):
5271 tool_dir = os.path.join(top_dir, xml_dir)
5272 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5273 if opts.dry_run or opts.diff:
5274 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005275 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005276 if opts.diff:
5277 sys.stdout.write(stdout)
5278 if opts.dry_run and stdout:
5279 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005280
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005281 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005282
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005283
Steven Holte2e664bf2017-04-21 13:10:47 -07005284def GetDirtyMetricsDirs(diff_files):
5285 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5286 metrics_xml_dirs = [
5287 os.path.join('tools', 'metrics', 'actions'),
5288 os.path.join('tools', 'metrics', 'histograms'),
5289 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005290 os.path.join('tools', 'metrics', 'ukm'),
5291 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005292 for xml_dir in metrics_xml_dirs:
5293 if any(file.startswith(xml_dir) for file in xml_diff_files):
5294 yield xml_dir
5295
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005296
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005297@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005298@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005299def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005300 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005301 _, args = parser.parse_args(args)
5302
5303 if len(args) != 1:
5304 parser.print_help()
5305 return 1
5306
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005307 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005308 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005309 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005310
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005311 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005313 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005314 output = RunGit(['config', '--local', '--get-regexp',
5315 r'branch\..*\.%s' % issueprefix],
5316 error_ok=True)
5317 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005318 if issue == target_issue:
5319 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005320
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005321 branches = []
5322 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005323 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005324 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005325 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005326 return 1
5327 if len(branches) == 1:
5328 RunGit(['checkout', branches[0]])
5329 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005330 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005331 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005332 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005333 which = raw_input('Choose by index: ')
5334 try:
5335 RunGit(['checkout', branches[int(which)]])
5336 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005337 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005338 return 1
5339
5340 return 0
5341
5342
maruel@chromium.org29404b52014-09-08 22:58:00 +00005343def CMDlol(parser, args):
5344 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005345 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005346 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5347 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5348 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005349 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005350 return 0
5351
5352
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005353class OptionParser(optparse.OptionParser):
5354 """Creates the option parse and add --verbose support."""
5355 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005356 optparse.OptionParser.__init__(
5357 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005358 self.add_option(
5359 '-v', '--verbose', action='count', default=0,
5360 help='Use 2 times for more debugging info')
5361
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005362 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005363 try:
5364 return self._parse_args(args)
5365 finally:
5366 # Regardless of success or failure of args parsing, we want to report
5367 # metrics, but only after logging has been initialized (if parsing
5368 # succeeded).
5369 global settings
5370 settings = Settings()
5371
5372 if not metrics.DISABLE_METRICS_COLLECTION:
5373 # GetViewVCUrl ultimately calls logging method.
5374 project_url = settings.GetViewVCUrl().strip('/+')
5375 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5376 metrics.collector.add('project_urls', [project_url])
5377
5378 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005379 # Create an optparse.Values object that will store only the actual passed
5380 # options, without the defaults.
5381 actual_options = optparse.Values()
5382 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5383 # Create an optparse.Values object with the default options.
5384 options = optparse.Values(self.get_default_values().__dict__)
5385 # Update it with the options passed by the user.
5386 options._update_careful(actual_options.__dict__)
5387 # Store the options passed by the user in an _actual_options attribute.
5388 # We store only the keys, and not the values, since the values can contain
5389 # arbitrary information, which might be PII.
5390 metrics.collector.add('arguments', actual_options.__dict__.keys())
5391
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005392 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005393 logging.basicConfig(
5394 level=levels[min(options.verbose, len(levels) - 1)],
5395 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5396 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005397
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005398 return options, args
5399
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005400
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005401def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005402 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005403 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005404 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005405 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005406
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005407 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005408 dispatcher = subcommand.CommandDispatcher(__name__)
5409 try:
5410 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005411 except auth.AuthenticationError as e:
5412 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005413 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005414 if e.code != 500:
5415 raise
5416 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005417 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005418 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005419 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005420
5421
5422if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005423 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5424 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005425 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005426 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005427 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005428 sys.exit(main(sys.argv[1:]))