blob: 3c3bc4895c7f5166846edb0480d3c0114a3c64e5 [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 Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000018import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070029import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000031import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000039from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000040from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000041import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000042import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000043import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000044import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000045import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000046import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000048import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000049import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000050import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000051import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000053import presubmit_support
54import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000055import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040056import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000057import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000058import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import watchlists
60
tandrii7400cf02016-06-21 08:48:07 -070061__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062
Edward Lemur0f58ae42019-04-30 17:24:12 +000063# Traces for git push will be stored in a traces directory inside the
64# depot_tools checkout.
65DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
66TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
67
68# When collecting traces, Git hashes will be reduced to 6 characters to reduce
69# the size after compression.
70GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
71# Used to redact the cookies from the gitcookies file.
72GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
73
Edward Lemur1b52d872019-05-09 21:12:12 +000074# The maximum number of traces we will keep. Multiplied by 3 since we store
75# 3 files per trace.
76MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000077# Message to be displayed to the user to inform where to find the traces for a
78# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000079TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000080'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000081'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000082' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000083'Copies of your gitcookies file and git config have been recorded at:\n'
84' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000085# Format of the message to be stored as part of the traces to give developers a
86# better context when they go through traces.
87TRACES_README_FORMAT = (
88'Date: %(now)s\n'
89'\n'
90'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
91'Title: %(title)s\n'
92'\n'
93'%(description)s\n'
94'\n'
95'Execution time: %(execution_time)s\n'
96'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000097
tandrii9d2c7a32016-06-22 03:42:45 -070098COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080099POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000100DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000101REFS_THAT_ALIAS_TO_OTHER_REFS = {
102 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
103 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
104}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000105
thestig@chromium.org44202a22014-03-11 19:22:18 +0000106# Valid extensions for files we want to lint.
107DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
108DEFAULT_LINT_IGNORE_REGEX = r"$^"
109
Aiden Bennerc08566e2018-10-03 17:52:42 +0000110# File name for yapf style config files.
111YAPF_CONFIG_FILENAME = '.style.yapf'
112
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000113# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000114Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000115
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000116# Initialized in main()
117settings = None
118
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100119# Used by tests/git_cl_test.py to add extra logging.
120# Inside the weirdly failing test, add this:
121# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700122# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100123_IS_BEING_TESTED = False
124
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000125
Christopher Lamf732cd52017-01-24 12:40:11 +1100126def DieWithError(message, change_desc=None):
127 if change_desc:
128 SaveDescriptionBackup(change_desc)
129
vapiera7fbd5a2016-06-16 09:17:49 -0700130 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131 sys.exit(1)
132
133
Christopher Lamf732cd52017-01-24 12:40:11 +1100134def SaveDescriptionBackup(change_desc):
135 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000136 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100137 backup_file = open(backup_path, 'w')
138 backup_file.write(change_desc.description)
139 backup_file.close()
140
141
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000142def GetNoGitPagerEnv():
143 env = os.environ.copy()
144 # 'cat' is a magical git string that disables pagers on all platforms.
145 env['GIT_PAGER'] = 'cat'
146 return env
147
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000148
bsep@chromium.org627d9002016-04-29 00:00:52 +0000149def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000150 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000151 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000152 except subprocess2.CalledProcessError as e:
153 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000154 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000156 'Command "%s" failed.\n%s' % (
157 ' '.join(args), error_message or e.stdout or ''))
158 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000159
160
161def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000162 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000163 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000164
165
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000166def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000167 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700168 if suppress_stderr:
169 stderr = subprocess2.VOID
170 else:
171 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000172 try:
tandrii5d48c322016-08-18 16:19:37 -0700173 (out, _), code = subprocess2.communicate(['git'] + args,
174 env=GetNoGitPagerEnv(),
175 stdout=subprocess2.PIPE,
176 stderr=stderr)
177 return code, out
178 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900179 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700180 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000181
182
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000183def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000184 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000185 return RunGitWithCode(args, suppress_stderr=True)[1]
186
187
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000188def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000189 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000190 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000191 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000192 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000193
194
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000195def BranchExists(branch):
196 """Return True if specified branch exists."""
197 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
198 suppress_stderr=True)
199 return not code
200
201
tandrii2a16b952016-10-19 07:09:44 -0700202def time_sleep(seconds):
203 # Use this so that it can be mocked in tests without interfering with python
204 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700205 return time.sleep(seconds)
206
207
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000208def time_time():
209 # Use this so that it can be mocked in tests without interfering with python
210 # system machinery.
211 return time.time()
212
213
Edward Lemur1b52d872019-05-09 21:12:12 +0000214def datetime_now():
215 # Use this so that it can be mocked in tests without interfering with python
216 # system machinery.
217 return datetime.datetime.now()
218
219
maruel@chromium.org90541732011-04-01 17:54:18 +0000220def ask_for_data(prompt):
221 try:
222 return raw_input(prompt)
223 except KeyboardInterrupt:
224 # Hide the exception.
225 sys.exit(1)
226
227
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100228def confirm_or_exit(prefix='', action='confirm'):
229 """Asks user to press enter to continue or press Ctrl+C to abort."""
230 if not prefix or prefix.endswith('\n'):
231 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100232 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100233 mid = ' Press'
234 elif prefix.endswith(' '):
235 mid = 'press'
236 else:
237 mid = ' press'
238 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
239
240
241def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000242 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100243 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
244 while True:
245 if 'yes'.startswith(result):
246 return True
247 if 'no'.startswith(result):
248 return False
249 result = ask_for_data('Please, type yes or no: ').lower()
250
251
tandrii5d48c322016-08-18 16:19:37 -0700252def _git_branch_config_key(branch, key):
253 """Helper method to return Git config key for a branch."""
254 assert branch, 'branch name is required to set git config for it'
255 return 'branch.%s.%s' % (branch, key)
256
257
258def _git_get_branch_config_value(key, default=None, value_type=str,
259 branch=False):
260 """Returns git config value of given or current branch if any.
261
262 Returns default in all other cases.
263 """
264 assert value_type in (int, str, bool)
265 if branch is False: # Distinguishing default arg value from None.
266 branch = GetCurrentBranch()
267
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000268 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700269 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000270
tandrii5d48c322016-08-18 16:19:37 -0700271 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700272 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700273 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000274 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700275 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700276 args.append(_git_branch_config_key(branch, key))
277 code, out = RunGitWithCode(args)
278 if code == 0:
279 value = out.strip()
280 if value_type == int:
281 return int(value)
282 if value_type == bool:
283 return bool(value.lower() == 'true')
284 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000285 return default
286
287
tandrii5d48c322016-08-18 16:19:37 -0700288def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000289 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700290
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000291 If value is None, the key will be unset, otherwise it will be set.
292 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700293 """
294 if not branch:
295 branch = GetCurrentBranch()
296 assert branch, 'a branch name OR currently checked out branch is required'
297 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700298 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700299 if value is None:
300 args.append('--unset')
301 elif isinstance(value, bool):
302 args.append('--bool')
303 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700304 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000305 # `git config` also has --int, but apparently git config suffers from
306 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700307 value = str(value)
308 args.append(_git_branch_config_key(branch, key))
309 if value is not None:
310 args.append(value)
311 RunGit(args, **kwargs)
312
313
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100314def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700315 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100316
317 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
318 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000319 # Git also stores timezone offset, but it only affects visual display;
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100320 # actual point in time is defined by this timestamp only.
321 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
322
323
324def _git_amend_head(message, committer_timestamp):
325 """Amends commit with new message and desired committer_timestamp.
326
327 Sets committer timezone to UTC.
328 """
329 env = os.environ.copy()
330 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
331 return RunGit(['commit', '--amend', '-m', message], env=env)
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000344def _buildbucket_retry(operation_name, http, *args, **kwargs):
345 """Retries requests to buildbucket service and returns parsed json content."""
346 try_count = 0
347 while True:
348 response, content = http.request(*args, **kwargs)
349 try:
350 content_json = json.loads(content)
351 except ValueError:
352 content_json = None
353
354 # Buildbucket could return an error even if status==200.
355 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000356 error = content_json.get('error')
357 if error.get('code') == 403:
358 raise BuildbucketResponseException(
359 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000361 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 raise BuildbucketResponseException(msg)
363
364 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700365 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700368 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000369 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370 content)
371 return content_json
372 if response.status < 500 or try_count >= 2:
373 raise httplib2.HttpLib2Error(content)
374
375 # status >= 500 means transient failures.
376 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000377 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000378 try_count += 1
379 assert False, 'unreachable'
380
381
qyearsley1fdfcb62016-10-24 13:22:03 -0700382def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700383 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000384 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700385 """
qyearsleydd49f942016-10-28 11:57:22 -0700386 # If no bots are listed, we try to get a set of builders and tests based
387 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700388 if not options.bot:
389 change = changelist.GetChange(
390 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700391 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700392 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700393 change=change,
394 changed_files=change.LocalPaths(),
395 repository_root=settings.GetRoot(),
396 default_presubmit=None,
397 project=None,
398 verbose=options.verbose,
399 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700400 if masters is None:
401 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000402 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700403
qyearsley1fdfcb62016-10-24 13:22:03 -0700404 if options.bucket:
405 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000406 option_parser.error(
407 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700408
409
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800410def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000411 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700412
413 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700414 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000415 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700416 buckets: A nested dict mapping bucket names to builders to tests.
417 options: Command-line options.
418 """
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000419 _, ret_code = subprocess2.communicate(
420 ['bb', 'auth-info'], stdout=subprocess2.VOID, stderr=subprocess2.VOID)
421 if ret_code:
422 DieWithError('"bb auth-login" must be executed before scheduling try jobs.')
tandriide281ae2016-10-12 06:02:30 -0700423
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000424 gerrit_change = changelist.GetGerritChange()
425 shared_properties = {
426 'category': options.category,
427 }
tandrii8c5a3532016-11-04 07:52:02 -0700428 if options.clobber:
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000429 shared_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700430 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700431 if extra_properties:
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000432 shared_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000433
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000434 batch_request = {'requests': []}
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000435 print_text = []
436 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700437 for bucket, builders_and_tests in sorted(buckets.iteritems()):
438 print_text.append('Bucket: %s' % bucket)
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000439 project, bucket = bucket.split('.', 1)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000440 for builder, tests in sorted(builders_and_tests.iteritems()):
441 print_text.append(' %s: %s' % (builder, tests))
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000442 properties = shared_properties.copy()
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000443 if 'presubmit' in builder.lower():
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000444 properties['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000445 if tests:
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000446 properties['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700447
448 tags = [
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000449 {
450 'key': 'builder',
451 'value': builder,
452 },
453 {
454 'key': 'user_agent',
455 'value': 'git_cl_try',
456 },
borenet6c0efe62016-10-19 08:13:29 -0700457 ]
borenet6c0efe62016-10-19 08:13:29 -0700458
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000459 batch_request['requests'].append(
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000460 {
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000461 'scheduleBuild': {
462 'builder': {
463 'project': options.project or project,
464 'bucket': bucket,
465 'builder': builder,
466 },
467 'properties': properties,
468 'requestId': str(uuid.uuid4()),
469 'gerritChanges': [gerrit_change],
470 'tags': tags,
471 }
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000472 }
473 )
474
Edward Lemur5b6ae8b2019-09-12 23:27:24 +0000475 (stdout, _), ret_code = subprocess2.communicate(
476 ['bb', 'batch', '-host', options.buildbucket_host],
477 stdin=json.dumps(batch_request, sort_keys=True),
478 stdout=subprocess2.PIPE)
479 if ret_code:
480 print_text.append('Failed to schedule builds for some bots:')
481 if stdout:
482 responses = json.loads(stdout)
483 print_text.extend(
484 ' ' + response['error']['message']
485 for response in responses['responses'] if 'error' in response)
486
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000487 print_text.append('To see results here, run: git cl try-results')
488 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700489 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000490
Edward Lemur64d4a372019-09-16 18:44:52 +0000491 return ret_code
492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493
tandrii221ab252016-10-06 08:12:04 -0700494def fetch_try_jobs(auth_config, changelist, buildbucket_host,
495 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000496 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000497
qyearsley53f48a12016-09-01 10:45:13 -0700498 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000499 """
tandrii221ab252016-10-06 08:12:04 -0700500 assert buildbucket_host
501 assert changelist.GetIssue(), 'CL must be uploaded first'
502 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
503 patchset = patchset or changelist.GetMostRecentPatchset()
504 assert patchset, 'CL must be uploaded first'
505
506 codereview_url = changelist.GetCodereviewServer()
507 codereview_host = urlparse.urlparse(codereview_url).hostname
508 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000509 if authenticator.has_cached_credentials():
510 http = authenticator.authorize(httplib2.Http())
511 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700512 print('Warning: Some results might be missing because %s' %
513 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700514 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000515 http = httplib2.Http()
516
517 http.force_exception_to_status_code = True
518
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000519 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700520 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000521 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700522 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523 params = {'tag': 'buildset:%s' % buildset}
524
525 builds = {}
526 while True:
527 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700528 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000530 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531 for build in content.get('builds', []):
532 builds[build['id']] = build
533 if 'next_cursor' in content:
534 params['start_cursor'] = content['next_cursor']
535 else:
536 break
537 return builds
538
539
qyearsleyeab3c042016-08-24 09:18:28 -0700540def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541 """Prints nicely result of fetch_try_jobs."""
542 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000543 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 return
545
546 # Make a copy, because we'll be modifying builds dictionary.
547 builds = builds.copy()
548 builder_names_cache = {}
549
550 def get_builder(b):
551 try:
552 return builder_names_cache[b['id']]
553 except KeyError:
554 try:
555 parameters = json.loads(b['parameters_json'])
556 name = parameters['builder_name']
557 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700558 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700559 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 name = None
561 builder_names_cache[b['id']] = name
562 return name
563
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 if options.print_master:
565 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000566 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 max(len(str(get_builder(b))) for b in builds.itervalues()))
568 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000569 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570 else:
571 name_fmt = '%%-%ds' % (
572 max(len(str(get_builder(b))) for b in builds.itervalues()))
573 def get_name(b):
574 return name_fmt % get_builder(b)
575
576 def sort_key(b):
577 return b['status'], b.get('result'), get_name(b), b.get('url')
578
579 def pop(title, f, color=None, **kwargs):
580 """Pop matching builds from `builds` dict and print them."""
581
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000582 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583 colorize = str
584 else:
585 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
586
587 result = []
588 for b in builds.values():
589 if all(b.get(k) == v for k, v in kwargs.iteritems()):
590 builds.pop(b['id'])
591 result.append(b)
592 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700593 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700595 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596
597 total = len(builds)
598 pop(status='COMPLETED', result='SUCCESS',
599 title='Successes:', color=Fore.GREEN,
600 f=lambda b: (get_name(b), b.get('url')))
601 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
602 title='Infra Failures:', color=Fore.MAGENTA,
603 f=lambda b: (get_name(b), b.get('url')))
604 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
605 title='Failures:', color=Fore.RED,
606 f=lambda b: (get_name(b), b.get('url')))
607 pop(status='COMPLETED', result='CANCELED',
608 title='Canceled:', color=Fore.MAGENTA,
609 f=lambda b: (get_name(b),))
610 pop(status='COMPLETED', result='FAILURE',
611 failure_reason='INVALID_BUILD_DEFINITION',
612 title='Wrong master/builder name:', color=Fore.MAGENTA,
613 f=lambda b: (get_name(b),))
614 pop(status='COMPLETED', result='FAILURE',
615 title='Other failures:',
616 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
617 pop(status='COMPLETED',
618 title='Other finished:',
619 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
620 pop(status='STARTED',
621 title='Started:', color=Fore.YELLOW,
622 f=lambda b: (get_name(b), b.get('url')))
623 pop(status='SCHEDULED',
624 title='Scheduled:',
625 f=lambda b: (get_name(b), 'id=%s' % b['id']))
626 # The last section is just in case buildbucket API changes OR there is a bug.
627 pop(title='Other:',
628 f=lambda b: (get_name(b), 'id=%s' % b['id']))
629 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000630 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631
632
Aiden Bennerc08566e2018-10-03 17:52:42 +0000633def _ComputeDiffLineRanges(files, upstream_commit):
634 """Gets the changed line ranges for each file since upstream_commit.
635
636 Parses a git diff on provided files and returns a dict that maps a file name
637 to an ordered list of range tuples in the form (start_line, count).
638 Ranges are in the same format as a git diff.
639 """
640 # If files is empty then diff_output will be a full diff.
641 if len(files) == 0:
642 return {}
643
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000644 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000645 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
646 diff_output = RunGit(diff_cmd)
647
648 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
649 # 2 capture groups
650 # 0 == fname of diff file
651 # 1 == 'diff_start,diff_count' or 'diff_start'
652 # will match each of
653 # diff --git a/foo.foo b/foo.py
654 # @@ -12,2 +14,3 @@
655 # @@ -12,2 +17 @@
656 # running re.findall on the above string with pattern will give
657 # [('foo.py', ''), ('', '14,3'), ('', '17')]
658
659 curr_file = None
660 line_diffs = {}
661 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
662 if match[0] != '':
663 # Will match the second filename in diff --git a/a.py b/b.py.
664 curr_file = match[0]
665 line_diffs[curr_file] = []
666 else:
667 # Matches +14,3
668 if ',' in match[1]:
669 diff_start, diff_count = match[1].split(',')
670 else:
671 # Single line changes are of the form +12 instead of +12,1.
672 diff_start = match[1]
673 diff_count = 1
674
675 diff_start = int(diff_start)
676 diff_count = int(diff_count)
677
678 # If diff_count == 0 this is a removal we can ignore.
679 line_diffs[curr_file].append((diff_start, diff_count))
680
681 return line_diffs
682
683
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000684def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685 """Checks if a yapf file is in any parent directory of fpath until top_dir.
686
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000687 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000688 is found returns None. Uses yapf_config_cache as a cache for previously found
689 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000690 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000691 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 # Return result if we've already computed it.
693 if fpath in yapf_config_cache:
694 return yapf_config_cache[fpath]
695
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000696 parent_dir = os.path.dirname(fpath)
697 if os.path.isfile(fpath):
698 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000699 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000700 # Otherwise fpath is a directory
701 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
702 if os.path.isfile(yapf_file):
703 ret = yapf_file
704 elif fpath == top_dir or parent_dir == fpath:
705 # If we're at the top level directory, or if we're at root
706 # there is no provided style.
707 ret = None
708 else:
709 # Otherwise recurse on the current directory.
710 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000711 yapf_config_cache[fpath] = ret
712 return ret
713
714
qyearsley53f48a12016-09-01 10:45:13 -0700715def write_try_results_json(output_file, builds):
716 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
717
718 The input |builds| dict is assumed to be generated by Buildbucket.
719 Buildbucket documentation: http://goo.gl/G0s101
720 """
721
722 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800723 """Extracts some of the information from one build dict."""
724 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700725 return {
726 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700727 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800728 'builder_name': parameters.get('builder_name'),
729 'created_ts': build.get('created_ts'),
730 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700731 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800732 'result': build.get('result'),
733 'status': build.get('status'),
734 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700735 'url': build.get('url'),
736 }
737
738 converted = []
739 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000740 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700741 write_json(output_file, converted)
742
743
Aaron Gable13101a62018-02-09 13:20:41 -0800744def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000745 """Prints statistics about the change to the user."""
746 # --no-ext-diff is broken in some versions of Git, so try to work around
747 # this by overriding the environment (but there is still a problem if the
748 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000749 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750 if 'GIT_EXTERNAL_DIFF' in env:
751 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000752
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000753 try:
754 stdout = sys.stdout.fileno()
755 except AttributeError:
756 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800758 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000759 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000760
761
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000762class BuildbucketResponseException(Exception):
763 pass
764
765
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766class Settings(object):
767 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000769 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770 self.tree_status_url = None
771 self.viewvc_url = None
772 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000773 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000774 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000775 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000776 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000792 @staticmethod
793 def GetRelativeRoot():
794 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000797 if self.root is None:
798 self.root = os.path.abspath(self.GetRelativeRoot())
799 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801 def GetTreeStatusUrl(self, error_ok=False):
802 if not self.tree_status_url:
803 error_message = ('You must configure your tree status URL by running '
804 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000805 self.tree_status_url = self._GetConfig(
806 'rietveld.tree-status-url', error_ok=error_ok,
807 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 return self.tree_status_url
809
810 def GetViewVCUrl(self):
811 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000812 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813 return self.viewvc_url
814
rmistry@google.com90752582014-01-14 21:04:50 +0000815 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000816 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000817
rmistry@google.com5626a922015-02-26 14:03:30 +0000818 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000819 run_post_upload_hook = self._GetConfig(
820 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000821 return run_post_upload_hook == "True"
822
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000823 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000824 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000825
ukai@chromium.orge8077812012-02-03 03:41:46 +0000826 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000827 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000828 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700829 self.is_gerrit = (
830 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000831 return self.is_gerrit
832
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000834 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700836 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
837 if self.squash_gerrit_uploads is None:
838 # Default is squash now (http://crbug.com/611892#c23).
839 self.squash_gerrit_uploads = not (
840 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
841 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000842 return self.squash_gerrit_uploads
843
tandriia60502f2016-06-20 02:01:53 -0700844 def GetSquashGerritUploadsOverride(self):
845 """Return True or False if codereview.settings should be overridden.
846
847 Returns None if no override has been defined.
848 """
849 # See also http://crbug.com/611892#c23
850 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
851 error_ok=True).strip()
852 if result == 'true':
853 return True
854 if result == 'false':
855 return False
856 return None
857
tandrii@chromium.org28253532016-04-14 13:46:56 +0000858 def GetGerritSkipEnsureAuthenticated(self):
859 """Return True if EnsureAuthenticated should not be done for Gerrit
860 uploads."""
861 if self.gerrit_skip_ensure_authenticated is None:
862 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000863 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 error_ok=True).strip() == 'true')
865 return self.gerrit_skip_ensure_authenticated
866
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000868 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000870 # Git requires single quotes for paths with spaces. We need to replace
871 # them with double quotes for Windows to treat such paths as a single
872 # path.
873 self.git_editor = self._GetConfig(
874 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 return self.git_editor or None
876
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000878 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000879 DEFAULT_LINT_REGEX)
880
881 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000882 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883 DEFAULT_LINT_IGNORE_REGEX)
884
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000885 def _GetConfig(self, param, **kwargs):
886 self.LazyUpdateIfNeeded()
887 return RunGit(['config', param], **kwargs).strip()
888
889
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100890@contextlib.contextmanager
891def _get_gerrit_project_config_file(remote_url):
892 """Context manager to fetch and store Gerrit's project.config from
893 refs/meta/config branch and store it in temp file.
894
895 Provides a temporary filename or None if there was error.
896 """
897 error, _ = RunGitWithCode([
898 'fetch', remote_url,
899 '+refs/meta/config:refs/git_cl/meta/config'])
900 if error:
901 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700902 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100903 (remote_url, error))
904 yield None
905 return
906
907 error, project_config_data = RunGitWithCode(
908 ['show', 'refs/git_cl/meta/config:project.config'])
909 if error:
910 print('WARNING: project.config file not found')
911 yield None
912 return
913
914 with gclient_utils.temporary_directory() as tempdir:
915 project_config_file = os.path.join(tempdir, 'project.config')
916 gclient_utils.FileWrite(project_config_file, project_config_data)
917 yield project_config_file
918
919
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000920def ShortBranchName(branch):
921 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000922 return branch.replace('refs/heads/', '', 1)
923
924
925def GetCurrentBranchRef():
926 """Returns branch ref (e.g., refs/heads/master) or None."""
927 return RunGit(['symbolic-ref', 'HEAD'],
928 stderr=subprocess2.VOID, error_ok=True).strip() or None
929
930
931def GetCurrentBranch():
932 """Returns current branch or None.
933
934 For refs/heads/* branches, returns just last part. For others, full ref.
935 """
936 branchref = GetCurrentBranchRef()
937 if branchref:
938 return ShortBranchName(branchref)
939 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000940
941
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000942class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000943 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000944 NONE = 'none'
945 DRY_RUN = 'dry_run'
946 COMMIT = 'commit'
947
948 ALL_STATES = [NONE, DRY_RUN, COMMIT]
949
950
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000951class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000952 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000953 self.issue = issue
954 self.patchset = patchset
955 self.hostname = hostname
956
957 @property
958 def valid(self):
959 return self.issue is not None
960
961
Edward Lemurf38bc172019-09-03 21:02:13 +0000962def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000963 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
964 fail_result = _ParsedIssueNumberArgument()
965
966 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000967 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000968 if not arg.startswith('http'):
969 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700970
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000971 url = gclient_utils.UpgradeToHttps(arg)
972 try:
973 parsed_url = urlparse.urlparse(url)
974 except ValueError:
975 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200976
Edward Lemur125d60a2019-09-13 18:25:41 +0000977 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000978
979
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000980def _create_description_from_log(args):
981 """Pulls out the commit log to use as a base for the CL description."""
982 log_args = []
983 if len(args) == 1 and not args[0].endswith('.'):
984 log_args = [args[0] + '..']
985 elif len(args) == 1 and args[0].endswith('...'):
986 log_args = [args[0][:-1]]
987 elif len(args) == 2:
988 log_args = [args[0] + '..' + args[1]]
989 else:
990 log_args = args[:] # Hope for the best!
991 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
992
993
Aaron Gablea45ee112016-11-22 15:14:38 -0800994class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700995 def __init__(self, issue, url):
996 self.issue = issue
997 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800998 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700999
1000 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001001 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001002 self.issue, self.url)
1003
1004
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001006 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001007 # TODO(tandrii): these two aren't known in Gerrit.
1008 'approval', 'disapproval'])
1009
1010
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """Changelist works with one changelist in local branch.
1013
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001014 Notes:
1015 * Not safe for concurrent multi-{thread,process} use.
1016 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001017 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """
1019
Edward Lemur125d60a2019-09-13 18:25:41 +00001020 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001021 """Create a new ChangeList instance.
1022
Edward Lemurf38bc172019-09-03 21:02:13 +00001023 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001026 global settings
1027 if not settings:
1028 # Happens when git_cl.py is used as a utility library.
1029 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.branchref = branchref
1032 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001033 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.branch = ShortBranchName(self.branchref)
1035 else:
1036 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001038 self.lookedup_issue = False
1039 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.has_description = False
1041 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001042 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001045 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001047 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001048
Edward Lemur125d60a2019-09-13 18:25:41 +00001049 self._change_id = None
1050 # Lazily cached values.
1051 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1052 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1053 # Map from change number (issue) to its detail cache.
1054 self._detail_cache = {}
1055
1056 if codereview_host is not None:
1057 assert not codereview_host.startswith('https://'), codereview_host
1058 self._gerrit_host = codereview_host
1059 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060
1061 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001062 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001063
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001064 The return value is a string suitable for passing to git cl with the --cc
1065 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001066 """
1067 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001068 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001069 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001070 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1071 return self.cc
1072
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001073 def GetCCListWithoutDefault(self):
1074 """Return the users cc'd on this CL excluding default ones."""
1075 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001076 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001077 return self.cc
1078
Daniel Cheng7227d212017-11-17 08:12:37 -08001079 def ExtendCC(self, more_cc):
1080 """Extends the list of users to cc on this CL based on the changed files."""
1081 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082
1083 def GetBranch(self):
1084 """Returns the short branch name, e.g. 'master'."""
1085 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001086 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001087 if not branchref:
1088 return None
1089 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 self.branch = ShortBranchName(self.branchref)
1091 return self.branch
1092
1093 def GetBranchRef(self):
1094 """Returns the full branch name, e.g. 'refs/heads/master'."""
1095 self.GetBranch() # Poke the lazy loader.
1096 return self.branchref
1097
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001098 def ClearBranch(self):
1099 """Clears cached branch data of this object."""
1100 self.branch = self.branchref = None
1101
tandrii5d48c322016-08-18 16:19:37 -07001102 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1103 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1104 kwargs['branch'] = self.GetBranch()
1105 return _git_get_branch_config_value(key, default, **kwargs)
1106
1107 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1108 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1109 assert self.GetBranch(), (
1110 'this CL must have an associated branch to %sset %s%s' %
1111 ('un' if value is None else '',
1112 key,
1113 '' if value is None else ' to %r' % value))
1114 kwargs['branch'] = self.GetBranch()
1115 return _git_set_branch_config_value(key, value, **kwargs)
1116
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001117 @staticmethod
1118 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001119 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 e.g. 'origin', 'refs/heads/master'
1121 """
1122 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001123 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1124
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001125 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001126 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001127 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001128 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1129 error_ok=True).strip()
1130 if upstream_branch:
1131 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001133 # Else, try to guess the origin remote.
1134 remote_branches = RunGit(['branch', '-r']).split()
1135 if 'origin/master' in remote_branches:
1136 # Fall back on origin/master if it exits.
1137 remote = 'origin'
1138 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001140 DieWithError(
1141 'Unable to determine default branch to diff against.\n'
1142 'Either pass complete "git diff"-style arguments, like\n'
1143 ' git cl upload origin/master\n'
1144 'or verify this branch is set up to track another \n'
1145 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146
1147 return remote, upstream_branch
1148
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001149 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001150 upstream_branch = self.GetUpstreamBranch()
1151 if not BranchExists(upstream_branch):
1152 DieWithError('The upstream for the current branch (%s) does not exist '
1153 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001154 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001155 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001156
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 def GetUpstreamBranch(self):
1158 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001159 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001160 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001161 upstream_branch = upstream_branch.replace('refs/heads/',
1162 'refs/remotes/%s/' % remote)
1163 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1164 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001165 self.upstream_branch = upstream_branch
1166 return self.upstream_branch
1167
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001169 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001170 remote, branch = None, self.GetBranch()
1171 seen_branches = set()
1172 while branch not in seen_branches:
1173 seen_branches.add(branch)
1174 remote, branch = self.FetchUpstreamTuple(branch)
1175 branch = ShortBranchName(branch)
1176 if remote != '.' or branch.startswith('refs/remotes'):
1177 break
1178 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 remotes = RunGit(['remote'], error_ok=True).split()
1180 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001181 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001183 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001184 logging.warn('Could not determine which remote this change is '
1185 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001186 else:
1187 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001188 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 branch = 'HEAD'
1190 if branch.startswith('refs/remotes'):
1191 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001192 elif branch.startswith('refs/branch-heads/'):
1193 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001194 else:
1195 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001196 return self._remote
1197
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 def GitSanityChecks(self, upstream_git_obj):
1199 """Checks git repo status and ensures diff is from local commits."""
1200
sbc@chromium.org79706062015-01-14 21:18:12 +00001201 if upstream_git_obj is None:
1202 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001203 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001204 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001205 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001206 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001207 return False
1208
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001209 # Verify the commit we're diffing against is in our current branch.
1210 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1211 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1212 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001213 print('ERROR: %s is not in the current branch. You may need to rebase '
1214 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001215 return False
1216
1217 # List the commits inside the diff, and verify they are all local.
1218 commits_in_diff = RunGit(
1219 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1220 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1221 remote_branch = remote_branch.strip()
1222 if code != 0:
1223 _, remote_branch = self.GetRemoteBranch()
1224
1225 commits_in_remote = RunGit(
1226 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1227
1228 common_commits = set(commits_in_diff) & set(commits_in_remote)
1229 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001230 print('ERROR: Your diff contains %d commits already in %s.\n'
1231 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1232 'the diff. If you are using a custom git flow, you can override'
1233 ' the reference used for this check with "git config '
1234 'gitcl.remotebranch <git-ref>".' % (
1235 len(common_commits), remote_branch, upstream_git_obj),
1236 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001237 return False
1238 return True
1239
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001240 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001241 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001242
1243 Returns None if it is not set.
1244 """
tandrii5d48c322016-08-18 16:19:37 -07001245 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 def GetRemoteUrl(self):
1248 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1249
1250 Returns None if there is no remote.
1251 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001252 is_cached, value = self._cached_remote_url
1253 if is_cached:
1254 return value
1255
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001256 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001257 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1258
Edward Lemur298f2cf2019-02-22 21:40:39 +00001259 # Check if the remote url can be parsed as an URL.
1260 host = urlparse.urlparse(url).netloc
1261 if host:
1262 self._cached_remote_url = (True, url)
1263 return url
1264
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001265 # If it cannot be parsed as an url, assume it is a local directory,
1266 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001267 logging.warning('"%s" doesn\'t appear to point to a git host. '
1268 'Interpreting it as a local directory.', url)
1269 if not os.path.isdir(url):
1270 logging.error(
1271 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001272 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001273 return None
1274
1275 cache_path = url
1276 url = RunGit(['config', 'remote.%s.url' % remote],
1277 error_ok=True,
1278 cwd=url).strip()
1279
1280 host = urlparse.urlparse(url).netloc
1281 if not host:
1282 logging.error(
1283 'Remote "%(remote)s" for branch "%(branch)s" points to '
1284 '"%(cache_path)s", but it is misconfigured.\n'
1285 '"%(cache_path)s" must be a git repo and must have a remote named '
1286 '"%(remote)s" pointing to the git host.', {
1287 'remote': remote,
1288 'cache_path': cache_path,
1289 'branch': self.GetBranch()})
1290 return None
1291
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001292 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001293 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001294
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001295 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001296 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001297 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001298 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001299 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001300 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 return self.issue
1302
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303 def GetIssueURL(self):
1304 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001305 issue = self.GetIssue()
1306 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001307 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001308 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001310 def GetDescription(self, pretty=False, force=False):
1311 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001312 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001313 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314 self.has_description = True
1315 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001316 # Set width to 72 columns + 2 space indent.
1317 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001319 lines = self.description.splitlines()
1320 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001321 return self.description
1322
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001323 def GetDescriptionFooters(self):
1324 """Returns (non_footer_lines, footers) for the commit message.
1325
1326 Returns:
1327 non_footer_lines (list(str)) - Simple list of description lines without
1328 any footer. The lines do not contain newlines, nor does the list contain
1329 the empty line between the message and the footers.
1330 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1331 [("Change-Id", "Ideadbeef...."), ...]
1332 """
1333 raw_description = self.GetDescription()
1334 msg_lines, _, footers = git_footers.split_footers(raw_description)
1335 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001336 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001337 return msg_lines, footers
1338
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001339 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001340 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001341 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001342 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001343 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001344 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345 return self.patchset
1346
1347 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001348 """Set this branch's patchset. If patchset=0, clears the patchset."""
1349 assert self.GetBranch()
1350 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001351 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001352 else:
1353 self.patchset = int(patchset)
1354 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001355 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001356
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001357 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001358 """Set this branch's issue. If issue isn't given, clears the issue."""
1359 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001360 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001361 issue = int(issue)
1362 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001363 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001364 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001365 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001367 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001368 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001369 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370 else:
tandrii5d48c322016-08-18 16:19:37 -07001371 # Reset all of these just to be clean.
1372 reset_suffixes = [
1373 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001374 self.IssueConfigKey(),
1375 self.PatchsetConfigKey(),
1376 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001377 ] + self._PostUnsetIssueProperties()
1378 for prop in reset_suffixes:
1379 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001380 msg = RunGit(['log', '-1', '--format=%B']).strip()
1381 if msg and git_footers.get_footer_change_id(msg):
1382 print('WARNING: The change patched into this branch has a Change-Id. '
1383 'Removing it.')
1384 RunGit(['commit', '--amend', '-m',
1385 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001386 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001387 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001388 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001389
dnjba1b0f32016-09-02 12:37:42 -07001390 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001391 if not self.GitSanityChecks(upstream_branch):
1392 DieWithError('\nGit sanity check failure')
1393
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001394 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001395 if not root:
1396 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001397 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001398
1399 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001400 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001401 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001402 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001403 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001404 except subprocess2.CalledProcessError:
1405 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001406 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001407 'This branch probably doesn\'t exist anymore. To reset the\n'
1408 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001409 ' git branch --set-upstream-to origin/master %s\n'
1410 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001411 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001412
maruel@chromium.org52424302012-08-29 15:14:30 +00001413 issue = self.GetIssue()
1414 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001415 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001416 description = self.GetDescription()
1417 else:
1418 # If the change was never uploaded, use the log messages of all commits
1419 # up to the branch point, as git cl upload will prefill the description
1420 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001421 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1422 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001423
1424 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001425 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001426 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001427 name,
1428 description,
1429 absroot,
1430 files,
1431 issue,
1432 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001433 author,
1434 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001435
dsansomee2d6fd92016-09-08 00:10:47 -07001436 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001437 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001438 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001439 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001440
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001441 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1442 """Sets the description for this CL remotely.
1443
1444 You can get description_lines and footers with GetDescriptionFooters.
1445
1446 Args:
1447 description_lines (list(str)) - List of CL description lines without
1448 newline characters.
1449 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1450 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1451 `List-Of-Tokens`). It will be case-normalized so that each token is
1452 title-cased.
1453 """
1454 new_description = '\n'.join(description_lines)
1455 if footers:
1456 new_description += '\n'
1457 for k, v in footers:
1458 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1459 if not git_footers.FOOTER_PATTERN.match(foot):
1460 raise ValueError('Invalid footer %r' % foot)
1461 new_description += foot + '\n'
1462 self.UpdateDescription(new_description, force)
1463
Edward Lesmes8e282792018-04-03 18:50:29 -04001464 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001465 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1466 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001467 start = time_time()
1468 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001469 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1470 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001471 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001472 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001473 metrics.collector.add_repeated('sub_commands', {
1474 'command': 'presubmit',
1475 'execution_time': time_time() - start,
1476 'exit_code': 0 if result.should_continue() else 1,
1477 })
1478 return result
vapierfd77ac72016-06-16 08:33:57 -07001479 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001480 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001481
Edward Lemurf38bc172019-09-03 21:02:13 +00001482 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001483 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001484 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1485 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001486 else:
1487 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001488 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001489 urlparse.urlparse(issue_arg))
1490 if not parsed_issue_arg or not parsed_issue_arg.valid:
1491 DieWithError('Failed to parse issue argument "%s". '
1492 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001493 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001494 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001495
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001496 def CMDUpload(self, options, git_diff_args, orig_args):
1497 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001498 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001500 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001501 else:
1502 if self.GetBranch() is None:
1503 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1504
1505 # Default to diffing against common ancestor of upstream branch
1506 base_branch = self.GetCommonAncestorWithUpstream()
1507 git_diff_args = [base_branch, 'HEAD']
1508
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001509 # Fast best-effort checks to abort before running potentially expensive
1510 # hooks if uploading is likely to fail anyway. Passing these checks does
1511 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001512 self.EnsureAuthenticated(force=options.force)
1513 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001514
1515 # Apply watchlists on upload.
1516 change = self.GetChange(base_branch, None)
1517 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1518 files = [f.LocalPath() for f in change.AffectedFiles()]
1519 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001520 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001521
1522 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001523 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524 # Set the reviewer list now so that presubmit checks can access it.
1525 change_description = ChangeDescription(change.FullDescriptionText())
1526 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001527 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001528 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529 change)
1530 change.SetDescriptionText(change_description.description)
1531 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001532 may_prompt=not options.force,
1533 verbose=options.verbose,
1534 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001535 if not hook_results.should_continue():
1536 return 1
1537 if not options.reviewers and hook_results.reviewers:
1538 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001539 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540
Aaron Gable13101a62018-02-09 13:20:41 -08001541 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001542 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001544 _git_set_branch_config_value('last-upload-hash',
1545 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 # Run post upload hooks, if specified.
1547 if settings.GetRunPostUploadHook():
1548 presubmit_support.DoPostUploadExecuter(
1549 change,
1550 self,
1551 settings.GetRoot(),
1552 options.verbose,
1553 sys.stdout)
1554
1555 # Upload all dependencies if specified.
1556 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001557 print()
1558 print('--dependencies has been specified.')
1559 print('All dependent local branches will be re-uploaded.')
1560 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561 # Remove the dependencies flag from args so that we do not end up in a
1562 # loop.
1563 orig_args.remove('--dependencies')
1564 ret = upload_branch_deps(self, orig_args)
1565 return ret
1566
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001567 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001568 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001569
1570 Issue must have been already uploaded and known.
1571 """
1572 assert new_state in _CQState.ALL_STATES
1573 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001574 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001575 vote_map = {
1576 _CQState.NONE: 0,
1577 _CQState.DRY_RUN: 1,
1578 _CQState.COMMIT: 2,
1579 }
1580 labels = {'Commit-Queue': vote_map[new_state]}
1581 notify = False if new_state == _CQState.DRY_RUN else None
1582 gerrit_util.SetReview(
1583 self._GetGerritHost(), self._GerritChangeIdentifier(),
1584 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001585 return 0
1586 except KeyboardInterrupt:
1587 raise
1588 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001589 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001590 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001591 ' * Your project has no CQ,\n'
1592 ' * You don\'t have permission to change the CQ state,\n'
1593 ' * There\'s a bug in this code (see stack trace below).\n'
1594 'Consider specifying which bots to trigger manually or asking your '
1595 'project owners for permissions or contacting Chrome Infra at:\n'
1596 'https://www.chromium.org/infra\n\n' %
1597 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001598 # Still raise exception so that stack trace is printed.
1599 raise
1600
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001601 def _GetGerritHost(self):
1602 # Lazy load of configs.
1603 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001604 if self._gerrit_host and '.' not in self._gerrit_host:
1605 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1606 # This happens for internal stuff http://crbug.com/614312.
1607 parsed = urlparse.urlparse(self.GetRemoteUrl())
1608 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001609 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001610 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001611 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1612 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001613 return self._gerrit_host
1614
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001615 def _GetGitHost(self):
1616 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001617 remote_url = self.GetRemoteUrl()
1618 if not remote_url:
1619 return None
1620 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001621
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001622 def GetCodereviewServer(self):
1623 if not self._gerrit_server:
1624 # If we're on a branch then get the server potentially associated
1625 # with that branch.
1626 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001627 self._gerrit_server = self._GitGetBranchConfigValue(
1628 self.CodereviewServerConfigKey())
1629 if self._gerrit_server:
1630 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001631 if not self._gerrit_server:
1632 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1633 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001634 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001635 parts[0] = parts[0] + '-review'
1636 self._gerrit_host = '.'.join(parts)
1637 self._gerrit_server = 'https://%s' % self._gerrit_host
1638 return self._gerrit_server
1639
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001640 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001641 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001642 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001643 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001644 logging.warn('can\'t detect Gerrit project.')
1645 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001646 project = urlparse.urlparse(remote_url).path.strip('/')
1647 if project.endswith('.git'):
1648 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001649 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1650 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1651 # gitiles/git-over-https protocol. E.g.,
1652 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1653 # as
1654 # https://chromium.googlesource.com/v8/v8
1655 if project.startswith('a/'):
1656 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001657 return project
1658
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001659 def _GerritChangeIdentifier(self):
1660 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1661
1662 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001663 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001664 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001665 project = self._GetGerritProject()
1666 if project:
1667 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1668 # Fall back on still unique, but less efficient change number.
1669 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001670
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001671 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001672 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001673 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001674
tandrii5d48c322016-08-18 16:19:37 -07001675 @classmethod
1676 def PatchsetConfigKey(cls):
1677 return 'gerritpatchset'
1678
1679 @classmethod
1680 def CodereviewServerConfigKey(cls):
1681 return 'gerritserver'
1682
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001683 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001684 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001685 if settings.GetGerritSkipEnsureAuthenticated():
1686 # For projects with unusual authentication schemes.
1687 # See http://crbug.com/603378.
1688 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001689
1690 # Check presence of cookies only if using cookies-based auth method.
1691 cookie_auth = gerrit_util.Authenticator.get()
1692 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001693 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001694
Daniel Chengcf6269b2019-05-18 01:02:12 +00001695 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1696 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001697 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001698 return
1699
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001700 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001701 self.GetCodereviewServer()
1702 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001703 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001704
1705 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1706 git_auth = cookie_auth.get_auth_header(git_host)
1707 if gerrit_auth and git_auth:
1708 if gerrit_auth == git_auth:
1709 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001710 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001711 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001712 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 ' %s\n'
1714 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001715 ' Consider running the following command:\n'
1716 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001717 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001718 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001719 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001720 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001721 cookie_auth.get_new_password_message(git_host)))
1722 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001723 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001724 return
1725 else:
1726 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001727 ([] if gerrit_auth else [self._gerrit_host]) +
1728 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001729 DieWithError('Credentials for the following hosts are required:\n'
1730 ' %s\n'
1731 'These are read from %s (or legacy %s)\n'
1732 '%s' % (
1733 '\n '.join(missing),
1734 cookie_auth.get_gitcookies_path(),
1735 cookie_auth.get_netrc_path(),
1736 cookie_auth.get_new_password_message(git_host)))
1737
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001738 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001739 if not self.GetIssue():
1740 return
1741
1742 # Warm change details cache now to avoid RPCs later, reducing latency for
1743 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001744 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001745 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001746
1747 status = self._GetChangeDetail()['status']
1748 if status in ('MERGED', 'ABANDONED'):
1749 DieWithError('Change %s has been %s, new uploads are not allowed' %
1750 (self.GetIssueURL(),
1751 'submitted' if status == 'MERGED' else 'abandoned'))
1752
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001753 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1754 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1755 # Apparently this check is not very important? Otherwise get_auth_email
1756 # could have been added to other implementations of Authenticator.
1757 cookies_auth = gerrit_util.Authenticator.get()
1758 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001759 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001760
1761 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001762 if self.GetIssueOwner() == cookies_user:
1763 return
1764 logging.debug('change %s owner is %s, cookies user is %s',
1765 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001766 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001767 # so ask what Gerrit thinks of this user.
1768 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1769 if details['email'] == self.GetIssueOwner():
1770 return
1771 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001772 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001773 'as %s.\n'
1774 'Uploading may fail due to lack of permissions.' %
1775 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1776 confirm_or_exit(action='upload')
1777
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001778 def _PostUnsetIssueProperties(self):
1779 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001780 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001781
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001782 def GetGerritObjForPresubmit(self):
1783 return presubmit_support.GerritAccessor(self._GetGerritHost())
1784
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001785 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001786 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001787 or CQ status, assuming adherence to a common workflow.
1788
1789 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001790 * 'error' - error from review tool (including deleted issues)
1791 * 'unsent' - no reviewers added
1792 * 'waiting' - waiting for review
1793 * 'reply' - waiting for uploader to reply to review
1794 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001795 * 'dry-run' - dry-running in the CQ
1796 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001797 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001798 """
1799 if not self.GetIssue():
1800 return None
1801
1802 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001803 data = self._GetChangeDetail([
1804 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001805 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001806 return 'error'
1807
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001808 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001809 return 'closed'
1810
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001811 cq_label = data['labels'].get('Commit-Queue', {})
1812 max_cq_vote = 0
1813 for vote in cq_label.get('all', []):
1814 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1815 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001817 if max_cq_vote == 1:
1818 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001819
Aaron Gable9ab38c62017-04-06 14:36:33 -07001820 if data['labels'].get('Code-Review', {}).get('approved'):
1821 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001822
1823 if not data.get('reviewers', {}).get('REVIEWER', []):
1824 return 'unsent'
1825
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001826 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001827 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1828 last_message_author = messages.pop().get('author', {})
1829 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001830 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1831 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001833 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001834 if last_message_author.get('_account_id') == owner:
1835 # Most recent message was by owner.
1836 return 'waiting'
1837 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838 # Some reply from non-owner.
1839 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001840
1841 # Somehow there are no messages even though there are reviewers.
1842 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001843
1844 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001845 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001846 patchset = data['revisions'][data['current_revision']]['_number']
1847 self.SetPatchset(patchset)
1848 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001849
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001850 def FetchDescription(self, force=False):
1851 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1852 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001853 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001854 return data['revisions'][current_rev]['commit']['message'].encode(
1855 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001856
dsansomee2d6fd92016-09-08 00:10:47 -07001857 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001858 if gerrit_util.HasPendingChangeEdit(
1859 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001860 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001861 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001862 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001863 'unpublished edit. Either publish the edit in the Gerrit web UI '
1864 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001865
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001866 gerrit_util.DeletePendingChangeEdit(
1867 self._GetGerritHost(), self._GerritChangeIdentifier())
1868 gerrit_util.SetCommitMessage(
1869 self._GetGerritHost(), self._GerritChangeIdentifier(),
1870 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001871
Aaron Gable636b13f2017-07-14 10:42:48 -07001872 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001873 gerrit_util.SetReview(
1874 self._GetGerritHost(), self._GerritChangeIdentifier(),
1875 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001876
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001877 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001878 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001879 # CURRENT_REVISION is included to get the latest patchset so that
1880 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001881 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001882 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1883 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001884 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001885 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001886 robot_file_comments = gerrit_util.GetChangeRobotComments(
1887 self._GetGerritHost(), self._GerritChangeIdentifier())
1888
1889 # Add the robot comments onto the list of comments, but only
1890 # keep those that are from the latest pachset.
1891 latest_patch_set = self.GetMostRecentPatchset()
1892 for path, robot_comments in robot_file_comments.iteritems():
1893 line_comments = file_comments.setdefault(path, [])
1894 line_comments.extend(
1895 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001896
1897 # Build dictionary of file comments for easy access and sorting later.
1898 # {author+date: {path: {patchset: {line: url+message}}}}
1899 comments = collections.defaultdict(
1900 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1901 for path, line_comments in file_comments.iteritems():
1902 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 tag = comment.get('tag', '')
1904 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001905 continue
1906 key = (comment['author']['email'], comment['updated'])
1907 if comment.get('side', 'REVISION') == 'PARENT':
1908 patchset = 'Base'
1909 else:
1910 patchset = 'PS%d' % comment['patch_set']
1911 line = comment.get('line', 0)
1912 url = ('https://%s/c/%s/%s/%s#%s%s' %
1913 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1914 'b' if comment.get('side') == 'PARENT' else '',
1915 str(line) if line else ''))
1916 comments[key][path][patchset][line] = (url, comment['message'])
1917
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001919 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 summary = self._BuildCommentSummary(msg, comments, readable)
1921 if summary:
1922 summaries.append(summary)
1923 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001924
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001925 @staticmethod
1926 def _BuildCommentSummary(msg, comments, readable):
1927 key = (msg['author']['email'], msg['date'])
1928 # Don't bother showing autogenerated messages that don't have associated
1929 # file or line comments. this will filter out most autogenerated
1930 # messages, but will keep robot comments like those from Tricium.
1931 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1932 if is_autogenerated and not comments.get(key):
1933 return None
1934 message = msg['message']
1935 # Gerrit spits out nanoseconds.
1936 assert len(msg['date'].split('.')[-1]) == 9
1937 date = datetime.datetime.strptime(msg['date'][:-3],
1938 '%Y-%m-%d %H:%M:%S.%f')
1939 if key in comments:
1940 message += '\n'
1941 for path, patchsets in sorted(comments.get(key, {}).items()):
1942 if readable:
1943 message += '\n%s' % path
1944 for patchset, lines in sorted(patchsets.items()):
1945 for line, (url, content) in sorted(lines.items()):
1946 if line:
1947 line_str = 'Line %d' % line
1948 path_str = '%s:%d:' % (path, line)
1949 else:
1950 line_str = 'File comment'
1951 path_str = '%s:0:' % path
1952 if readable:
1953 message += '\n %s, %s: %s' % (patchset, line_str, url)
1954 message += '\n %s\n' % content
1955 else:
1956 message += '\n%s ' % path_str
1957 message += '\n%s\n' % content
1958
1959 return _CommentSummary(
1960 date=date,
1961 message=message,
1962 sender=msg['author']['email'],
1963 autogenerated=is_autogenerated,
1964 # These could be inferred from the text messages and correlated with
1965 # Code-Review label maximum, however this is not reliable.
1966 # Leaving as is until the need arises.
1967 approval=False,
1968 disapproval=False,
1969 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001970
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001971 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001972 gerrit_util.AbandonChange(
1973 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001974
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001975 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001976 gerrit_util.SubmitChange(
1977 self._GetGerritHost(), self._GerritChangeIdentifier(),
1978 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001979
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001980 def _GetChangeDetail(self, options=None, no_cache=False):
1981 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001982
1983 If fresh data is needed, set no_cache=True which will clear cache and
1984 thus new data will be fetched from Gerrit.
1985 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001986 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001987 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001988
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001989 # Optimization to avoid multiple RPCs:
1990 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1991 'CURRENT_COMMIT' not in options):
1992 options.append('CURRENT_COMMIT')
1993
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001994 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001995 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001996 options = [o.upper() for o in options]
1997
1998 # Check in cache first unless no_cache is True.
1999 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002000 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002001 else:
2002 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002003 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002004 # Assumption: data fetched before with extra options is suitable
2005 # for return for a smaller set of options.
2006 # For example, if we cached data for
2007 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2008 # and request is for options=[CURRENT_REVISION],
2009 # THEN we can return prior cached data.
2010 if options_set.issubset(cached_options_set):
2011 return data
2012
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002013 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002014 data = gerrit_util.GetChangeDetail(
2015 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002016 except gerrit_util.GerritError as e:
2017 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002018 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002019 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002020
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002021 self._detail_cache.setdefault(cache_key, []).append(
2022 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002023 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002024
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002025 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002026 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002027 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002028 data = gerrit_util.GetChangeCommit(
2029 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002030 except gerrit_util.GerritError as e:
2031 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002032 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002033 raise
agable32978d92016-11-01 12:55:02 -07002034 return data
2035
Karen Qian40c19422019-03-13 21:28:29 +00002036 def _IsCqConfigured(self):
2037 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002038 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002039 return False
2040 # TODO(crbug/753213): Remove temporary hack
2041 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002042 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002043 detail['branch'].startswith('refs/branch-heads/')):
2044 return False
2045 return True
2046
Olivier Robin75ee7252018-04-13 10:02:56 +02002047 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002048 if git_common.is_dirty_git_tree('land'):
2049 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002050
tandriid60367b2016-06-22 05:25:12 -07002051 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002052 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002053 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002054 'which can test and land changes for you. '
2055 'Are you sure you wish to bypass it?\n',
2056 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 differs = True
tandriic4344b52016-08-29 06:04:54 -07002058 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 # Note: git diff outputs nothing if there is no diff.
2060 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002061 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002062 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063 if detail['current_revision'] == last_upload:
2064 differs = False
2065 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002066 print('WARNING: Local branch contents differ from latest uploaded '
2067 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002068 if differs:
2069 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002070 confirm_or_exit(
2071 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2072 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002073 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002074 elif not bypass_hooks:
2075 hook_results = self.RunHook(
2076 committing=True,
2077 may_prompt=not force,
2078 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002079 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2080 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002081 if not hook_results.should_continue():
2082 return 1
2083
2084 self.SubmitIssue(wait_for_merge=True)
2085 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002086 links = self._GetChangeCommit().get('web_links', [])
2087 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002088 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002089 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002090 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002091 return 0
2092
Edward Lemurf38bc172019-09-03 21:02:13 +00002093 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002094 assert parsed_issue_arg.valid
2095
Edward Lemur125d60a2019-09-13 18:25:41 +00002096 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002097
2098 if parsed_issue_arg.hostname:
2099 self._gerrit_host = parsed_issue_arg.hostname
2100 self._gerrit_server = 'https://%s' % self._gerrit_host
2101
tandriic2405f52016-10-10 08:13:15 -07002102 try:
2103 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002104 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002105 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002106
2107 if not parsed_issue_arg.patchset:
2108 # Use current revision by default.
2109 revision_info = detail['revisions'][detail['current_revision']]
2110 patchset = int(revision_info['_number'])
2111 else:
2112 patchset = parsed_issue_arg.patchset
2113 for revision_info in detail['revisions'].itervalues():
2114 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2115 break
2116 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002117 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002118 (parsed_issue_arg.patchset, self.GetIssue()))
2119
Edward Lemur125d60a2019-09-13 18:25:41 +00002120 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002121 if remote_url.endswith('.git'):
2122 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002123 remote_url = remote_url.rstrip('/')
2124
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002126 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002127
2128 if remote_url != fetch_info['url']:
2129 DieWithError('Trying to patch a change from %s but this repo appears '
2130 'to be %s.' % (fetch_info['url'], remote_url))
2131
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002132 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002133
Aaron Gable62619a32017-06-16 08:22:09 -07002134 if force:
2135 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2136 print('Checked out commit for change %i patchset %i locally' %
2137 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002138 elif nocommit:
2139 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2140 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002141 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002142 RunGit(['cherry-pick', 'FETCH_HEAD'])
2143 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002144 (parsed_issue_arg.issue, patchset))
2145 print('Note: this created a local commit which does not have '
2146 'the same hash as the one uploaded for review. This will make '
2147 'uploading changes based on top of this branch difficult.\n'
2148 'If you want to do that, use "git cl patch --force" instead.')
2149
Stefan Zagerd08043c2017-10-12 12:07:02 -07002150 if self.GetBranch():
2151 self.SetIssue(parsed_issue_arg.issue)
2152 self.SetPatchset(patchset)
2153 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2154 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2155 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2156 else:
2157 print('WARNING: You are in detached HEAD state.\n'
2158 'The patch has been applied to your checkout, but you will not be '
2159 'able to upload a new patch set to the gerrit issue.\n'
2160 'Try using the \'-b\' option if you would like to work on a '
2161 'branch and/or upload a new patch set.')
2162
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002163 return 0
2164
2165 @staticmethod
2166 def ParseIssueURL(parsed_url):
2167 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2168 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002169 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2170 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 # Short urls like https://domain/<issue_number> can be used, but don't allow
2172 # specifying the patchset (you'd 404), but we allow that here.
2173 if parsed_url.path == '/':
2174 part = parsed_url.fragment
2175 else:
2176 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002177 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 if match:
2179 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002180 issue=int(match.group(3)),
2181 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002182 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183 return None
2184
tandrii16e0b4e2016-06-07 10:34:28 -07002185 def _GerritCommitMsgHookCheck(self, offer_removal):
2186 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2187 if not os.path.exists(hook):
2188 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002189 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2190 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002191 data = gclient_utils.FileRead(hook)
2192 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2193 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002194 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002195 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002196 'and may interfere with it in subtle ways.\n'
2197 'We recommend you remove the commit-msg hook.')
2198 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002199 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002200 gclient_utils.rm_file_or_tree(hook)
2201 print('Gerrit commit-msg hook removed.')
2202 else:
2203 print('OK, will keep Gerrit commit-msg hook in place.')
2204
Edward Lemur1b52d872019-05-09 21:12:12 +00002205 def _CleanUpOldTraces(self):
2206 """Keep only the last |MAX_TRACES| traces."""
2207 try:
2208 traces = sorted([
2209 os.path.join(TRACES_DIR, f)
2210 for f in os.listdir(TRACES_DIR)
2211 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2212 and not f.startswith('tmp'))
2213 ])
2214 traces_to_delete = traces[:-MAX_TRACES]
2215 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002216 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002217 except OSError:
2218 print('WARNING: Failed to remove old git traces from\n'
2219 ' %s'
2220 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002221
Edward Lemur5737f022019-05-17 01:24:00 +00002222 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 """Zip and write the git push traces stored in traces_dir."""
2224 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002225 traces_zip = trace_name + '-traces'
2226 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002227 # Create a temporary dir to store git config and gitcookies in. It will be
2228 # compressed and stored next to the traces.
2229 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002230 git_info_zip = trace_name + '-git-info'
2231
Edward Lemur5737f022019-05-17 01:24:00 +00002232 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002233 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002234 git_push_metadata['now'] = git_push_metadata['now'].decode(
2235 sys.stdin.encoding)
2236
Edward Lemur1b52d872019-05-09 21:12:12 +00002237 git_push_metadata['trace_name'] = trace_name
2238 gclient_utils.FileWrite(
2239 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2240
2241 # Keep only the first 6 characters of the git hashes on the packet
2242 # trace. This greatly decreases size after compression.
2243 packet_traces = os.path.join(traces_dir, 'trace-packet')
2244 if os.path.isfile(packet_traces):
2245 contents = gclient_utils.FileRead(packet_traces)
2246 gclient_utils.FileWrite(
2247 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2248 shutil.make_archive(traces_zip, 'zip', traces_dir)
2249
2250 # Collect and compress the git config and gitcookies.
2251 git_config = RunGit(['config', '-l'])
2252 gclient_utils.FileWrite(
2253 os.path.join(git_info_dir, 'git-config'),
2254 git_config)
2255
2256 cookie_auth = gerrit_util.Authenticator.get()
2257 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2258 gitcookies_path = cookie_auth.get_gitcookies_path()
2259 if os.path.isfile(gitcookies_path):
2260 gitcookies = gclient_utils.FileRead(gitcookies_path)
2261 gclient_utils.FileWrite(
2262 os.path.join(git_info_dir, 'gitcookies'),
2263 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2264 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2265
Edward Lemur1b52d872019-05-09 21:12:12 +00002266 gclient_utils.rmtree(git_info_dir)
2267
2268 def _RunGitPushWithTraces(
2269 self, change_desc, refspec, refspec_opts, git_push_metadata):
2270 """Run git push and collect the traces resulting from the execution."""
2271 # Create a temporary directory to store traces in. Traces will be compressed
2272 # and stored in a 'traces' dir inside depot_tools.
2273 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002274 trace_name = os.path.join(
2275 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002276
2277 env = os.environ.copy()
2278 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2279 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002280 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002281 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2282 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2283 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2284
2285 try:
2286 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002287 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002288 before_push = time_time()
2289 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002290 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002291 env=env,
2292 print_stdout=True,
2293 # Flush after every line: useful for seeing progress when running as
2294 # recipe.
2295 filter_fn=lambda _: sys.stdout.flush())
2296 except subprocess2.CalledProcessError as e:
2297 push_returncode = e.returncode
2298 DieWithError('Failed to create a change. Please examine output above '
2299 'for the reason of the failure.\n'
2300 'Hint: run command below to diagnose common Git/Gerrit '
2301 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002302 ' git cl creds-check\n'
2303 '\n'
2304 'If git-cl is not working correctly, file a bug under the '
2305 'Infra>SDK component including the files below.\n'
2306 'Review the files before upload, since they might contain '
2307 'sensitive information.\n'
2308 'Set the Restrict-View-Google label so that they are not '
2309 'publicly accessible.\n'
2310 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002311 change_desc)
2312 finally:
2313 execution_time = time_time() - before_push
2314 metrics.collector.add_repeated('sub_commands', {
2315 'command': 'git push',
2316 'execution_time': execution_time,
2317 'exit_code': push_returncode,
2318 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2319 })
2320
Edward Lemur1b52d872019-05-09 21:12:12 +00002321 git_push_metadata['execution_time'] = execution_time
2322 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002323 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002324
Edward Lemur1b52d872019-05-09 21:12:12 +00002325 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002326 gclient_utils.rmtree(traces_dir)
2327
2328 return push_stdout
2329
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002330 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002332 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002333 # Load default for user, repo, squash=true, in this order.
2334 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002335
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002336 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002337 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002338 # This may be None; default fallback value is determined in logic below.
2339 title = options.title
2340
Dominic Battre7d1c4842017-10-27 09:17:28 +02002341 # Extract bug number from branch name.
2342 bug = options.bug
2343 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2344 if not bug and match:
2345 bug = match.group(1)
2346
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002348 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002349 if self.GetIssue():
2350 # Try to get the message from a previous upload.
2351 message = self.GetDescription()
2352 if not message:
2353 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002354 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002356 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002357 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002358 # When uploading a subsequent patchset, -m|--message is taken
2359 # as the patchset title if --title was not provided.
2360 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002361 else:
2362 default_title = RunGit(
2363 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002364 if options.force:
2365 title = default_title
2366 else:
2367 title = ask_for_data(
2368 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002369 change_id = self._GetChangeDetail()['change_id']
2370 while True:
2371 footer_change_ids = git_footers.get_footer_change_id(message)
2372 if footer_change_ids == [change_id]:
2373 break
2374 if not footer_change_ids:
2375 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002376 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002377 continue
2378 # There is already a valid footer but with different or several ids.
2379 # Doing this automatically is non-trivial as we don't want to lose
2380 # existing other footers, yet we want to append just 1 desired
2381 # Change-Id. Thus, just create a new footer, but let user verify the
2382 # new description.
2383 message = '%s\n\nChange-Id: %s' % (message, change_id)
2384 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002385 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002387 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 'Please, check the proposed correction to the description, '
2389 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2390 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2391 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002392 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 if not options.force:
2394 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002395 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 message = change_desc.description
2397 if not message:
2398 DieWithError("Description is empty. Aborting...")
2399 # Continue the while loop.
2400 # Sanity check of this code - we should end up with proper message
2401 # footer.
2402 assert [change_id] == git_footers.get_footer_change_id(message)
2403 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002404 else: # if not self.GetIssue()
2405 if options.message:
2406 message = options.message
2407 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002408 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002409 if options.title:
2410 message = options.title + '\n\n' + message
2411 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002412
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002414 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002415 # On first upload, patchset title is always this string, while
2416 # --title flag gets converted to first line of message.
2417 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002418 if not change_desc.description:
2419 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002420 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002421 if len(change_ids) > 1:
2422 DieWithError('too many Change-Id footers, at most 1 allowed.')
2423 if not change_ids:
2424 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002425 change_desc.set_description(git_footers.add_footer_change_id(
2426 change_desc.description,
2427 GenerateGerritChangeId(change_desc.description)))
2428 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002429 assert len(change_ids) == 1
2430 change_id = change_ids[0]
2431
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002432 if options.reviewers or options.tbrs or options.add_owners_to:
2433 change_desc.update_reviewers(options.reviewers, options.tbrs,
2434 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002435 if options.preserve_tryjobs:
2436 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002437
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002439 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2440 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002442 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2443 desc_tempfile.write(change_desc.description)
2444 desc_tempfile.close()
2445 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2446 '-F', desc_tempfile.name]).strip()
2447 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002448 else:
2449 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002450 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002451 if not change_desc.description:
2452 DieWithError("Description is empty. Aborting...")
2453
2454 if not git_footers.get_footer_change_id(change_desc.description):
2455 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002456 change_desc.set_description(
2457 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002458 if options.reviewers or options.tbrs or options.add_owners_to:
2459 change_desc.update_reviewers(options.reviewers, options.tbrs,
2460 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002462 # For no-squash mode, we assume the remote called "origin" is the one we
2463 # want. It is not worthwhile to support different workflows for
2464 # no-squash mode.
2465 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2467
2468 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002469 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2471 ref_to_push)]).splitlines()
2472 if len(commits) > 1:
2473 print('WARNING: This will upload %d commits. Run the following command '
2474 'to see which commits will be uploaded: ' % len(commits))
2475 print('git log %s..%s' % (parent, ref_to_push))
2476 print('You can also use `git squash-branch` to squash these into a '
2477 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002478 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002479
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002480 if options.reviewers or options.tbrs or options.add_owners_to:
2481 change_desc.update_reviewers(options.reviewers, options.tbrs,
2482 options.add_owners_to, change)
2483
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002484 reviewers = sorted(change_desc.get_reviewers())
2485 # Add cc's from the CC_LIST and --cc flag (if any).
2486 if not options.private and not options.no_autocc:
2487 cc = self.GetCCList().split(',')
2488 else:
2489 cc = []
2490 if options.cc:
2491 cc.extend(options.cc)
2492 cc = filter(None, [email.strip() for email in cc])
2493 if change_desc.get_cced():
2494 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002495 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2496 valid_accounts = set(reviewers + cc)
2497 # TODO(crbug/877717): relax this for all hosts.
2498 else:
2499 valid_accounts = gerrit_util.ValidAccounts(
2500 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002501 logging.info('accounts %s are recognized, %s invalid',
2502 sorted(valid_accounts),
2503 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002504
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002505 # Extra options that can be specified at push time. Doc:
2506 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002507 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002508
Aaron Gable844cf292017-06-28 11:32:59 -07002509 # By default, new changes are started in WIP mode, and subsequent patchsets
2510 # don't send email. At any time, passing --send-mail will mark the change
2511 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002512 if options.send_mail:
2513 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002514 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002515 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002516 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002517 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002518 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002519
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002520 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002521 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002522
Aaron Gable9b713dd2016-12-14 16:04:21 -08002523 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002524 # Punctuation and whitespace in |title| must be percent-encoded.
2525 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002526
agablec6787972016-09-09 16:13:34 -07002527 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002528 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002529
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002530 for r in sorted(reviewers):
2531 if r in valid_accounts:
2532 refspec_opts.append('r=%s' % r)
2533 reviewers.remove(r)
2534 else:
2535 # TODO(tandrii): this should probably be a hard failure.
2536 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2537 % r)
2538 for c in sorted(cc):
2539 # refspec option will be rejected if cc doesn't correspond to an
2540 # account, even though REST call to add such arbitrary cc may succeed.
2541 if c in valid_accounts:
2542 refspec_opts.append('cc=%s' % c)
2543 cc.remove(c)
2544
rmistry9eadede2016-09-19 11:22:43 -07002545 if options.topic:
2546 # Documentation on Gerrit topics is here:
2547 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002548 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002549
Edward Lemur687ca902018-12-05 02:30:30 +00002550 if options.enable_auto_submit:
2551 refspec_opts.append('l=Auto-Submit+1')
2552 if options.use_commit_queue:
2553 refspec_opts.append('l=Commit-Queue+2')
2554 elif options.cq_dry_run:
2555 refspec_opts.append('l=Commit-Queue+1')
2556
2557 if change_desc.get_reviewers(tbr_only=True):
2558 score = gerrit_util.GetCodeReviewTbrScore(
2559 self._GetGerritHost(),
2560 self._GetGerritProject())
2561 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002562
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002563 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002564 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002565 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002566 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002567 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2568
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002569 refspec_suffix = ''
2570 if refspec_opts:
2571 refspec_suffix = '%' + ','.join(refspec_opts)
2572 assert ' ' not in refspec_suffix, (
2573 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2574 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2575
Edward Lemur1b52d872019-05-09 21:12:12 +00002576 git_push_metadata = {
2577 'gerrit_host': self._GetGerritHost(),
2578 'title': title or '<untitled>',
2579 'change_id': change_id,
2580 'description': change_desc.description,
2581 }
2582 push_stdout = self._RunGitPushWithTraces(
2583 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002584
2585 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002586 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002587 change_numbers = [m.group(1)
2588 for m in map(regex.match, push_stdout.splitlines())
2589 if m]
2590 if len(change_numbers) != 1:
2591 DieWithError(
2592 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002593 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002594 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002595 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002596
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002597 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002598 # GetIssue() is not set in case of non-squash uploads according to tests.
2599 # TODO(agable): non-squash uploads in git cl should be removed.
2600 gerrit_util.AddReviewers(
2601 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002602 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002603 reviewers, cc,
2604 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002605
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002606 return 0
2607
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002608 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2609 change_desc):
2610 """Computes parent of the generated commit to be uploaded to Gerrit.
2611
2612 Returns revision or a ref name.
2613 """
2614 if custom_cl_base:
2615 # Try to avoid creating additional unintended CLs when uploading, unless
2616 # user wants to take this risk.
2617 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2618 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2619 local_ref_of_target_remote])
2620 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002621 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002622 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2623 'If you proceed with upload, more than 1 CL may be created by '
2624 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2625 'If you are certain that specified base `%s` has already been '
2626 'uploaded to Gerrit as another CL, you may proceed.\n' %
2627 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2628 if not force:
2629 confirm_or_exit(
2630 'Do you take responsibility for cleaning up potential mess '
2631 'resulting from proceeding with upload?',
2632 action='upload')
2633 return custom_cl_base
2634
Aaron Gablef97e33d2017-03-30 15:44:27 -07002635 if remote != '.':
2636 return self.GetCommonAncestorWithUpstream()
2637
2638 # If our upstream branch is local, we base our squashed commit on its
2639 # squashed version.
2640 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2641
Aaron Gablef97e33d2017-03-30 15:44:27 -07002642 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002643 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002644
2645 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002646 # TODO(tandrii): consider checking parent change in Gerrit and using its
2647 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2648 # the tree hash of the parent branch. The upside is less likely bogus
2649 # requests to reupload parent change just because it's uploadhash is
2650 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002651 parent = RunGit(['config',
2652 'branch.%s.gerritsquashhash' % upstream_branch_name],
2653 error_ok=True).strip()
2654 # Verify that the upstream branch has been uploaded too, otherwise
2655 # Gerrit will create additional CLs when uploading.
2656 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2657 RunGitSilent(['rev-parse', parent + ':'])):
2658 DieWithError(
2659 '\nUpload upstream branch %s first.\n'
2660 'It is likely that this branch has been rebased since its last '
2661 'upload, so you just need to upload it again.\n'
2662 '(If you uploaded it with --no-squash, then branch dependencies '
2663 'are not supported, and you should reupload with --squash.)'
2664 % upstream_branch_name,
2665 change_desc)
2666 return parent
2667
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002668 def _AddChangeIdToCommitMessage(self, options, args):
2669 """Re-commits using the current message, assumes the commit hook is in
2670 place.
2671 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002672 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002673 git_command = ['commit', '--amend', '-m', log_desc]
2674 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002675 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002676 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002677 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002678 return new_log_desc
2679 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002680 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002681
tandriie113dfd2016-10-11 10:20:12 -07002682 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002683 try:
2684 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002685 except GerritChangeNotExists:
2686 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002687
2688 if data['status'] in ('ABANDONED', 'MERGED'):
2689 return 'CL %s is closed' % self.GetIssue()
2690
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002691 def GetGerritChange(self, patchset=None):
2692 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2693 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2694 issue = self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002695 patchset = int(patchset or self.GetPatchset())
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002696 data = self._GetChangeDetail(['ALL_REVISIONS'])
2697
2698 assert host and issue and patchset, 'CL must be uploaded first'
2699
2700 has_patchset = any(
2701 int(revision_data['_number']) == patchset
2702 for revision_data in data['revisions'].itervalues())
2703 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002704 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002705 (patchset, self.GetIssue()))
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002706
tandrii8c5a3532016-11-04 07:52:02 -07002707 return {
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002708 'host': host,
2709 'change': issue,
2710 'project': data['project'],
2711 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002712 }
tandriie113dfd2016-10-11 10:20:12 -07002713
tandriide281ae2016-10-12 06:02:30 -07002714 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002715 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002716
Edward Lemur707d70b2018-02-07 00:50:14 +01002717 def GetReviewers(self):
2718 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002719 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002720
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002721
2722_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002723 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002724}
2725
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002726
iannuccie53c9352016-08-17 14:40:40 -07002727def _add_codereview_issue_select_options(parser, extra=""):
2728 _add_codereview_select_options(parser)
2729
2730 text = ('Operate on this issue number instead of the current branch\'s '
2731 'implicit issue.')
2732 if extra:
2733 text += ' '+extra
2734 parser.add_option('-i', '--issue', type=int, help=text)
2735
2736
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002737def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002738 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002739 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002740 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002741 parser.add_option_group(parser.codereview_group)
2742 parser.codereview_group.add_option(
2743 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002744 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002745
2746
2747def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002748 options.forced_codereview = None
2749 if options.gerrit:
2750 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002751
2752
tandriif9aefb72016-07-01 09:06:51 -07002753def _get_bug_line_values(default_project, bugs):
2754 """Given default_project and comma separated list of bugs, yields bug line
2755 values.
2756
2757 Each bug can be either:
2758 * a number, which is combined with default_project
2759 * string, which is left as is.
2760
2761 This function may produce more than one line, because bugdroid expects one
2762 project per line.
2763
2764 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2765 ['v8:123', 'chromium:789']
2766 """
2767 default_bugs = []
2768 others = []
2769 for bug in bugs.split(','):
2770 bug = bug.strip()
2771 if bug:
2772 try:
2773 default_bugs.append(int(bug))
2774 except ValueError:
2775 others.append(bug)
2776
2777 if default_bugs:
2778 default_bugs = ','.join(map(str, default_bugs))
2779 if default_project:
2780 yield '%s:%s' % (default_project, default_bugs)
2781 else:
2782 yield default_bugs
2783 for other in sorted(others):
2784 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2785 yield other
2786
2787
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002788class ChangeDescription(object):
2789 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002790 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002791 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002792 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002793 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002794 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2795 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2796 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2797 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002798
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002801
agable@chromium.org42c20792013-09-12 17:34:49 +00002802 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002803 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002804 return '\n'.join(self._description_lines)
2805
2806 def set_description(self, desc):
2807 if isinstance(desc, basestring):
2808 lines = desc.splitlines()
2809 else:
2810 lines = [line.rstrip() for line in desc]
2811 while lines and not lines[0]:
2812 lines.pop(0)
2813 while lines and not lines[-1]:
2814 lines.pop(-1)
2815 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002816
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002817 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2818 """Rewrites the R=/TBR= line(s) as a single line each.
2819
2820 Args:
2821 reviewers (list(str)) - list of additional emails to use for reviewers.
2822 tbrs (list(str)) - list of additional emails to use for TBRs.
2823 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2824 the change that are missing OWNER coverage. If this is not None, you
2825 must also pass a value for `change`.
2826 change (Change) - The Change that should be used for OWNERS lookups.
2827 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002828 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002829 assert isinstance(tbrs, list), tbrs
2830
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002831 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002832 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002833
2834 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002835 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002836
2837 reviewers = set(reviewers)
2838 tbrs = set(tbrs)
2839 LOOKUP = {
2840 'TBR': tbrs,
2841 'R': reviewers,
2842 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002843
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002844 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002845 regexp = re.compile(self.R_LINE)
2846 matches = [regexp.match(line) for line in self._description_lines]
2847 new_desc = [l for i, l in enumerate(self._description_lines)
2848 if not matches[i]]
2849 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002850
agable@chromium.org42c20792013-09-12 17:34:49 +00002851 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002852
2853 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002854 for match in matches:
2855 if not match:
2856 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002857 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2858
2859 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002860 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002861 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002862 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002863 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002864 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002865 LOOKUP[add_owners_to].update(
2866 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002867
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002868 # If any folks ended up in both groups, remove them from tbrs.
2869 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002870
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2872 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002873
2874 # Put the new lines in the description where the old first R= line was.
2875 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2876 if 0 <= line_loc < len(self._description_lines):
2877 if new_tbr_line:
2878 self._description_lines.insert(line_loc, new_tbr_line)
2879 if new_r_line:
2880 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002881 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002882 if new_r_line:
2883 self.append_footer(new_r_line)
2884 if new_tbr_line:
2885 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002886
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002887 def set_preserve_tryjobs(self):
2888 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2889 footers = git_footers.parse_footers(self.description)
2890 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2891 if v.lower() == 'true':
2892 return
2893 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2894
Aaron Gable3a16ed12017-03-23 10:51:55 -07002895 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002896 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002897 self.set_description([
2898 '# Enter a description of the change.',
2899 '# This will be displayed on the codereview site.',
2900 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002901 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 '--------------------',
2903 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002904
agable@chromium.org42c20792013-09-12 17:34:49 +00002905 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002906 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002907 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07002908 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07002909 if git_footer:
2910 self.append_footer('Bug: %s' % ', '.join(values))
2911 else:
2912 for value in values:
2913 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07002914
agable@chromium.org42c20792013-09-12 17:34:49 +00002915 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002916 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002917 if not content:
2918 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002919 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002920
Bruce Dawson2377b012018-01-11 16:46:49 -08002921 # Strip off comments and default inserted "Bug:" line.
2922 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002923 (line.startswith('#') or
2924 line.rstrip() == "Bug:" or
2925 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002926 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002927 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002928 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002929
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002930 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002931 """Adds a footer line to the description.
2932
2933 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2934 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2935 that Gerrit footers are always at the end.
2936 """
2937 parsed_footer_line = git_footers.parse_footer(line)
2938 if parsed_footer_line:
2939 # Line is a gerrit footer in the form: Footer-Key: any value.
2940 # Thus, must be appended observing Gerrit footer rules.
2941 self.set_description(
2942 git_footers.add_footer(self.description,
2943 key=parsed_footer_line[0],
2944 value=parsed_footer_line[1]))
2945 return
2946
2947 if not self._description_lines:
2948 self._description_lines.append(line)
2949 return
2950
2951 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2952 if gerrit_footers:
2953 # git_footers.split_footers ensures that there is an empty line before
2954 # actual (gerrit) footers, if any. We have to keep it that way.
2955 assert top_lines and top_lines[-1] == ''
2956 top_lines, separator = top_lines[:-1], top_lines[-1:]
2957 else:
2958 separator = [] # No need for separator if there are no gerrit_footers.
2959
2960 prev_line = top_lines[-1] if top_lines else ''
2961 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2962 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2963 top_lines.append('')
2964 top_lines.append(line)
2965 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002966
tandrii99a72f22016-08-17 14:33:24 -07002967 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002968 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002969 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002970 reviewers = [match.group(2).strip()
2971 for match in matches
2972 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002973 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002974
bradnelsond975b302016-10-23 12:20:23 -07002975 def get_cced(self):
2976 """Retrieves the list of reviewers."""
2977 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2978 cced = [match.group(2).strip() for match in matches if match]
2979 return cleanup_list(cced)
2980
Nodir Turakulov23b82142017-11-16 11:04:25 -08002981 def get_hash_tags(self):
2982 """Extracts and sanitizes a list of Gerrit hashtags."""
2983 subject = (self._description_lines or ('',))[0]
2984 subject = re.sub(
2985 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2986
2987 tags = []
2988 start = 0
2989 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2990 while True:
2991 m = bracket_exp.match(subject, start)
2992 if not m:
2993 break
2994 tags.append(self.sanitize_hash_tag(m.group(1)))
2995 start = m.end()
2996
2997 if not tags:
2998 # Try "Tag: " prefix.
2999 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3000 if m:
3001 tags.append(self.sanitize_hash_tag(m.group(1)))
3002 return tags
3003
3004 @classmethod
3005 def sanitize_hash_tag(cls, tag):
3006 """Returns a sanitized Gerrit hash tag.
3007
3008 A sanitized hashtag can be used as a git push refspec parameter value.
3009 """
3010 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3011
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003012 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3013 """Updates this commit description given the parent.
3014
3015 This is essentially what Gnumbd used to do.
3016 Consult https://goo.gl/WMmpDe for more details.
3017 """
3018 assert parent_msg # No, orphan branch creation isn't supported.
3019 assert parent_hash
3020 assert dest_ref
3021 parent_footer_map = git_footers.parse_footers(parent_msg)
3022 # This will also happily parse svn-position, which GnumbD is no longer
3023 # supporting. While we'd generate correct footers, the verifier plugin
3024 # installed in Gerrit will block such commit (ie git push below will fail).
3025 parent_position = git_footers.get_position(parent_footer_map)
3026
3027 # Cherry-picks may have last line obscuring their prior footers,
3028 # from git_footers perspective. This is also what Gnumbd did.
3029 cp_line = None
3030 if (self._description_lines and
3031 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3032 cp_line = self._description_lines.pop()
3033
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003034 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003035
3036 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3037 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003038 for i, line in enumerate(footer_lines):
3039 k, v = git_footers.parse_footer(line) or (None, None)
3040 if k and k.startswith('Cr-'):
3041 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003042
3043 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003044 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003045 if parent_position[0] == dest_ref:
3046 # Same branch as parent.
3047 number = int(parent_position[1]) + 1
3048 else:
3049 number = 1 # New branch, and extra lineage.
3050 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3051 int(parent_position[1])))
3052
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003053 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3054 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003055
3056 self._description_lines = top_lines
3057 if cp_line:
3058 self._description_lines.append(cp_line)
3059 if self._description_lines[-1] != '':
3060 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003061 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003062
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003063
Aaron Gablea1bab272017-04-11 16:38:18 -07003064def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003065 """Retrieves the reviewers that approved a CL from the issue properties with
3066 messages.
3067
3068 Note that the list may contain reviewers that are not committer, thus are not
3069 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003070
3071 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003072 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003073 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003074 return sorted(
3075 set(
3076 message['sender']
3077 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003078 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003079 )
3080 )
3081
3082
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003083def FindCodereviewSettingsFile(filename='codereview.settings'):
3084 """Finds the given file starting in the cwd and going up.
3085
3086 Only looks up to the top of the repository unless an
3087 'inherit-review-settings-ok' file exists in the root of the repository.
3088 """
3089 inherit_ok_file = 'inherit-review-settings-ok'
3090 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003091 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003092 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3093 root = '/'
3094 while True:
3095 if filename in os.listdir(cwd):
3096 if os.path.isfile(os.path.join(cwd, filename)):
3097 return open(os.path.join(cwd, filename))
3098 if cwd == root:
3099 break
3100 cwd = os.path.dirname(cwd)
3101
3102
3103def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003104 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003105 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003107 def SetProperty(name, setting, unset_error_ok=False):
3108 fullname = 'rietveld.' + name
3109 if setting in keyvals:
3110 RunGit(['config', fullname, keyvals[setting]])
3111 else:
3112 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3113
tandrii48df5812016-10-17 03:55:37 -07003114 if not keyvals.get('GERRIT_HOST', False):
3115 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003116 # Only server setting is required. Other settings can be absent.
3117 # In that case, we ignore errors raised during option deletion attempt.
3118 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3119 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3120 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003121 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003122 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3123 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003124 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3125 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003126
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003127 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003128 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003129
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003130 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003131 RunGit(['config', 'gerrit.squash-uploads',
3132 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003133
tandrii@chromium.org28253532016-04-14 13:46:56 +00003134 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003135 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003136 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3137
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003138 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003139 # should be of the form
3140 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3141 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003142 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3143 keyvals['ORIGIN_URL_CONFIG']])
3144
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003145
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003146def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003147 """Downloads a network object to a local file, like urllib.urlretrieve.
3148
3149 This is necessary because urllib is broken for SSL connections via a proxy.
3150 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003151 with open(destination, 'w') as f:
3152 f.write(urllib2.urlopen(source).read())
3153
3154
ukai@chromium.org712d6102013-11-27 00:52:58 +00003155def hasSheBang(fname):
3156 """Checks fname is a #! script."""
3157 with open(fname) as f:
3158 return f.read(2).startswith('#!')
3159
3160
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003161# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3162def DownloadHooks(*args, **kwargs):
3163 pass
3164
3165
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003166def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003167 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003168
3169 Args:
3170 force: True to update hooks. False to install hooks if not present.
3171 """
3172 if not settings.GetIsGerrit():
3173 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003174 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003175 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3176 if not os.access(dst, os.X_OK):
3177 if os.path.exists(dst):
3178 if not force:
3179 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003180 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003181 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003182 if not hasSheBang(dst):
3183 DieWithError('Not a script: %s\n'
3184 'You need to download from\n%s\n'
3185 'into .git/hooks/commit-msg and '
3186 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003187 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3188 except Exception:
3189 if os.path.exists(dst):
3190 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003191 DieWithError('\nFailed to download hooks.\n'
3192 'You need to download from\n%s\n'
3193 'into .git/hooks/commit-msg and '
3194 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003195
3196
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003197class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003198 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003199
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003200 _GOOGLESOURCE = 'googlesource.com'
3201
3202 def __init__(self):
3203 # Cached list of [host, identity, source], where source is either
3204 # .gitcookies or .netrc.
3205 self._all_hosts = None
3206
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003207 def ensure_configured_gitcookies(self):
3208 """Runs checks and suggests fixes to make git use .gitcookies from default
3209 path."""
3210 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3211 configured_path = RunGitSilent(
3212 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003213 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003214 if configured_path:
3215 self._ensure_default_gitcookies_path(configured_path, default)
3216 else:
3217 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003218
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003219 @staticmethod
3220 def _ensure_default_gitcookies_path(configured_path, default_path):
3221 assert configured_path
3222 if configured_path == default_path:
3223 print('git is already configured to use your .gitcookies from %s' %
3224 configured_path)
3225 return
3226
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003227 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003228 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3229 (configured_path, default_path))
3230
3231 if not os.path.exists(configured_path):
3232 print('However, your configured .gitcookies file is missing.')
3233 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3234 action='reconfigure')
3235 RunGit(['config', '--global', 'http.cookiefile', default_path])
3236 return
3237
3238 if os.path.exists(default_path):
3239 print('WARNING: default .gitcookies file already exists %s' %
3240 default_path)
3241 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3242 default_path)
3243
3244 confirm_or_exit('Move existing .gitcookies to default location?',
3245 action='move')
3246 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003247 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003248 print('Moved and reconfigured git to use .gitcookies from %s' %
3249 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003250
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003251 @staticmethod
3252 def _configure_gitcookies_path(default_path):
3253 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3254 if os.path.exists(netrc_path):
3255 print('You seem to be using outdated .netrc for git credentials: %s' %
3256 netrc_path)
3257 print('This tool will guide you through setting up recommended '
3258 '.gitcookies store for git credentials.\n'
3259 '\n'
3260 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3261 ' git config --global --unset http.cookiefile\n'
3262 ' mv %s %s.backup\n\n' % (default_path, default_path))
3263 confirm_or_exit(action='setup .gitcookies')
3264 RunGit(['config', '--global', 'http.cookiefile', default_path])
3265 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003266
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003267 def get_hosts_with_creds(self, include_netrc=False):
3268 if self._all_hosts is None:
3269 a = gerrit_util.CookiesAuthenticator()
3270 self._all_hosts = [
3271 (h, u, s)
3272 for h, u, s in itertools.chain(
3273 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3274 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3275 )
3276 if h.endswith(self._GOOGLESOURCE)
3277 ]
3278
3279 if include_netrc:
3280 return self._all_hosts
3281 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3282
3283 def print_current_creds(self, include_netrc=False):
3284 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3285 if not hosts:
3286 print('No Git/Gerrit credentials found')
3287 return
3288 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3289 header = [('Host', 'User', 'Which file'),
3290 ['=' * l for l in lengths]]
3291 for row in (header + hosts):
3292 print('\t'.join((('%%+%ds' % l) % s)
3293 for l, s in zip(lengths, row)))
3294
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003295 @staticmethod
3296 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003297 """Parses identity "git-<username>.domain" into <username> and domain."""
3298 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003299 # distinguishable from sub-domains. But we do know typical domains:
3300 if identity.endswith('.chromium.org'):
3301 domain = 'chromium.org'
3302 username = identity[:-len('.chromium.org')]
3303 else:
3304 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003305 if username.startswith('git-'):
3306 username = username[len('git-'):]
3307 return username, domain
3308
3309 def _get_usernames_of_domain(self, domain):
3310 """Returns list of usernames referenced by .gitcookies in a given domain."""
3311 identities_by_domain = {}
3312 for _, identity, _ in self.get_hosts_with_creds():
3313 username, domain = self._parse_identity(identity)
3314 identities_by_domain.setdefault(domain, []).append(username)
3315 return identities_by_domain.get(domain)
3316
3317 def _canonical_git_googlesource_host(self, host):
3318 """Normalizes Gerrit hosts (with '-review') to Git host."""
3319 assert host.endswith(self._GOOGLESOURCE)
3320 # Prefix doesn't include '.' at the end.
3321 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3322 if prefix.endswith('-review'):
3323 prefix = prefix[:-len('-review')]
3324 return prefix + '.' + self._GOOGLESOURCE
3325
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003326 def _canonical_gerrit_googlesource_host(self, host):
3327 git_host = self._canonical_git_googlesource_host(host)
3328 prefix = git_host.split('.', 1)[0]
3329 return prefix + '-review.' + self._GOOGLESOURCE
3330
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003331 def _get_counterpart_host(self, host):
3332 assert host.endswith(self._GOOGLESOURCE)
3333 git = self._canonical_git_googlesource_host(host)
3334 gerrit = self._canonical_gerrit_googlesource_host(git)
3335 return git if gerrit == host else gerrit
3336
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003337 def has_generic_host(self):
3338 """Returns whether generic .googlesource.com has been configured.
3339
3340 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3341 """
3342 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3343 if host == '.' + self._GOOGLESOURCE:
3344 return True
3345 return False
3346
3347 def _get_git_gerrit_identity_pairs(self):
3348 """Returns map from canonic host to pair of identities (Git, Gerrit).
3349
3350 One of identities might be None, meaning not configured.
3351 """
3352 host_to_identity_pairs = {}
3353 for host, identity, _ in self.get_hosts_with_creds():
3354 canonical = self._canonical_git_googlesource_host(host)
3355 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3356 idx = 0 if canonical == host else 1
3357 pair[idx] = identity
3358 return host_to_identity_pairs
3359
3360 def get_partially_configured_hosts(self):
3361 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003362 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3363 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3364 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003365
3366 def get_conflicting_hosts(self):
3367 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003368 host
3369 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003370 if None not in (i1, i2) and i1 != i2)
3371
3372 def get_duplicated_hosts(self):
3373 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3374 return set(host for host, count in counters.iteritems() if count > 1)
3375
3376 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3377 'chromium.googlesource.com': 'chromium.org',
3378 'chrome-internal.googlesource.com': 'google.com',
3379 }
3380
3381 def get_hosts_with_wrong_identities(self):
3382 """Finds hosts which **likely** reference wrong identities.
3383
3384 Note: skips hosts which have conflicting identities for Git and Gerrit.
3385 """
3386 hosts = set()
3387 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3388 pair = self._get_git_gerrit_identity_pairs().get(host)
3389 if pair and pair[0] == pair[1]:
3390 _, domain = self._parse_identity(pair[0])
3391 if domain != expected:
3392 hosts.add(host)
3393 return hosts
3394
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003395 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003397 hosts = sorted(hosts)
3398 assert hosts
3399 if extra_column_func is None:
3400 extras = [''] * len(hosts)
3401 else:
3402 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003403 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3404 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003405 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003406 lines.append(tmpl % he)
3407 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003408
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003409 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003410 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003411 yield ('.googlesource.com wildcard record detected',
3412 ['Chrome Infrastructure team recommends to list full host names '
3413 'explicitly.'],
3414 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003415
3416 dups = self.get_duplicated_hosts()
3417 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003418 yield ('The following hosts were defined twice',
3419 self._format_hosts(dups),
3420 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003421
3422 partial = self.get_partially_configured_hosts()
3423 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003424 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3425 'These hosts are missing',
3426 self._format_hosts(partial, lambda host: 'but %s defined' %
3427 self._get_counterpart_host(host)),
3428 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003429
3430 conflicting = self.get_conflicting_hosts()
3431 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003432 yield ('The following Git hosts have differing credentials from their '
3433 'Gerrit counterparts',
3434 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3435 tuple(self._get_git_gerrit_identity_pairs()[host])),
3436 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003437
3438 wrong = self.get_hosts_with_wrong_identities()
3439 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003440 yield ('These hosts likely use wrong identity',
3441 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3442 (self._get_git_gerrit_identity_pairs()[host][0],
3443 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3444 wrong)
3445
3446 def find_and_report_problems(self):
3447 """Returns True if there was at least one problem, else False."""
3448 found = False
3449 bad_hosts = set()
3450 for title, sublines, hosts in self._find_problems():
3451 if not found:
3452 found = True
3453 print('\n\n.gitcookies problem report:\n')
3454 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003455 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003456 if sublines:
3457 print()
3458 print(' %s' % '\n '.join(sublines))
3459 print()
3460
3461 if bad_hosts:
3462 assert found
3463 print(' You can manually remove corresponding lines in your %s file and '
3464 'visit the following URLs with correct account to generate '
3465 'correct credential lines:\n' %
3466 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3467 print(' %s' % '\n '.join(sorted(set(
3468 gerrit_util.CookiesAuthenticator().get_new_password_url(
3469 self._canonical_git_googlesource_host(host))
3470 for host in bad_hosts
3471 ))))
3472 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003473
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003474
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003475@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003476def CMDcreds_check(parser, args):
3477 """Checks credentials and suggests changes."""
3478 _, _ = parser.parse_args(args)
3479
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003480 # Code below checks .gitcookies. Abort if using something else.
3481 authn = gerrit_util.Authenticator.get()
3482 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3483 if isinstance(authn, gerrit_util.GceAuthenticator):
3484 DieWithError(
3485 'This command is not designed for GCE, are you on a bot?\n'
3486 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3487 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003488 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003489 'This command is not designed for bot environment. It checks '
3490 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003491
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003492 checker = _GitCookiesChecker()
3493 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003494
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003495 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003496 checker.print_current_creds(include_netrc=True)
3497
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003498 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003499 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003500 return 0
3501 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003502
3503
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003504@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003505def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003506 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003507 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3508 branch = ShortBranchName(branchref)
3509 _, args = parser.parse_args(args)
3510 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003511 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003512 return RunGit(['config', 'branch.%s.base-url' % branch],
3513 error_ok=False).strip()
3514 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003515 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003516 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3517 error_ok=False).strip()
3518
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003519
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003520def color_for_status(status):
3521 """Maps a Changelist status to color, for CMDstatus and other tools."""
3522 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003523 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003524 'waiting': Fore.BLUE,
3525 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003526 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003527 'lgtm': Fore.GREEN,
3528 'commit': Fore.MAGENTA,
3529 'closed': Fore.CYAN,
3530 'error': Fore.WHITE,
3531 }.get(status, Fore.WHITE)
3532
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003533
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003534def get_cl_statuses(changes, fine_grained, max_processes=None):
3535 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003536
3537 If fine_grained is true, this will fetch CL statuses from the server.
3538 Otherwise, simply indicate if there's a matching url for the given branches.
3539
3540 If max_processes is specified, it is used as the maximum number of processes
3541 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3542 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003543
3544 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003545 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003546 if not changes:
3547 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003548
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003549 if not fine_grained:
3550 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003551 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003552 for cl in changes:
3553 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003554 return
3555
3556 # First, sort out authentication issues.
3557 logging.debug('ensuring credentials exist')
3558 for cl in changes:
3559 cl.EnsureAuthenticated(force=False, refresh=True)
3560
3561 def fetch(cl):
3562 try:
3563 return (cl, cl.GetStatus())
3564 except:
3565 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003566 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003567 raise
3568
3569 threads_count = len(changes)
3570 if max_processes:
3571 threads_count = max(1, min(threads_count, max_processes))
3572 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3573
3574 pool = ThreadPool(threads_count)
3575 fetched_cls = set()
3576 try:
3577 it = pool.imap_unordered(fetch, changes).__iter__()
3578 while True:
3579 try:
3580 cl, status = it.next(timeout=5)
3581 except multiprocessing.TimeoutError:
3582 break
3583 fetched_cls.add(cl)
3584 yield cl, status
3585 finally:
3586 pool.close()
3587
3588 # Add any branches that failed to fetch.
3589 for cl in set(changes) - fetched_cls:
3590 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003591
rmistry@google.com2dd99862015-06-22 12:22:18 +00003592
3593def upload_branch_deps(cl, args):
3594 """Uploads CLs of local branches that are dependents of the current branch.
3595
3596 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003597
3598 test1 -> test2.1 -> test3.1
3599 -> test3.2
3600 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601
3602 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3603 run on the dependent branches in this order:
3604 test2.1, test3.1, test3.2, test2.2, test3.3
3605
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003606 Note: This function does not rebase your local dependent branches. Use it
3607 when you make a change to the parent branch that will not conflict
3608 with its dependent branches, and you would like their dependencies
3609 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003610 """
3611 if git_common.is_dirty_git_tree('upload-branch-deps'):
3612 return 1
3613
3614 root_branch = cl.GetBranch()
3615 if root_branch is None:
3616 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3617 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003618 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003619 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3620 'patchset dependencies without an uploaded CL.')
3621
3622 branches = RunGit(['for-each-ref',
3623 '--format=%(refname:short) %(upstream:short)',
3624 'refs/heads'])
3625 if not branches:
3626 print('No local branches found.')
3627 return 0
3628
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003629 # Create a dictionary of all local branches to the branches that are
3630 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631 tracked_to_dependents = collections.defaultdict(list)
3632 for b in branches.splitlines():
3633 tokens = b.split()
3634 if len(tokens) == 2:
3635 branch_name, tracked = tokens
3636 tracked_to_dependents[tracked].append(branch_name)
3637
vapiera7fbd5a2016-06-16 09:17:49 -07003638 print()
3639 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003641
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642 def traverse_dependents_preorder(branch, padding=''):
3643 dependents_to_process = tracked_to_dependents.get(branch, [])
3644 padding += ' '
3645 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003646 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003647 dependents.append(dependent)
3648 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003649
rmistry@google.com2dd99862015-06-22 12:22:18 +00003650 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003651 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652
3653 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003655 return 0
3656
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003657 confirm_or_exit('This command will checkout all dependent branches and run '
3658 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003659
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660 # Record all dependents that failed to upload.
3661 failures = {}
3662 # Go through all dependents, checkout the branch and upload.
3663 try:
3664 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003665 print()
3666 print('--------------------------------------')
3667 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003668 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 try:
3671 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003672 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003673 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003674 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003676 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003677 finally:
3678 # Swap back to the original root branch.
3679 RunGit(['checkout', '-q', root_branch])
3680
vapiera7fbd5a2016-06-16 09:17:49 -07003681 print()
3682 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003683 for dependent_branch in dependents:
3684 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003685 print(' %s : %s' % (dependent_branch, upload_status))
3686 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687
3688 return 0
3689
3690
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003691@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003692def CMDarchive(parser, args):
3693 """Archives and deletes branches associated with closed changelists."""
3694 parser.add_option(
3695 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003696 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003697 parser.add_option(
3698 '-f', '--force', action='store_true',
3699 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003700 parser.add_option(
3701 '-d', '--dry-run', action='store_true',
3702 help='Skip the branch tagging and removal steps.')
3703 parser.add_option(
3704 '-t', '--notags', action='store_true',
3705 help='Do not tag archived branches. '
3706 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003707
kmarshall3bff56b2016-06-06 18:31:47 -07003708 options, args = parser.parse_args(args)
3709 if args:
3710 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003711
3712 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3713 if not branches:
3714 return 0
3715
vapiera7fbd5a2016-06-16 09:17:49 -07003716 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003717 changes = [Changelist(branchref=b)
3718 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003719 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3720 statuses = get_cl_statuses(changes,
3721 fine_grained=True,
3722 max_processes=options.maxjobs)
3723 proposal = [(cl.GetBranch(),
3724 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3725 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003726 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003727 proposal.sort()
3728
3729 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003730 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003731 return 0
3732
3733 current_branch = GetCurrentBranch()
3734
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003736 if options.notags:
3737 for next_item in proposal:
3738 print(' ' + next_item[0])
3739 else:
3740 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3741 for next_item in proposal:
3742 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003743
kmarshall9249e012016-08-23 12:02:16 -07003744 # Quit now on precondition failure or if instructed by the user, either
3745 # via an interactive prompt or by command line flags.
3746 if options.dry_run:
3747 print('\nNo changes were made (dry run).\n')
3748 return 0
3749 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003750 print('You are currently on a branch \'%s\' which is associated with a '
3751 'closed codereview issue, so archive cannot proceed. Please '
3752 'checkout another branch and run this command again.' %
3753 current_branch)
3754 return 1
kmarshall9249e012016-08-23 12:02:16 -07003755 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003756 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3757 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003759 return 1
3760
3761 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003762 if not options.notags:
3763 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003764 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003765
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003767
3768 return 0
3769
3770
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003771@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003772def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003773 """Show status of changelists.
3774
3775 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003776 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003777 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003778 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003779 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003780 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003781 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003782 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003783
3784 Also see 'git cl comments'.
3785 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003786 parser.add_option(
3787 '--no-branch-color',
3788 action='store_true',
3789 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003790 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003791 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003792 parser.add_option('-f', '--fast', action='store_true',
3793 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003794 parser.add_option(
3795 '-j', '--maxjobs', action='store', type=int,
3796 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003797
iannuccie53c9352016-08-17 14:40:40 -07003798 _add_codereview_issue_select_options(
3799 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003800 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003801 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003802 if args:
3803 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003804
iannuccie53c9352016-08-17 14:40:40 -07003805 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003806 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003807
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003808 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003809 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003810 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003811 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003812 elif options.field == 'id':
3813 issueid = cl.GetIssue()
3814 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003816 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003817 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003819 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003820 elif options.field == 'status':
3821 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003822 elif options.field == 'url':
3823 url = cl.GetIssueURL()
3824 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003825 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003826 return 0
3827
3828 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3829 if not branches:
3830 print('No local branch found.')
3831 return 0
3832
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003833 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003834 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003835 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003836 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003837 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003838 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003839 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003840
Daniel McArdlea23bf592019-02-12 00:25:12 +00003841 current_branch = GetCurrentBranch()
3842
3843 def FormatBranchName(branch, colorize=False):
3844 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3845 an asterisk when it is the current branch."""
3846
3847 asterisk = ""
3848 color = Fore.RESET
3849 if branch == current_branch:
3850 asterisk = "* "
3851 color = Fore.GREEN
3852 branch_name = ShortBranchName(branch)
3853
3854 if colorize:
3855 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003856 return asterisk + branch_name
3857
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003858 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003859
3860 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003861 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3862 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003863 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003864 c, status = output.next()
3865 branch_statuses[c.GetBranch()] = status
3866 status = branch_statuses.pop(branch)
3867 url = cl.GetIssueURL()
3868 if url and (not status or status == 'error'):
3869 # The issue probably doesn't exist anymore.
3870 url += ' (broken)'
3871
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003872 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003873 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003874 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003875 color = ''
3876 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003877 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003878
Alan Cuttera3be9a52019-03-04 18:50:33 +00003879 branch_display = FormatBranchName(branch)
3880 padding = ' ' * (alignment - len(branch_display))
3881 if not options.no_branch_color:
3882 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003883
Alan Cuttera3be9a52019-03-04 18:50:33 +00003884 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3885 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003886
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003888 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003889 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003890 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003891 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003892 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003894 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003896 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('Issue description:')
3898 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003899 return 0
3900
3901
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003902def colorize_CMDstatus_doc():
3903 """To be called once in main() to add colors to git cl status help."""
3904 colors = [i for i in dir(Fore) if i[0].isupper()]
3905
3906 def colorize_line(line):
3907 for color in colors:
3908 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003909 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003910 indent = len(line) - len(line.lstrip(' ')) + 1
3911 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3912 return line
3913
3914 lines = CMDstatus.__doc__.splitlines()
3915 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3916
3917
phajdan.jre328cf92016-08-22 04:12:17 -07003918def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003919 if path == '-':
3920 json.dump(contents, sys.stdout)
3921 else:
3922 with open(path, 'w') as f:
3923 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003924
3925
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003926@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003927@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003928def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003929 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930
3931 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003932 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003933 parser.add_option('-r', '--reverse', action='store_true',
3934 help='Lookup the branch(es) for the specified issues. If '
3935 'no issues are specified, all branches with mapped '
3936 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003937 parser.add_option('--json',
3938 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003939 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003940 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003941 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003942
dnj@chromium.org406c4402015-03-03 17:22:28 +00003943 if options.reverse:
3944 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003945 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003946 # Reverse issue lookup.
3947 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003948
3949 git_config = {}
3950 for config in RunGit(['config', '--get-regexp',
3951 r'branch\..*issue']).splitlines():
3952 name, _space, val = config.partition(' ')
3953 git_config[name] = val
3954
dnj@chromium.org406c4402015-03-03 17:22:28 +00003955 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003956 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3957 config_key = _git_branch_config_key(ShortBranchName(branch),
3958 cls.IssueConfigKey())
3959 issue = git_config.get(config_key)
3960 if issue:
3961 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003962 if not args:
3963 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003964 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003965 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003966 try:
3967 issue_num = int(issue)
3968 except ValueError:
3969 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003970 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003971 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003973 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003974 if options.json:
3975 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003976 return 0
3977
3978 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003979 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003980 if not issue.valid:
3981 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3982 'or no argument to list it.\n'
3983 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003984 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003985 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003986 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003987 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003988 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3989 if options.json:
3990 write_json(options.json, {
3991 'issue': cl.GetIssue(),
3992 'issue_url': cl.GetIssueURL(),
3993 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003994 return 0
3995
3996
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003997@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003998def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003999 """Shows or posts review comments for any changelist."""
4000 parser.add_option('-a', '--add-comment', dest='comment',
4001 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004002 parser.add_option('-p', '--publish', action='store_true',
4003 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004004 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004005 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004006 parser.add_option('-m', '--machine-readable', dest='readable',
4007 action='store_false', default=True,
4008 help='output comments in a format compatible with '
4009 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004010 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004011 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004012 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004013 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004014 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004015
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004016 issue = None
4017 if options.issue:
4018 try:
4019 issue = int(options.issue)
4020 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004021 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004022
Edward Lemur934836a2019-09-09 20:16:54 +00004023 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004024
4025 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004026 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004027 return 0
4028
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004029 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4030 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004031 for comment in summary:
4032 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004033 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004034 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004035 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004036 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004037 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004038 elif comment.autogenerated:
4039 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004040 else:
4041 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004042 print('\n%s%s %s%s\n%s' % (
4043 color,
4044 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4045 comment.sender,
4046 Fore.RESET,
4047 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4048
smut@google.comc85ac942015-09-15 16:34:43 +00004049 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004050 def pre_serialize(c):
4051 dct = c.__dict__.copy()
4052 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4053 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004054 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004055 return 0
4056
4057
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004058@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004059@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004060def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004061 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004062 parser.add_option('-d', '--display', action='store_true',
4063 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004064 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004065 help='New description to set for this issue (- for stdin, '
4066 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004067 parser.add_option('-f', '--force', action='store_true',
4068 help='Delete any unpublished Gerrit edits for this issue '
4069 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004070
4071 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004072 options, args = parser.parse_args(args)
4073 _process_codereview_select_options(parser, options)
4074
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004075 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004076 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004077 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004078 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004079 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004080
Edward Lemur934836a2019-09-09 20:16:54 +00004081 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004082 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004083 if target_issue_arg:
4084 kwargs['issue'] = target_issue_arg.issue
4085 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004086 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004087 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004088
4089 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004090 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004091 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004092 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004093
4094 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004095 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004096
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004097 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004098
smut@google.com34fb6b12015-07-13 20:03:26 +00004099 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004100 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004101 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004102
4103 if options.new_description:
4104 text = options.new_description
4105 if text == '-':
4106 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004107 elif text == '+':
4108 base_branch = cl.GetCommonAncestorWithUpstream()
4109 change = cl.GetChange(base_branch, None, local_description=True)
4110 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004111
4112 description.set_description(text)
4113 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004114 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004115 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004116 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004117 return 0
4118
4119
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004120@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004121def CMDlint(parser, args):
4122 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004123 parser.add_option('--filter', action='append', metavar='-x,+y',
4124 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004125 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004126
4127 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004128 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004129 try:
4130 import cpplint
4131 import cpplint_chromium
4132 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004133 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004134 return 1
4135
4136 # Change the current working directory before calling lint so that it
4137 # shows the correct base.
4138 previous_cwd = os.getcwd()
4139 os.chdir(settings.GetRoot())
4140 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004141 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004142 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4143 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004144 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004145 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004146 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004147
4148 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004149 command = args + files
4150 if options.filter:
4151 command = ['--filter=' + ','.join(options.filter)] + command
4152 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004153
4154 white_regex = re.compile(settings.GetLintRegex())
4155 black_regex = re.compile(settings.GetLintIgnoreRegex())
4156 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4157 for filename in filenames:
4158 if white_regex.match(filename):
4159 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004160 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004161 else:
4162 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4163 extra_check_functions)
4164 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004165 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004166 finally:
4167 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004168 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004169 if cpplint._cpplint_state.error_count != 0:
4170 return 1
4171 return 0
4172
4173
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004174@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004175def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004176 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004177 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004178 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004179 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004180 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004181 parser.add_option('--all', action='store_true',
4182 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004183 parser.add_option('--parallel', action='store_true',
4184 help='Run all tests specified by input_api.RunTests in all '
4185 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004186 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004187
sbc@chromium.org71437c02015-04-09 19:29:40 +00004188 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190 return 1
4191
Edward Lemur934836a2019-09-09 20:16:54 +00004192 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004193 if args:
4194 base_branch = args[0]
4195 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004196 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004197 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004198
Aaron Gable8076c282017-11-29 14:39:41 -08004199 if options.all:
4200 base_change = cl.GetChange(base_branch, None)
4201 files = [('M', f) for f in base_change.AllFiles()]
4202 change = presubmit_support.GitChange(
4203 base_change.Name(),
4204 base_change.FullDescriptionText(),
4205 base_change.RepositoryRoot(),
4206 files,
4207 base_change.issue,
4208 base_change.patchset,
4209 base_change.author_email,
4210 base_change._upstream)
4211 else:
4212 change = cl.GetChange(base_branch, None)
4213
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004214 cl.RunHook(
4215 committing=not options.upload,
4216 may_prompt=False,
4217 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004218 change=change,
4219 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004220 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004221
4222
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004223def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004224 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004225
4226 Works the same way as
4227 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4228 but can be called on demand on all platforms.
4229
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004230 The basic idea is to generate git hash of a state of the tree, original
4231 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004232 """
4233 lines = []
4234 tree_hash = RunGitSilent(['write-tree'])
4235 lines.append('tree %s' % tree_hash.strip())
4236 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4237 if code == 0:
4238 lines.append('parent %s' % parent.strip())
4239 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4240 lines.append('author %s' % author.strip())
4241 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4242 lines.append('committer %s' % committer.strip())
4243 lines.append('')
4244 # Note: Gerrit's commit-hook actually cleans message of some lines and
4245 # whitespace. This code is not doing this, but it clearly won't decrease
4246 # entropy.
4247 lines.append(message)
4248 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004249 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004250 return 'I%s' % change_hash.strip()
4251
4252
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004253def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004254 """Computes the remote branch ref to use for the CL.
4255
4256 Args:
4257 remote (str): The git remote for the CL.
4258 remote_branch (str): The git remote branch for the CL.
4259 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004260 """
4261 if not (remote and remote_branch):
4262 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004263
wittman@chromium.org455dc922015-01-26 20:15:50 +00004264 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004265 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004266 # refs, which are then translated into the remote full symbolic refs
4267 # below.
4268 if '/' not in target_branch:
4269 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4270 else:
4271 prefix_replacements = (
4272 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4273 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4274 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4275 )
4276 match = None
4277 for regex, replacement in prefix_replacements:
4278 match = re.search(regex, target_branch)
4279 if match:
4280 remote_branch = target_branch.replace(match.group(0), replacement)
4281 break
4282 if not match:
4283 # This is a branch path but not one we recognize; use as-is.
4284 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004285 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4286 # Handle the refs that need to land in different refs.
4287 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004288
wittman@chromium.org455dc922015-01-26 20:15:50 +00004289 # Create the true path to the remote branch.
4290 # Does the following translation:
4291 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4292 # * refs/remotes/origin/master -> refs/heads/master
4293 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4294 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4295 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4296 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4297 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4298 'refs/heads/')
4299 elif remote_branch.startswith('refs/remotes/branch-heads'):
4300 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004301
wittman@chromium.org455dc922015-01-26 20:15:50 +00004302 return remote_branch
4303
4304
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004305def cleanup_list(l):
4306 """Fixes a list so that comma separated items are put as individual items.
4307
4308 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4309 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4310 """
4311 items = sum((i.split(',') for i in l), [])
4312 stripped_items = (i.strip() for i in items)
4313 return sorted(filter(None, stripped_items))
4314
4315
Aaron Gable4db38df2017-11-03 14:59:07 -07004316@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004317@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004318def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004319 """Uploads the current changelist to codereview.
4320
4321 Can skip dependency patchset uploads for a branch by running:
4322 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004323 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004324 git config --unset branch.branch_name.skip-deps-uploads
4325 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004326
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004327 If the name of the checked out branch starts with "bug-" or "fix-" followed
4328 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004329 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004330
4331 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004332 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004333 [git-cl] add support for hashtags
4334 Foo bar: implement foo
4335 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004336 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004337 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4338 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004339 parser.add_option('--bypass-watchlists', action='store_true',
4340 dest='bypass_watchlists',
4341 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004342 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004343 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004344 parser.add_option('--message', '-m', dest='message',
4345 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004346 parser.add_option('-b', '--bug',
4347 help='pre-populate the bug number(s) for this issue. '
4348 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004349 parser.add_option('--message-file', dest='message_file',
4350 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004351 parser.add_option('--title', '-t', dest='title',
4352 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004353 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004354 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004355 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004356 parser.add_option('--tbrs',
4357 action='append', default=[],
4358 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004359 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004360 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004361 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004362 parser.add_option('--hashtag', dest='hashtags',
4363 action='append', default=[],
4364 help=('Gerrit hashtag for new CL; '
4365 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004366 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004367 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004368 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004369 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004370 metavar='TARGET',
4371 help='Apply CL to remote ref TARGET. ' +
4372 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004373 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004374 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004375 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004376 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004377 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004378 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004379 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4380 const='TBR', help='add a set of OWNERS to TBR')
4381 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4382 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004383 parser.add_option('-c', '--use-commit-queue', action='store_true',
4384 help='tell the CQ to commit this patchset; '
4385 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004386 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4387 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004388 help='Send the patchset to do a CQ dry run right after '
4389 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004390 parser.add_option('--preserve-tryjobs', action='store_true',
4391 help='instruct the CQ to let tryjobs running even after '
4392 'new patchsets are uploaded instead of canceling '
4393 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004394 parser.add_option('--dependencies', action='store_true',
4395 help='Uploads CLs of all the local branches that depend on '
4396 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004397 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4398 help='Sends your change to the CQ after an approval. Only '
4399 'works on repos that have the Auto-Submit label '
4400 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004401 parser.add_option('--parallel', action='store_true',
4402 help='Run all tests specified by input_api.RunTests in all '
4403 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004404
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004405 parser.add_option('--no-autocc', action='store_true',
4406 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004407 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004408 help='Set the review private. This implies --no-autocc.')
4409
rmistry@google.com2dd99862015-06-22 12:22:18 +00004410 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004411 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004412 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004413 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004414
sbc@chromium.org71437c02015-04-09 19:29:40 +00004415 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004416 return 1
4417
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004418 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004419 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004420 options.cc = cleanup_list(options.cc)
4421
tandriib80458a2016-06-23 12:20:07 -07004422 if options.message_file:
4423 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004424 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004425 options.message = gclient_utils.FileRead(options.message_file)
4426 options.message_file = None
4427
tandrii4d0545a2016-07-06 03:56:49 -07004428 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004429 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004430
Aaron Gableedbc4132017-09-11 13:22:28 -07004431 if options.use_commit_queue:
4432 options.send_mail = True
4433
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004434 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4435 settings.GetIsGerrit()
4436
Edward Lemur934836a2019-09-09 20:16:54 +00004437 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004438
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004439 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004440
4441
Francois Dorayd42c6812017-05-30 15:10:20 -04004442@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004443@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004444def CMDsplit(parser, args):
4445 """Splits a branch into smaller branches and uploads CLs.
4446
4447 Creates a branch and uploads a CL for each group of files modified in the
4448 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004449 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004450 the shared OWNERS file.
4451 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004452 parser.add_option('-d', '--description', dest='description_file',
4453 help='A text file containing a CL description in which '
4454 '$directory will be replaced by each CL\'s directory.')
4455 parser.add_option('-c', '--comment', dest='comment_file',
4456 help='A text file containing a CL comment.')
4457 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004458 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004459 help='List the files and reviewers for each CL that would '
4460 'be created, but don\'t create branches or CLs.')
4461 parser.add_option('--cq-dry-run', action='store_true',
4462 help='If set, will do a cq dry run for each uploaded CL. '
4463 'Please be careful when doing this; more than ~10 CLs '
4464 'has the potential to overload our build '
4465 'infrastructure. Try to upload these not during high '
4466 'load times (usually 11-3 Mountain View time). Email '
4467 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004468 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4469 default=True,
4470 help='Sends your change to the CQ after an approval. Only '
4471 'works on repos that have the Auto-Submit label '
4472 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004473 options, _ = parser.parse_args(args)
4474
4475 if not options.description_file:
4476 parser.error('No --description flag specified.')
4477
4478 def WrappedCMDupload(args):
4479 return CMDupload(OptionParser(), args)
4480
4481 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004482 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004483 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004484
4485
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004486@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004487@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004489 """DEPRECATED: Used to commit the current changelist via git-svn."""
4490 message = ('git-cl no longer supports committing to SVN repositories via '
4491 'git-svn. You probably want to use `git cl land` instead.')
4492 print(message)
4493 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494
4495
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004496# Two special branches used by git cl land.
4497MERGE_BRANCH = 'git-cl-commit'
4498CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4499
4500
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004501@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004502@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004503def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004504 """Commits the current changelist via git.
4505
4506 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4507 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004508 """
4509 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4510 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004511 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004512 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004513 parser.add_option('--parallel', action='store_true',
4514 help='Run all tests specified by input_api.RunTests in all '
4515 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004516 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004517
Edward Lemur934836a2019-09-09 20:16:54 +00004518 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004519
Robert Iannucci2e73d432018-03-14 01:10:47 -07004520 if not cl.GetIssue():
4521 DieWithError('You must upload the change first to Gerrit.\n'
4522 ' If you would rather have `git cl land` upload '
4523 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004524 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004525 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004526
4527
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004528@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004529@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004531 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004532 parser.add_option('-b', dest='newbranch',
4533 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004534 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004535 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004537 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004538
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004539 group = optparse.OptionGroup(
4540 parser,
4541 'Options for continuing work on the current issue uploaded from a '
4542 'different clone (e.g. different machine). Must be used independently '
4543 'from the other options. No issue number should be specified, and the '
4544 'branch must have an issue number associated with it')
4545 group.add_option('--reapply', action='store_true', dest='reapply',
4546 help='Reset the branch and reapply the issue.\n'
4547 'CAUTION: This will undo any local changes in this '
4548 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004549
4550 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004551 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004552 parser.add_option_group(group)
4553
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004554 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004556 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004557
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004558 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004559 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004560 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004561 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004562 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004563
Edward Lemur934836a2019-09-09 20:16:54 +00004564 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004565 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004566 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004567
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004568 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004569 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004570 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004571
4572 RunGit(['reset', '--hard', upstream])
4573 if options.pull:
4574 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004575
Edward Lemurf38bc172019-09-03 21:02:13 +00004576 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004577
4578 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004580
Edward Lemurf38bc172019-09-03 21:02:13 +00004581 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004582 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004583 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004584
4585 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004586 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004587 }
4588 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004589 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004590 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004591 cl_kwargs['issue'] = target_issue_arg.issue
4592
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004593 # We don't want uncommitted changes mixed up with the patch.
4594 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004595 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004596
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004597 if options.newbranch:
4598 if options.force:
4599 RunGit(['branch', '-D', options.newbranch],
4600 stderr=subprocess2.PIPE, error_ok=True)
4601 RunGit(['new-branch', options.newbranch])
4602
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004603 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004604
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004605 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004606 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004607
Edward Lemurf38bc172019-09-03 21:02:13 +00004608 return cl.CMDPatchWithParsedIssue(
4609 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610
4611
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004612def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613 """Fetches the tree status and returns either 'open', 'closed',
4614 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004615 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616 if url:
4617 status = urllib2.urlopen(url).read().lower()
4618 if status.find('closed') != -1 or status == '0':
4619 return 'closed'
4620 elif status.find('open') != -1 or status == '1':
4621 return 'open'
4622 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623 return 'unset'
4624
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004625
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626def GetTreeStatusReason():
4627 """Fetches the tree status from a json url and returns the message
4628 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004629 url = settings.GetTreeStatusUrl()
4630 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631 connection = urllib2.urlopen(json_url)
4632 status = json.loads(connection.read())
4633 connection.close()
4634 return status['message']
4635
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004636
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004637@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004638def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004639 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004640 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004641 status = GetTreeStatus()
4642 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004643 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644 return 2
4645
vapiera7fbd5a2016-06-16 09:17:49 -07004646 print('The tree is %s' % status)
4647 print()
4648 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004649 if status != 'open':
4650 return 1
4651 return 0
4652
4653
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004654@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004655def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004656 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4657 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004658 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004659 '-b', '--bot', action='append',
4660 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4661 'times to specify multiple builders. ex: '
4662 '"-b win_rel -b win_layout". See '
4663 'the try server waterfall for the builders name and the tests '
4664 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004665 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004666 '-B', '--bucket', default='',
4667 help=('Buildbucket bucket to send the try requests.'))
4668 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004669 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004670 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004671 'be determined by the try recipe that builder runs, which usually '
4672 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004673 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004674 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004675 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004676 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004677 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004678 '--category', default='git_cl_try', help='Specify custom build category.')
4679 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004680 '--project',
4681 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004682 'in recipe to determine to which repository or directory to '
4683 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004684 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004685 '-p', '--property', dest='properties', action='append', default=[],
4686 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004687 'key2=value2 etc. The value will be treated as '
4688 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004689 'NOTE: using this may make your tryjob not usable for CQ, '
4690 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004691 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004692 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4693 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004694 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004695 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004696 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004697 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004698 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004699 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004700
machenbach@chromium.org45453142015-09-15 08:45:22 +00004701 # Make sure that all properties are prop=value pairs.
4702 bad_params = [x for x in options.properties if '=' not in x]
4703 if bad_params:
4704 parser.error('Got properties with missing "=": %s' % bad_params)
4705
maruel@chromium.org15192402012-09-06 12:38:29 +00004706 if args:
4707 parser.error('Unknown arguments: %s' % args)
4708
Edward Lemur934836a2019-09-09 20:16:54 +00004709 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004710 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004711 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004712
Edward Lemurf38bc172019-09-03 21:02:13 +00004713 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004714 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004715
tandriie113dfd2016-10-11 10:20:12 -07004716 error_message = cl.CannotTriggerTryJobReason()
4717 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004718 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004719
qyearsley1fdfcb62016-10-24 13:22:03 -07004720 buckets = _get_bucket_map(cl, options, parser)
Edward Lemurc8b67ed2019-09-12 20:28:58 +00004721 if buckets and any(b.startswith('master.') for b in buckets):
4722 print('ERROR: Buildbot masters are not supported.')
4723 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004724
qyearsleydd49f942016-10-28 11:57:22 -07004725 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4726 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004727 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004728 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004729 print('git cl try with no bots now defaults to CQ dry run.')
4730 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4731 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004732
borenet6c0efe62016-10-19 08:13:29 -07004733 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004734 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004735 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004736 'of bot requires an initial job from a parent (usually a builder). '
4737 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004738 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004739 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004740
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004741 patchset = cl.GetMostRecentPatchset()
Edward Lemur64d4a372019-09-16 18:44:52 +00004742 return _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
maruel@chromium.org15192402012-09-06 12:38:29 +00004743
4744
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004745@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004746def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004747 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004748 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004750 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004751 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004752 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004753 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004754 '--color', action='store_true', default=setup_color.IS_TTY,
4755 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004757 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4758 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004759 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004760 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004761 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004762 parser.add_option_group(group)
4763 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004764 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004766 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004767 if args:
4768 parser.error('Unrecognized args: %s' % ' '.join(args))
4769
4770 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004771 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004772 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004773 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004774
tandrii221ab252016-10-06 08:12:04 -07004775 patchset = options.patchset
4776 if not patchset:
4777 patchset = cl.GetMostRecentPatchset()
4778 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004779 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004780 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004781 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004782 cl.GetIssue())
4783
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004784 try:
tandrii221ab252016-10-06 08:12:04 -07004785 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004787 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004788 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004789 if options.json:
4790 write_try_results_json(options.json, jobs)
4791 else:
4792 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004793 return 0
4794
4795
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004796@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004797@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004798def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004799 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004800 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004801 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004802 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004803
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004804 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004805 if args:
4806 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004807 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004808 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004809 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004810 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004811
4812 # Clear configured merge-base, if there is one.
4813 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004814 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004815 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004816 return 0
4817
4818
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004819@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004820def CMDweb(parser, args):
4821 """Opens the current CL in the web browser."""
4822 _, args = parser.parse_args(args)
4823 if args:
4824 parser.error('Unrecognized args: %s' % ' '.join(args))
4825
4826 issue_url = Changelist().GetIssueURL()
4827 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004828 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004829 return 1
4830
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004831 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004832 # allows us to hide the "Created new window in existing browser session."
4833 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004834 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004835 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004836 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004837 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004838 os.open(os.devnull, os.O_RDWR)
4839 try:
4840 webbrowser.open(issue_url)
4841 finally:
4842 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004843 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004844 return 0
4845
4846
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004847@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004848def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004849 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004850 parser.add_option('-d', '--dry-run', action='store_true',
4851 help='trigger in dry run mode')
4852 parser.add_option('-c', '--clear', action='store_true',
4853 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004854 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004855 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004856 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004857 if args:
4858 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004859 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004860 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004861
Edward Lemur934836a2019-09-09 20:16:54 +00004862 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004863 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004864 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004865 elif options.dry_run:
4866 state = _CQState.DRY_RUN
4867 else:
4868 state = _CQState.COMMIT
4869 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004870 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004871 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004872 return 0
4873
4874
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004875@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004876def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004877 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004878 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004879 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004880 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004881 if args:
4882 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004883 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004884 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004885 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004886 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004887 cl.CloseIssue()
4888 return 0
4889
4890
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004891@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004892def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004893 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004894 parser.add_option(
4895 '--stat',
4896 action='store_true',
4897 dest='stat',
4898 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004899 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004900 if args:
4901 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004902
Edward Lemur934836a2019-09-09 20:16:54 +00004903 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004904 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004905 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004906 if not issue:
4907 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004908
Aaron Gablea718c3e2017-08-28 17:47:28 -07004909 base = cl._GitGetBranchConfigValue('last-upload-hash')
4910 if not base:
4911 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4912 if not base:
4913 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4914 revision_info = detail['revisions'][detail['current_revision']]
4915 fetch_info = revision_info['fetch']['http']
4916 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4917 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004918
Aaron Gablea718c3e2017-08-28 17:47:28 -07004919 cmd = ['git', 'diff']
4920 if options.stat:
4921 cmd.append('--stat')
4922 cmd.append(base)
4923 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004924
4925 return 0
4926
4927
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004928@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004929def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004930 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004931 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004932 '--ignore-current',
4933 action='store_true',
4934 help='Ignore the CL\'s current reviewers and start from scratch.')
4935 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004936 '--ignore-self',
4937 action='store_true',
4938 help='Do not consider CL\'s author as an owners.')
4939 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004940 '--no-color',
4941 action='store_true',
4942 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004943 parser.add_option(
4944 '--batch',
4945 action='store_true',
4946 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004947 # TODO: Consider moving this to another command, since other
4948 # git-cl owners commands deal with owners for a given CL.
4949 parser.add_option(
4950 '--show-all',
4951 action='store_true',
4952 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004953 options, args = parser.parse_args(args)
4954
4955 author = RunGit(['config', 'user.email']).strip() or None
4956
Edward Lemur934836a2019-09-09 20:16:54 +00004957 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004958
Yang Guo6e269a02019-06-26 11:17:02 +00004959 if options.show_all:
4960 for arg in args:
4961 base_branch = cl.GetCommonAncestorWithUpstream()
4962 change = cl.GetChange(base_branch, None)
4963 database = owners.Database(change.RepositoryRoot(), file, os.path)
4964 database.load_data_needed_for([arg])
4965 print('Owners for %s:' % arg)
4966 for owner in sorted(database.all_possible_owners([arg], None)):
4967 print(' - %s' % owner)
4968 return 0
4969
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970 if args:
4971 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004972 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004973 base_branch = args[0]
4974 else:
4975 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004976 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004977
4978 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004979 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4980
4981 if options.batch:
4982 db = owners.Database(change.RepositoryRoot(), file, os.path)
4983 print('\n'.join(db.reviewers_for(affected_files, author)))
4984 return 0
4985
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004986 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004987 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004988 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004989 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004990 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004991 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004992 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004993 override_files=change.OriginalOwnersFiles(),
4994 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995
4996
Aiden Bennerc08566e2018-10-03 17:52:42 +00004997def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004998 """Generates a diff command."""
4999 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005000 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5001
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005002 if allow_prefix:
5003 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5004 # case that diff.noprefix is set in the user's git config.
5005 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5006 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005007 diff_cmd += ['--no-prefix']
5008
5009 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010
5011 if args:
5012 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005013 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005014 diff_cmd.append(arg)
5015 else:
5016 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005017
5018 return diff_cmd
5019
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005020
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005021def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005022 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005023 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005024
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005025
enne@chromium.org555cfe42014-01-29 18:21:39 +00005026@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005027@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005028def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005029 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005030 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005031 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005032 parser.add_option('--full', action='store_true',
5033 help='Reformat the full content of all touched files')
5034 parser.add_option('--dry-run', action='store_true',
5035 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005036 parser.add_option(
5037 '--python',
5038 action='store_true',
5039 default=None,
5040 help='Enables python formatting on all python files.')
5041 parser.add_option(
5042 '--no-python',
5043 action='store_true',
5044 dest='python',
5045 help='Disables python formatting on all python files. '
5046 'Takes precedence over --python. '
5047 'If neither --python or --no-python are set, python '
5048 'files that have a .style.yapf file in an ancestor '
5049 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005050 parser.add_option('--js', action='store_true',
5051 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005052 parser.add_option('--diff', action='store_true',
5053 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005054 parser.add_option('--presubmit', action='store_true',
5055 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005056 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005057
Daniel Chengc55eecf2016-12-30 03:11:02 -08005058 # Normalize any remaining args against the current path, so paths relative to
5059 # the current directory are still resolved as expected.
5060 args = [os.path.join(os.getcwd(), arg) for arg in args]
5061
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005062 # git diff generates paths against the root of the repository. Change
5063 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005064 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005065 if rel_base_path:
5066 os.chdir(rel_base_path)
5067
digit@chromium.org29e47272013-05-17 17:01:46 +00005068 # Grab the merge-base commit, i.e. the upstream commit of the current
5069 # branch when it was created or the last time it was rebased. This is
5070 # to cover the case where the user may have called "git fetch origin",
5071 # moving the origin branch to a newer commit, but hasn't rebased yet.
5072 upstream_commit = None
5073 cl = Changelist()
5074 upstream_branch = cl.GetUpstreamBranch()
5075 if upstream_branch:
5076 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5077 upstream_commit = upstream_commit.strip()
5078
5079 if not upstream_commit:
5080 DieWithError('Could not find base commit for this branch. '
5081 'Are you in detached state?')
5082
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005083 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5084 diff_output = RunGit(changed_files_cmd)
5085 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005086 # Filter out files deleted by this CL
5087 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005088
Christopher Lamc5ba6922017-01-24 11:19:14 +11005089 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005090 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005091
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005092 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5093 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5094 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005095 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005096
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005097 top_dir = os.path.normpath(
5098 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5099
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005100 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5101 # formatted. This is used to block during the presubmit.
5102 return_value = 0
5103
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005104 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005105 # Locate the clang-format binary in the checkout
5106 try:
5107 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005108 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005109 DieWithError(e)
5110
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005111 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005112 cmd = [clang_format_tool]
5113 if not opts.dry_run and not opts.diff:
5114 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005115 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005116 if opts.diff:
5117 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005118 else:
5119 env = os.environ.copy()
5120 env['PATH'] = str(os.path.dirname(clang_format_tool))
5121 try:
5122 script = clang_format.FindClangFormatScriptInChromiumTree(
5123 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005124 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005125 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005126
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005127 cmd = [sys.executable, script, '-p0']
5128 if not opts.dry_run and not opts.diff:
5129 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005130
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005131 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5132 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005133
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005134 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5135 if opts.diff:
5136 sys.stdout.write(stdout)
5137 if opts.dry_run and len(stdout) > 0:
5138 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005139
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005140 # Similar code to above, but using yapf on .py files rather than clang-format
5141 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005142 py_explicitly_disabled = opts.python is not None and not opts.python
5143 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005144 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5145 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5146 if sys.platform.startswith('win'):
5147 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005148
Aiden Bennerc08566e2018-10-03 17:52:42 +00005149 # If we couldn't find a yapf file we'll default to the chromium style
5150 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005151 chromium_default_yapf_style = os.path.join(depot_tools_path,
5152 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005153 # Used for caching.
5154 yapf_configs = {}
5155 for f in python_diff_files:
5156 # Find the yapf style config for the current file, defaults to depot
5157 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005158 _FindYapfConfigFile(f, yapf_configs, top_dir)
5159
5160 # Turn on python formatting by default if a yapf config is specified.
5161 # This breaks in the case of this repo though since the specified
5162 # style file is also the global default.
5163 if opts.python is None:
5164 filtered_py_files = []
5165 for f in python_diff_files:
5166 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5167 filtered_py_files.append(f)
5168 else:
5169 filtered_py_files = python_diff_files
5170
5171 # Note: yapf still seems to fix indentation of the entire file
5172 # even if line ranges are specified.
5173 # See https://github.com/google/yapf/issues/499
5174 if not opts.full and filtered_py_files:
5175 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5176
5177 for f in filtered_py_files:
5178 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5179 if yapf_config is None:
5180 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005181
5182 cmd = [yapf_tool, '--style', yapf_config, f]
5183
5184 has_formattable_lines = False
5185 if not opts.full:
5186 # Only run yapf over changed line ranges.
5187 for diff_start, diff_len in py_line_diffs[f]:
5188 diff_end = diff_start + diff_len - 1
5189 # Yapf errors out if diff_end < diff_start but this
5190 # is a valid line range diff for a removal.
5191 if diff_end >= diff_start:
5192 has_formattable_lines = True
5193 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5194 # If all line diffs were removals we have nothing to format.
5195 if not has_formattable_lines:
5196 continue
5197
5198 if opts.diff or opts.dry_run:
5199 cmd += ['--diff']
5200 # Will return non-zero exit code if non-empty diff.
5201 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5202 if opts.diff:
5203 sys.stdout.write(stdout)
5204 elif len(stdout) > 0:
5205 return_value = 2
5206 else:
5207 cmd += ['-i']
5208 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005209
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005210 # Dart's formatter does not have the nice property of only operating on
5211 # modified chunks, so hard code full.
5212 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213 try:
5214 command = [dart_format.FindDartFmtToolInChromiumTree()]
5215 if not opts.dry_run and not opts.diff:
5216 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005217 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005218
ppi@chromium.org6593d932016-03-03 15:41:15 +00005219 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005220 if opts.dry_run and stdout:
5221 return_value = 2
5222 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005223 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5224 'found in this checkout. Files in other languages are still '
5225 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005226
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005227 # Format GN build files. Always run on full build files for canonical form.
5228 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005229 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005230 if opts.dry_run or opts.diff:
5231 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005232 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005233 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5234 shell=sys.platform == 'win32',
5235 cwd=top_dir)
5236 if opts.dry_run and gn_ret == 2:
5237 return_value = 2 # Not formatted.
5238 elif opts.diff and gn_ret == 2:
5239 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005240 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005241 elif gn_ret != 0:
5242 # For non-dry run cases (and non-2 return values for dry-run), a
5243 # nonzero error code indicates a failure, probably because the file
5244 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005245 DieWithError('gn format failed on ' + gn_diff_file +
5246 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005247
Ilya Shermane081cbe2017-08-15 17:51:04 -07005248 # Skip the metrics formatting from the global presubmit hook. These files have
5249 # a separate presubmit hook that issues an error if the files need formatting,
5250 # whereas the top-level presubmit script merely issues a warning. Formatting
5251 # these files is somewhat slow, so it's important not to duplicate the work.
5252 if not opts.presubmit:
5253 for xml_dir in GetDirtyMetricsDirs(diff_files):
5254 tool_dir = os.path.join(top_dir, xml_dir)
5255 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5256 if opts.dry_run or opts.diff:
5257 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005258 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005259 if opts.diff:
5260 sys.stdout.write(stdout)
5261 if opts.dry_run and stdout:
5262 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005263
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005264 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005265
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005266
Steven Holte2e664bf2017-04-21 13:10:47 -07005267def GetDirtyMetricsDirs(diff_files):
5268 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5269 metrics_xml_dirs = [
5270 os.path.join('tools', 'metrics', 'actions'),
5271 os.path.join('tools', 'metrics', 'histograms'),
5272 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005273 os.path.join('tools', 'metrics', 'ukm'),
5274 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005275 for xml_dir in metrics_xml_dirs:
5276 if any(file.startswith(xml_dir) for file in xml_diff_files):
5277 yield xml_dir
5278
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005279
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005280@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005281@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005282def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005283 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005284 _, args = parser.parse_args(args)
5285
5286 if len(args) != 1:
5287 parser.print_help()
5288 return 1
5289
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005290 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005291 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005292 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005293
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005294 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005295
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005296 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005297 output = RunGit(['config', '--local', '--get-regexp',
5298 r'branch\..*\.%s' % issueprefix],
5299 error_ok=True)
5300 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005301 if issue == target_issue:
5302 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005303
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005304 branches = []
5305 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005306 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005308 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309 return 1
5310 if len(branches) == 1:
5311 RunGit(['checkout', branches[0]])
5312 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316 which = raw_input('Choose by index: ')
5317 try:
5318 RunGit(['checkout', branches[int(which)]])
5319 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005320 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 return 1
5322
5323 return 0
5324
5325
maruel@chromium.org29404b52014-09-08 22:58:00 +00005326def CMDlol(parser, args):
5327 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005328 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005329 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5330 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5331 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005332 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005333 return 0
5334
5335
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005336class OptionParser(optparse.OptionParser):
5337 """Creates the option parse and add --verbose support."""
5338 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005339 optparse.OptionParser.__init__(
5340 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005341 self.add_option(
5342 '-v', '--verbose', action='count', default=0,
5343 help='Use 2 times for more debugging info')
5344
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005345 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005346 try:
5347 return self._parse_args(args)
5348 finally:
5349 # Regardless of success or failure of args parsing, we want to report
5350 # metrics, but only after logging has been initialized (if parsing
5351 # succeeded).
5352 global settings
5353 settings = Settings()
5354
5355 if not metrics.DISABLE_METRICS_COLLECTION:
5356 # GetViewVCUrl ultimately calls logging method.
5357 project_url = settings.GetViewVCUrl().strip('/+')
5358 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5359 metrics.collector.add('project_urls', [project_url])
5360
5361 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005362 # Create an optparse.Values object that will store only the actual passed
5363 # options, without the defaults.
5364 actual_options = optparse.Values()
5365 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5366 # Create an optparse.Values object with the default options.
5367 options = optparse.Values(self.get_default_values().__dict__)
5368 # Update it with the options passed by the user.
5369 options._update_careful(actual_options.__dict__)
5370 # Store the options passed by the user in an _actual_options attribute.
5371 # We store only the keys, and not the values, since the values can contain
5372 # arbitrary information, which might be PII.
5373 metrics.collector.add('arguments', actual_options.__dict__.keys())
5374
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005375 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005376 logging.basicConfig(
5377 level=levels[min(options.verbose, len(levels) - 1)],
5378 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5379 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005380
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005381 return options, args
5382
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005383
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005384def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005385 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005386 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005387 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005388 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005389
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005390 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005391 dispatcher = subcommand.CommandDispatcher(__name__)
5392 try:
5393 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005394 except auth.AuthenticationError as e:
5395 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005396 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005397 if e.code != 500:
5398 raise
5399 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005401 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005402 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005403
5404
5405if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005406 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5407 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005408 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005409 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005410 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005411 sys.exit(main(sys.argv[1:]))