blob: 7b25bd99a0bf2bccc225963f3a264f61af9edf1c [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
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000491
tandrii221ab252016-10-06 08:12:04 -0700492def fetch_try_jobs(auth_config, changelist, buildbucket_host,
493 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000494 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000495
qyearsley53f48a12016-09-01 10:45:13 -0700496 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000497 """
tandrii221ab252016-10-06 08:12:04 -0700498 assert buildbucket_host
499 assert changelist.GetIssue(), 'CL must be uploaded first'
500 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
501 patchset = patchset or changelist.GetMostRecentPatchset()
502 assert patchset, 'CL must be uploaded first'
503
504 codereview_url = changelist.GetCodereviewServer()
505 codereview_host = urlparse.urlparse(codereview_url).hostname
506 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000507 if authenticator.has_cached_credentials():
508 http = authenticator.authorize(httplib2.Http())
509 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700510 print('Warning: Some results might be missing because %s' %
511 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700512 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000513 http = httplib2.Http()
514
515 http.force_exception_to_status_code = True
516
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000517 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700518 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700520 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000521 params = {'tag': 'buildset:%s' % buildset}
522
523 builds = {}
524 while True:
525 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700526 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000528 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529 for build in content.get('builds', []):
530 builds[build['id']] = build
531 if 'next_cursor' in content:
532 params['start_cursor'] = content['next_cursor']
533 else:
534 break
535 return builds
536
537
qyearsleyeab3c042016-08-24 09:18:28 -0700538def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000539 """Prints nicely result of fetch_try_jobs."""
540 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000541 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000542 return
543
544 # Make a copy, because we'll be modifying builds dictionary.
545 builds = builds.copy()
546 builder_names_cache = {}
547
548 def get_builder(b):
549 try:
550 return builder_names_cache[b['id']]
551 except KeyError:
552 try:
553 parameters = json.loads(b['parameters_json'])
554 name = parameters['builder_name']
555 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700556 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700557 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 name = None
559 builder_names_cache[b['id']] = name
560 return name
561
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 if options.print_master:
563 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000564 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 max(len(str(get_builder(b))) for b in builds.itervalues()))
566 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000567 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 else:
569 name_fmt = '%%-%ds' % (
570 max(len(str(get_builder(b))) for b in builds.itervalues()))
571 def get_name(b):
572 return name_fmt % get_builder(b)
573
574 def sort_key(b):
575 return b['status'], b.get('result'), get_name(b), b.get('url')
576
577 def pop(title, f, color=None, **kwargs):
578 """Pop matching builds from `builds` dict and print them."""
579
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000580 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 colorize = str
582 else:
583 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
584
585 result = []
586 for b in builds.values():
587 if all(b.get(k) == v for k, v in kwargs.iteritems()):
588 builds.pop(b['id'])
589 result.append(b)
590 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700591 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700593 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594
595 total = len(builds)
596 pop(status='COMPLETED', result='SUCCESS',
597 title='Successes:', color=Fore.GREEN,
598 f=lambda b: (get_name(b), b.get('url')))
599 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
600 title='Infra Failures:', color=Fore.MAGENTA,
601 f=lambda b: (get_name(b), b.get('url')))
602 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
603 title='Failures:', color=Fore.RED,
604 f=lambda b: (get_name(b), b.get('url')))
605 pop(status='COMPLETED', result='CANCELED',
606 title='Canceled:', color=Fore.MAGENTA,
607 f=lambda b: (get_name(b),))
608 pop(status='COMPLETED', result='FAILURE',
609 failure_reason='INVALID_BUILD_DEFINITION',
610 title='Wrong master/builder name:', color=Fore.MAGENTA,
611 f=lambda b: (get_name(b),))
612 pop(status='COMPLETED', result='FAILURE',
613 title='Other failures:',
614 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
615 pop(status='COMPLETED',
616 title='Other finished:',
617 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
618 pop(status='STARTED',
619 title='Started:', color=Fore.YELLOW,
620 f=lambda b: (get_name(b), b.get('url')))
621 pop(status='SCHEDULED',
622 title='Scheduled:',
623 f=lambda b: (get_name(b), 'id=%s' % b['id']))
624 # The last section is just in case buildbucket API changes OR there is a bug.
625 pop(title='Other:',
626 f=lambda b: (get_name(b), 'id=%s' % b['id']))
627 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000628 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000629
630
Aiden Bennerc08566e2018-10-03 17:52:42 +0000631def _ComputeDiffLineRanges(files, upstream_commit):
632 """Gets the changed line ranges for each file since upstream_commit.
633
634 Parses a git diff on provided files and returns a dict that maps a file name
635 to an ordered list of range tuples in the form (start_line, count).
636 Ranges are in the same format as a git diff.
637 """
638 # If files is empty then diff_output will be a full diff.
639 if len(files) == 0:
640 return {}
641
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000642 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000643 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
644 diff_output = RunGit(diff_cmd)
645
646 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
647 # 2 capture groups
648 # 0 == fname of diff file
649 # 1 == 'diff_start,diff_count' or 'diff_start'
650 # will match each of
651 # diff --git a/foo.foo b/foo.py
652 # @@ -12,2 +14,3 @@
653 # @@ -12,2 +17 @@
654 # running re.findall on the above string with pattern will give
655 # [('foo.py', ''), ('', '14,3'), ('', '17')]
656
657 curr_file = None
658 line_diffs = {}
659 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
660 if match[0] != '':
661 # Will match the second filename in diff --git a/a.py b/b.py.
662 curr_file = match[0]
663 line_diffs[curr_file] = []
664 else:
665 # Matches +14,3
666 if ',' in match[1]:
667 diff_start, diff_count = match[1].split(',')
668 else:
669 # Single line changes are of the form +12 instead of +12,1.
670 diff_start = match[1]
671 diff_count = 1
672
673 diff_start = int(diff_start)
674 diff_count = int(diff_count)
675
676 # If diff_count == 0 this is a removal we can ignore.
677 line_diffs[curr_file].append((diff_start, diff_count))
678
679 return line_diffs
680
681
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000683 """Checks if a yapf file is in any parent directory of fpath until top_dir.
684
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000685 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000686 is found returns None. Uses yapf_config_cache as a cache for previously found
687 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000689 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000690 # Return result if we've already computed it.
691 if fpath in yapf_config_cache:
692 return yapf_config_cache[fpath]
693
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000694 parent_dir = os.path.dirname(fpath)
695 if os.path.isfile(fpath):
696 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000697 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000698 # Otherwise fpath is a directory
699 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
700 if os.path.isfile(yapf_file):
701 ret = yapf_file
702 elif fpath == top_dir or parent_dir == fpath:
703 # If we're at the top level directory, or if we're at root
704 # there is no provided style.
705 ret = None
706 else:
707 # Otherwise recurse on the current directory.
708 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000709 yapf_config_cache[fpath] = ret
710 return ret
711
712
qyearsley53f48a12016-09-01 10:45:13 -0700713def write_try_results_json(output_file, builds):
714 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
715
716 The input |builds| dict is assumed to be generated by Buildbucket.
717 Buildbucket documentation: http://goo.gl/G0s101
718 """
719
720 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800721 """Extracts some of the information from one build dict."""
722 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700723 return {
724 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700725 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800726 'builder_name': parameters.get('builder_name'),
727 'created_ts': build.get('created_ts'),
728 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700729 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800730 'result': build.get('result'),
731 'status': build.get('status'),
732 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700733 'url': build.get('url'),
734 }
735
736 converted = []
737 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000738 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700739 write_json(output_file, converted)
740
741
Aaron Gable13101a62018-02-09 13:20:41 -0800742def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000743 """Prints statistics about the change to the user."""
744 # --no-ext-diff is broken in some versions of Git, so try to work around
745 # this by overriding the environment (but there is still a problem if the
746 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000747 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 if 'GIT_EXTERNAL_DIFF' in env:
749 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000751 try:
752 stdout = sys.stdout.fileno()
753 except AttributeError:
754 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000755 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800756 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000757 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758
759
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000760class BuildbucketResponseException(Exception):
761 pass
762
763
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764class Settings(object):
765 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775
776 def LazyUpdateIfNeeded(self):
777 """Updates the settings from a codereview.settings file, if available."""
778 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000779 # The only value that actually changes the behavior is
780 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000781 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782 error_ok=True
783 ).strip().lower()
784
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000786 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 LoadCodereviewSettingsFromFile(cr_settings_file)
788 self.updated = True
789
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000790 @staticmethod
791 def GetRelativeRoot():
792 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000793
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000795 if self.root is None:
796 self.root = os.path.abspath(self.GetRelativeRoot())
797 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799 def GetTreeStatusUrl(self, error_ok=False):
800 if not self.tree_status_url:
801 error_message = ('You must configure your tree status URL by running '
802 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000803 self.tree_status_url = self._GetConfig(
804 'rietveld.tree-status-url', error_ok=error_ok,
805 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806 return self.tree_status_url
807
808 def GetViewVCUrl(self):
809 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000810 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 return self.viewvc_url
812
rmistry@google.com90752582014-01-14 21:04:50 +0000813 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000814 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000815
rmistry@google.com5626a922015-02-26 14:03:30 +0000816 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000817 run_post_upload_hook = self._GetConfig(
818 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000819 return run_post_upload_hook == "True"
820
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000821 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000822 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000823
ukai@chromium.orge8077812012-02-03 03:41:46 +0000824 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000825 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000826 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700827 self.is_gerrit = (
828 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000829 return self.is_gerrit
830
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000831 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000832 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700834 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
835 if self.squash_gerrit_uploads is None:
836 # Default is squash now (http://crbug.com/611892#c23).
837 self.squash_gerrit_uploads = not (
838 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
839 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000840 return self.squash_gerrit_uploads
841
tandriia60502f2016-06-20 02:01:53 -0700842 def GetSquashGerritUploadsOverride(self):
843 """Return True or False if codereview.settings should be overridden.
844
845 Returns None if no override has been defined.
846 """
847 # See also http://crbug.com/611892#c23
848 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
849 error_ok=True).strip()
850 if result == 'true':
851 return True
852 if result == 'false':
853 return False
854 return None
855
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 def GetGerritSkipEnsureAuthenticated(self):
857 """Return True if EnsureAuthenticated should not be done for Gerrit
858 uploads."""
859 if self.gerrit_skip_ensure_authenticated is None:
860 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000861 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000862 error_ok=True).strip() == 'true')
863 return self.gerrit_skip_ensure_authenticated
864
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000865 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000866 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000868 # Git requires single quotes for paths with spaces. We need to replace
869 # them with double quotes for Windows to treat such paths as a single
870 # path.
871 self.git_editor = self._GetConfig(
872 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 return self.git_editor or None
874
thestig@chromium.org44202a22014-03-11 19:22:18 +0000875 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000876 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877 DEFAULT_LINT_REGEX)
878
879 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 DEFAULT_LINT_IGNORE_REGEX)
882
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 def _GetConfig(self, param, **kwargs):
884 self.LazyUpdateIfNeeded()
885 return RunGit(['config', param], **kwargs).strip()
886
887
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100888@contextlib.contextmanager
889def _get_gerrit_project_config_file(remote_url):
890 """Context manager to fetch and store Gerrit's project.config from
891 refs/meta/config branch and store it in temp file.
892
893 Provides a temporary filename or None if there was error.
894 """
895 error, _ = RunGitWithCode([
896 'fetch', remote_url,
897 '+refs/meta/config:refs/git_cl/meta/config'])
898 if error:
899 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700900 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100901 (remote_url, error))
902 yield None
903 return
904
905 error, project_config_data = RunGitWithCode(
906 ['show', 'refs/git_cl/meta/config:project.config'])
907 if error:
908 print('WARNING: project.config file not found')
909 yield None
910 return
911
912 with gclient_utils.temporary_directory() as tempdir:
913 project_config_file = os.path.join(tempdir, 'project.config')
914 gclient_utils.FileWrite(project_config_file, project_config_data)
915 yield project_config_file
916
917
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000918def ShortBranchName(branch):
919 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000920 return branch.replace('refs/heads/', '', 1)
921
922
923def GetCurrentBranchRef():
924 """Returns branch ref (e.g., refs/heads/master) or None."""
925 return RunGit(['symbolic-ref', 'HEAD'],
926 stderr=subprocess2.VOID, error_ok=True).strip() or None
927
928
929def GetCurrentBranch():
930 """Returns current branch or None.
931
932 For refs/heads/* branches, returns just last part. For others, full ref.
933 """
934 branchref = GetCurrentBranchRef()
935 if branchref:
936 return ShortBranchName(branchref)
937 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000938
939
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000940class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000941 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000942 NONE = 'none'
943 DRY_RUN = 'dry_run'
944 COMMIT = 'commit'
945
946 ALL_STATES = [NONE, DRY_RUN, COMMIT]
947
948
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000949class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000950 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000951 self.issue = issue
952 self.patchset = patchset
953 self.hostname = hostname
954
955 @property
956 def valid(self):
957 return self.issue is not None
958
959
Edward Lemurf38bc172019-09-03 21:02:13 +0000960def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000961 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
962 fail_result = _ParsedIssueNumberArgument()
963
964 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000965 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000966 if not arg.startswith('http'):
967 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700968
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000969 url = gclient_utils.UpgradeToHttps(arg)
970 try:
971 parsed_url = urlparse.urlparse(url)
972 except ValueError:
973 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200974
Edward Lemur125d60a2019-09-13 18:25:41 +0000975 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000976
977
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000978def _create_description_from_log(args):
979 """Pulls out the commit log to use as a base for the CL description."""
980 log_args = []
981 if len(args) == 1 and not args[0].endswith('.'):
982 log_args = [args[0] + '..']
983 elif len(args) == 1 and args[0].endswith('...'):
984 log_args = [args[0][:-1]]
985 elif len(args) == 2:
986 log_args = [args[0] + '..' + args[1]]
987 else:
988 log_args = args[:] # Hope for the best!
989 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
990
991
Aaron Gablea45ee112016-11-22 15:14:38 -0800992class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700993 def __init__(self, issue, url):
994 self.issue = issue
995 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700997
998 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800999 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001000 self.issue, self.url)
1001
1002
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001003_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001004 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005 # TODO(tandrii): these two aren't known in Gerrit.
1006 'approval', 'disapproval'])
1007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001010 """Changelist works with one changelist in local branch.
1011
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001012 Notes:
1013 * Not safe for concurrent multi-{thread,process} use.
1014 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001015 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001016 """
1017
Edward Lemur125d60a2019-09-13 18:25:41 +00001018 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """Create a new ChangeList instance.
1020
Edward Lemurf38bc172019-09-03 21:02:13 +00001021 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001024 global settings
1025 if not settings:
1026 # Happens when git_cl.py is used as a utility library.
1027 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 self.branchref = branchref
1030 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001031 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032 self.branch = ShortBranchName(self.branchref)
1033 else:
1034 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001036 self.lookedup_issue = False
1037 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 self.has_description = False
1039 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001040 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001042 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001043 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001044 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001045 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046
Edward Lemur125d60a2019-09-13 18:25:41 +00001047 self._change_id = None
1048 # Lazily cached values.
1049 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1050 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1051 # Map from change number (issue) to its detail cache.
1052 self._detail_cache = {}
1053
1054 if codereview_host is not None:
1055 assert not codereview_host.startswith('https://'), codereview_host
1056 self._gerrit_host = codereview_host
1057 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001058
1059 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001060 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001062 The return value is a string suitable for passing to git cl with the --cc
1063 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064 """
1065 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001066 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001067 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001068 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1069 return self.cc
1070
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001071 def GetCCListWithoutDefault(self):
1072 """Return the users cc'd on this CL excluding default ones."""
1073 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001074 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001075 return self.cc
1076
Daniel Cheng7227d212017-11-17 08:12:37 -08001077 def ExtendCC(self, more_cc):
1078 """Extends the list of users to cc on this CL based on the changed files."""
1079 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080
1081 def GetBranch(self):
1082 """Returns the short branch name, e.g. 'master'."""
1083 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001084 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001085 if not branchref:
1086 return None
1087 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088 self.branch = ShortBranchName(self.branchref)
1089 return self.branch
1090
1091 def GetBranchRef(self):
1092 """Returns the full branch name, e.g. 'refs/heads/master'."""
1093 self.GetBranch() # Poke the lazy loader.
1094 return self.branchref
1095
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001096 def ClearBranch(self):
1097 """Clears cached branch data of this object."""
1098 self.branch = self.branchref = None
1099
tandrii5d48c322016-08-18 16:19:37 -07001100 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1101 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1102 kwargs['branch'] = self.GetBranch()
1103 return _git_get_branch_config_value(key, default, **kwargs)
1104
1105 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1106 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1107 assert self.GetBranch(), (
1108 'this CL must have an associated branch to %sset %s%s' %
1109 ('un' if value is None else '',
1110 key,
1111 '' if value is None else ' to %r' % value))
1112 kwargs['branch'] = self.GetBranch()
1113 return _git_set_branch_config_value(key, value, **kwargs)
1114
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001115 @staticmethod
1116 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001117 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001118 e.g. 'origin', 'refs/heads/master'
1119 """
1120 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001121 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1122
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001124 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001125 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001126 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1127 error_ok=True).strip()
1128 if upstream_branch:
1129 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001131 # Else, try to guess the origin remote.
1132 remote_branches = RunGit(['branch', '-r']).split()
1133 if 'origin/master' in remote_branches:
1134 # Fall back on origin/master if it exits.
1135 remote = 'origin'
1136 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001138 DieWithError(
1139 'Unable to determine default branch to diff against.\n'
1140 'Either pass complete "git diff"-style arguments, like\n'
1141 ' git cl upload origin/master\n'
1142 'or verify this branch is set up to track another \n'
1143 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144
1145 return remote, upstream_branch
1146
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001147 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001148 upstream_branch = self.GetUpstreamBranch()
1149 if not BranchExists(upstream_branch):
1150 DieWithError('The upstream for the current branch (%s) does not exist '
1151 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001152 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001153 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001154
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155 def GetUpstreamBranch(self):
1156 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001157 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001158 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001159 upstream_branch = upstream_branch.replace('refs/heads/',
1160 'refs/remotes/%s/' % remote)
1161 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1162 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001163 self.upstream_branch = upstream_branch
1164 return self.upstream_branch
1165
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001167 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 remote, branch = None, self.GetBranch()
1169 seen_branches = set()
1170 while branch not in seen_branches:
1171 seen_branches.add(branch)
1172 remote, branch = self.FetchUpstreamTuple(branch)
1173 branch = ShortBranchName(branch)
1174 if remote != '.' or branch.startswith('refs/remotes'):
1175 break
1176 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001177 remotes = RunGit(['remote'], error_ok=True).split()
1178 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001180 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001181 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001182 logging.warn('Could not determine which remote this change is '
1183 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001184 else:
1185 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001186 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 branch = 'HEAD'
1188 if branch.startswith('refs/remotes'):
1189 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001190 elif branch.startswith('refs/branch-heads/'):
1191 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001192 else:
1193 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001194 return self._remote
1195
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 def GitSanityChecks(self, upstream_git_obj):
1197 """Checks git repo status and ensures diff is from local commits."""
1198
sbc@chromium.org79706062015-01-14 21:18:12 +00001199 if upstream_git_obj is None:
1200 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001201 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001202 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001203 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001204 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001205 return False
1206
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001207 # Verify the commit we're diffing against is in our current branch.
1208 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1209 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1210 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001211 print('ERROR: %s is not in the current branch. You may need to rebase '
1212 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001213 return False
1214
1215 # List the commits inside the diff, and verify they are all local.
1216 commits_in_diff = RunGit(
1217 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1218 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1219 remote_branch = remote_branch.strip()
1220 if code != 0:
1221 _, remote_branch = self.GetRemoteBranch()
1222
1223 commits_in_remote = RunGit(
1224 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1225
1226 common_commits = set(commits_in_diff) & set(commits_in_remote)
1227 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001228 print('ERROR: Your diff contains %d commits already in %s.\n'
1229 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1230 'the diff. If you are using a custom git flow, you can override'
1231 ' the reference used for this check with "git config '
1232 'gitcl.remotebranch <git-ref>".' % (
1233 len(common_commits), remote_branch, upstream_git_obj),
1234 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001235 return False
1236 return True
1237
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001238 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001239 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001240
1241 Returns None if it is not set.
1242 """
tandrii5d48c322016-08-18 16:19:37 -07001243 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001244
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 def GetRemoteUrl(self):
1246 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1247
1248 Returns None if there is no remote.
1249 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001250 is_cached, value = self._cached_remote_url
1251 if is_cached:
1252 return value
1253
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001254 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001255 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1256
Edward Lemur298f2cf2019-02-22 21:40:39 +00001257 # Check if the remote url can be parsed as an URL.
1258 host = urlparse.urlparse(url).netloc
1259 if host:
1260 self._cached_remote_url = (True, url)
1261 return url
1262
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001263 # If it cannot be parsed as an url, assume it is a local directory,
1264 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001265 logging.warning('"%s" doesn\'t appear to point to a git host. '
1266 'Interpreting it as a local directory.', url)
1267 if not os.path.isdir(url):
1268 logging.error(
1269 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
1270 remote, url, self.GetBranch())
1271 return None
1272
1273 cache_path = url
1274 url = RunGit(['config', 'remote.%s.url' % remote],
1275 error_ok=True,
1276 cwd=url).strip()
1277
1278 host = urlparse.urlparse(url).netloc
1279 if not host:
1280 logging.error(
1281 'Remote "%(remote)s" for branch "%(branch)s" points to '
1282 '"%(cache_path)s", but it is misconfigured.\n'
1283 '"%(cache_path)s" must be a git repo and must have a remote named '
1284 '"%(remote)s" pointing to the git host.', {
1285 'remote': remote,
1286 'cache_path': cache_path,
1287 'branch': self.GetBranch()})
1288 return None
1289
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001290 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001291 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001293 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001294 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001295 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001296 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001297 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001298 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 return self.issue
1300
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 def GetIssueURL(self):
1302 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001303 issue = self.GetIssue()
1304 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001305 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001306 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001308 def GetDescription(self, pretty=False, force=False):
1309 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001311 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001312 self.has_description = True
1313 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001314 # Set width to 72 columns + 2 space indent.
1315 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001317 lines = self.description.splitlines()
1318 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001319 return self.description
1320
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001321 def GetDescriptionFooters(self):
1322 """Returns (non_footer_lines, footers) for the commit message.
1323
1324 Returns:
1325 non_footer_lines (list(str)) - Simple list of description lines without
1326 any footer. The lines do not contain newlines, nor does the list contain
1327 the empty line between the message and the footers.
1328 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1329 [("Change-Id", "Ideadbeef...."), ...]
1330 """
1331 raw_description = self.GetDescription()
1332 msg_lines, _, footers = git_footers.split_footers(raw_description)
1333 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001334 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001335 return msg_lines, footers
1336
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001337 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001338 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001339 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001340 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001341 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001342 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001343 return self.patchset
1344
1345 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001346 """Set this branch's patchset. If patchset=0, clears the patchset."""
1347 assert self.GetBranch()
1348 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001349 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001350 else:
1351 self.patchset = int(patchset)
1352 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001353 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001354
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001355 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001356 """Set this branch's issue. If issue isn't given, clears the issue."""
1357 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001358 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001359 issue = int(issue)
1360 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001361 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001362 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001363 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001364 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001365 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001366 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001367 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001368 else:
tandrii5d48c322016-08-18 16:19:37 -07001369 # Reset all of these just to be clean.
1370 reset_suffixes = [
1371 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001372 self.IssueConfigKey(),
1373 self.PatchsetConfigKey(),
1374 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001375 ] + self._PostUnsetIssueProperties()
1376 for prop in reset_suffixes:
1377 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001378 msg = RunGit(['log', '-1', '--format=%B']).strip()
1379 if msg and git_footers.get_footer_change_id(msg):
1380 print('WARNING: The change patched into this branch has a Change-Id. '
1381 'Removing it.')
1382 RunGit(['commit', '--amend', '-m',
1383 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001384 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001385 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001386 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001387
dnjba1b0f32016-09-02 12:37:42 -07001388 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001389 if not self.GitSanityChecks(upstream_branch):
1390 DieWithError('\nGit sanity check failure')
1391
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001392 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001393 if not root:
1394 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001395 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001396
1397 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001398 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001399 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001400 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001401 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001402 except subprocess2.CalledProcessError:
1403 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001404 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001405 'This branch probably doesn\'t exist anymore. To reset the\n'
1406 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001407 ' git branch --set-upstream-to origin/master %s\n'
1408 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001409 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001410
maruel@chromium.org52424302012-08-29 15:14:30 +00001411 issue = self.GetIssue()
1412 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001413 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001414 description = self.GetDescription()
1415 else:
1416 # If the change was never uploaded, use the log messages of all commits
1417 # up to the branch point, as git cl upload will prefill the description
1418 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001419 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1420 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001421
1422 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001423 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001424 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001425 name,
1426 description,
1427 absroot,
1428 files,
1429 issue,
1430 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001431 author,
1432 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001433
dsansomee2d6fd92016-09-08 00:10:47 -07001434 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001435 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001436 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001437 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001438
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001439 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1440 """Sets the description for this CL remotely.
1441
1442 You can get description_lines and footers with GetDescriptionFooters.
1443
1444 Args:
1445 description_lines (list(str)) - List of CL description lines without
1446 newline characters.
1447 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1448 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1449 `List-Of-Tokens`). It will be case-normalized so that each token is
1450 title-cased.
1451 """
1452 new_description = '\n'.join(description_lines)
1453 if footers:
1454 new_description += '\n'
1455 for k, v in footers:
1456 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1457 if not git_footers.FOOTER_PATTERN.match(foot):
1458 raise ValueError('Invalid footer %r' % foot)
1459 new_description += foot + '\n'
1460 self.UpdateDescription(new_description, force)
1461
Edward Lesmes8e282792018-04-03 18:50:29 -04001462 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001463 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1464 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001465 start = time_time()
1466 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1468 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001469 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001470 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001471 metrics.collector.add_repeated('sub_commands', {
1472 'command': 'presubmit',
1473 'execution_time': time_time() - start,
1474 'exit_code': 0 if result.should_continue() else 1,
1475 })
1476 return result
vapierfd77ac72016-06-16 08:33:57 -07001477 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001478 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001479
Edward Lemurf38bc172019-09-03 21:02:13 +00001480 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001481 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001482 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1483 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001484 else:
1485 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001486 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001487 urlparse.urlparse(issue_arg))
1488 if not parsed_issue_arg or not parsed_issue_arg.valid:
1489 DieWithError('Failed to parse issue argument "%s". '
1490 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001491 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001492 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001493
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001494 def CMDUpload(self, options, git_diff_args, orig_args):
1495 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001496 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001498 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499 else:
1500 if self.GetBranch() is None:
1501 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1502
1503 # Default to diffing against common ancestor of upstream branch
1504 base_branch = self.GetCommonAncestorWithUpstream()
1505 git_diff_args = [base_branch, 'HEAD']
1506
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001507 # Fast best-effort checks to abort before running potentially expensive
1508 # hooks if uploading is likely to fail anyway. Passing these checks does
1509 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001510 self.EnsureAuthenticated(force=options.force)
1511 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001512
1513 # Apply watchlists on upload.
1514 change = self.GetChange(base_branch, None)
1515 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1516 files = [f.LocalPath() for f in change.AffectedFiles()]
1517 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001518 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001519
1520 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001521 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522 # Set the reviewer list now so that presubmit checks can access it.
1523 change_description = ChangeDescription(change.FullDescriptionText())
1524 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001525 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001526 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001527 change)
1528 change.SetDescriptionText(change_description.description)
1529 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001530 may_prompt=not options.force,
1531 verbose=options.verbose,
1532 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533 if not hook_results.should_continue():
1534 return 1
1535 if not options.reviewers and hook_results.reviewers:
1536 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001537 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001538
Aaron Gable13101a62018-02-09 13:20:41 -08001539 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001540 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001542 _git_set_branch_config_value('last-upload-hash',
1543 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 # Run post upload hooks, if specified.
1545 if settings.GetRunPostUploadHook():
1546 presubmit_support.DoPostUploadExecuter(
1547 change,
1548 self,
1549 settings.GetRoot(),
1550 options.verbose,
1551 sys.stdout)
1552
1553 # Upload all dependencies if specified.
1554 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001555 print()
1556 print('--dependencies has been specified.')
1557 print('All dependent local branches will be re-uploaded.')
1558 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001559 # Remove the dependencies flag from args so that we do not end up in a
1560 # loop.
1561 orig_args.remove('--dependencies')
1562 ret = upload_branch_deps(self, orig_args)
1563 return ret
1564
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001565 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001566 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001567
1568 Issue must have been already uploaded and known.
1569 """
1570 assert new_state in _CQState.ALL_STATES
1571 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001572 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001573 vote_map = {
1574 _CQState.NONE: 0,
1575 _CQState.DRY_RUN: 1,
1576 _CQState.COMMIT: 2,
1577 }
1578 labels = {'Commit-Queue': vote_map[new_state]}
1579 notify = False if new_state == _CQState.DRY_RUN else None
1580 gerrit_util.SetReview(
1581 self._GetGerritHost(), self._GerritChangeIdentifier(),
1582 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001583 return 0
1584 except KeyboardInterrupt:
1585 raise
1586 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001587 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001588 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001589 ' * Your project has no CQ,\n'
1590 ' * You don\'t have permission to change the CQ state,\n'
1591 ' * There\'s a bug in this code (see stack trace below).\n'
1592 'Consider specifying which bots to trigger manually or asking your '
1593 'project owners for permissions or contacting Chrome Infra at:\n'
1594 'https://www.chromium.org/infra\n\n' %
1595 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001596 # Still raise exception so that stack trace is printed.
1597 raise
1598
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001599 def _GetGerritHost(self):
1600 # Lazy load of configs.
1601 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001602 if self._gerrit_host and '.' not in self._gerrit_host:
1603 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1604 # This happens for internal stuff http://crbug.com/614312.
1605 parsed = urlparse.urlparse(self.GetRemoteUrl())
1606 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001607 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001608 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001609 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1610 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001611 return self._gerrit_host
1612
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001613 def _GetGitHost(self):
1614 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001615 remote_url = self.GetRemoteUrl()
1616 if not remote_url:
1617 return None
1618 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001620 def GetCodereviewServer(self):
1621 if not self._gerrit_server:
1622 # If we're on a branch then get the server potentially associated
1623 # with that branch.
1624 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001625 self._gerrit_server = self._GitGetBranchConfigValue(
1626 self.CodereviewServerConfigKey())
1627 if self._gerrit_server:
1628 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001629 if not self._gerrit_server:
1630 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1631 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001632 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001633 parts[0] = parts[0] + '-review'
1634 self._gerrit_host = '.'.join(parts)
1635 self._gerrit_server = 'https://%s' % self._gerrit_host
1636 return self._gerrit_server
1637
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001638 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001639 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001640 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001641 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001642 logging.warn('can\'t detect Gerrit project.')
1643 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001644 project = urlparse.urlparse(remote_url).path.strip('/')
1645 if project.endswith('.git'):
1646 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001647 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1648 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1649 # gitiles/git-over-https protocol. E.g.,
1650 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1651 # as
1652 # https://chromium.googlesource.com/v8/v8
1653 if project.startswith('a/'):
1654 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001655 return project
1656
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001657 def _GerritChangeIdentifier(self):
1658 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1659
1660 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001661 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001662 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001663 project = self._GetGerritProject()
1664 if project:
1665 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1666 # Fall back on still unique, but less efficient change number.
1667 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001668
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001669 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001670 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001671 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001672
tandrii5d48c322016-08-18 16:19:37 -07001673 @classmethod
1674 def PatchsetConfigKey(cls):
1675 return 'gerritpatchset'
1676
1677 @classmethod
1678 def CodereviewServerConfigKey(cls):
1679 return 'gerritserver'
1680
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001681 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001682 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001683 if settings.GetGerritSkipEnsureAuthenticated():
1684 # For projects with unusual authentication schemes.
1685 # See http://crbug.com/603378.
1686 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001687
1688 # Check presence of cookies only if using cookies-based auth method.
1689 cookie_auth = gerrit_util.Authenticator.get()
1690 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001691 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001692
Daniel Chengcf6269b2019-05-18 01:02:12 +00001693 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1694 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001695 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001696 return
1697
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001698 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699 self.GetCodereviewServer()
1700 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001701 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702
1703 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1704 git_auth = cookie_auth.get_auth_header(git_host)
1705 if gerrit_auth and git_auth:
1706 if gerrit_auth == git_auth:
1707 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001708 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001709 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001710 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001711 ' %s\n'
1712 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001713 ' Consider running the following command:\n'
1714 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001715 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001716 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001717 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001718 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001719 cookie_auth.get_new_password_message(git_host)))
1720 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001721 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001722 return
1723 else:
1724 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001725 ([] if gerrit_auth else [self._gerrit_host]) +
1726 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001727 DieWithError('Credentials for the following hosts are required:\n'
1728 ' %s\n'
1729 'These are read from %s (or legacy %s)\n'
1730 '%s' % (
1731 '\n '.join(missing),
1732 cookie_auth.get_gitcookies_path(),
1733 cookie_auth.get_netrc_path(),
1734 cookie_auth.get_new_password_message(git_host)))
1735
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001736 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001737 if not self.GetIssue():
1738 return
1739
1740 # Warm change details cache now to avoid RPCs later, reducing latency for
1741 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001742 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001743 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001744
1745 status = self._GetChangeDetail()['status']
1746 if status in ('MERGED', 'ABANDONED'):
1747 DieWithError('Change %s has been %s, new uploads are not allowed' %
1748 (self.GetIssueURL(),
1749 'submitted' if status == 'MERGED' else 'abandoned'))
1750
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001751 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1752 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1753 # Apparently this check is not very important? Otherwise get_auth_email
1754 # could have been added to other implementations of Authenticator.
1755 cookies_auth = gerrit_util.Authenticator.get()
1756 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001758
1759 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001760 if self.GetIssueOwner() == cookies_user:
1761 return
1762 logging.debug('change %s owner is %s, cookies user is %s',
1763 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001764 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001765 # so ask what Gerrit thinks of this user.
1766 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1767 if details['email'] == self.GetIssueOwner():
1768 return
1769 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001770 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001771 'as %s.\n'
1772 'Uploading may fail due to lack of permissions.' %
1773 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1774 confirm_or_exit(action='upload')
1775
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001776 def _PostUnsetIssueProperties(self):
1777 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001778 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001779
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001780 def GetGerritObjForPresubmit(self):
1781 return presubmit_support.GerritAccessor(self._GetGerritHost())
1782
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001783 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001784 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001785 or CQ status, assuming adherence to a common workflow.
1786
1787 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001788 * 'error' - error from review tool (including deleted issues)
1789 * 'unsent' - no reviewers added
1790 * 'waiting' - waiting for review
1791 * 'reply' - waiting for uploader to reply to review
1792 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001793 * 'dry-run' - dry-running in the CQ
1794 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001795 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001796 """
1797 if not self.GetIssue():
1798 return None
1799
1800 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001801 data = self._GetChangeDetail([
1802 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001803 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804 return 'error'
1805
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001806 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 return 'closed'
1808
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001809 cq_label = data['labels'].get('Commit-Queue', {})
1810 max_cq_vote = 0
1811 for vote in cq_label.get('all', []):
1812 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1813 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001814 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001815 if max_cq_vote == 1:
1816 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001817
Aaron Gable9ab38c62017-04-06 14:36:33 -07001818 if data['labels'].get('Code-Review', {}).get('approved'):
1819 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820
1821 if not data.get('reviewers', {}).get('REVIEWER', []):
1822 return 'unsent'
1823
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001824 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001825 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1826 last_message_author = messages.pop().get('author', {})
1827 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001828 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1829 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001830 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001831 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832 if last_message_author.get('_account_id') == owner:
1833 # Most recent message was by owner.
1834 return 'waiting'
1835 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001836 # Some reply from non-owner.
1837 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001838
1839 # Somehow there are no messages even though there are reviewers.
1840 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841
1842 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001843 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001844 patchset = data['revisions'][data['current_revision']]['_number']
1845 self.SetPatchset(patchset)
1846 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001847
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001848 def FetchDescription(self, force=False):
1849 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1850 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001851 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001852 return data['revisions'][current_rev]['commit']['message'].encode(
1853 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001854
dsansomee2d6fd92016-09-08 00:10:47 -07001855 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001856 if gerrit_util.HasPendingChangeEdit(
1857 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001858 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001859 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001860 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001861 'unpublished edit. Either publish the edit in the Gerrit web UI '
1862 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001863
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001864 gerrit_util.DeletePendingChangeEdit(
1865 self._GetGerritHost(), self._GerritChangeIdentifier())
1866 gerrit_util.SetCommitMessage(
1867 self._GetGerritHost(), self._GerritChangeIdentifier(),
1868 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001869
Aaron Gable636b13f2017-07-14 10:42:48 -07001870 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001871 gerrit_util.SetReview(
1872 self._GetGerritHost(), self._GerritChangeIdentifier(),
1873 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001874
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001875 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001876 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001877 # CURRENT_REVISION is included to get the latest patchset so that
1878 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001879 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001880 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1881 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001882 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001883 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001884 robot_file_comments = gerrit_util.GetChangeRobotComments(
1885 self._GetGerritHost(), self._GerritChangeIdentifier())
1886
1887 # Add the robot comments onto the list of comments, but only
1888 # keep those that are from the latest pachset.
1889 latest_patch_set = self.GetMostRecentPatchset()
1890 for path, robot_comments in robot_file_comments.iteritems():
1891 line_comments = file_comments.setdefault(path, [])
1892 line_comments.extend(
1893 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001894
1895 # Build dictionary of file comments for easy access and sorting later.
1896 # {author+date: {path: {patchset: {line: url+message}}}}
1897 comments = collections.defaultdict(
1898 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1899 for path, line_comments in file_comments.iteritems():
1900 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001901 tag = comment.get('tag', '')
1902 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001903 continue
1904 key = (comment['author']['email'], comment['updated'])
1905 if comment.get('side', 'REVISION') == 'PARENT':
1906 patchset = 'Base'
1907 else:
1908 patchset = 'PS%d' % comment['patch_set']
1909 line = comment.get('line', 0)
1910 url = ('https://%s/c/%s/%s/%s#%s%s' %
1911 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1912 'b' if comment.get('side') == 'PARENT' else '',
1913 str(line) if line else ''))
1914 comments[key][path][patchset][line] = (url, comment['message'])
1915
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001916 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001917 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 summary = self._BuildCommentSummary(msg, comments, readable)
1919 if summary:
1920 summaries.append(summary)
1921 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001922
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001923 @staticmethod
1924 def _BuildCommentSummary(msg, comments, readable):
1925 key = (msg['author']['email'], msg['date'])
1926 # Don't bother showing autogenerated messages that don't have associated
1927 # file or line comments. this will filter out most autogenerated
1928 # messages, but will keep robot comments like those from Tricium.
1929 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1930 if is_autogenerated and not comments.get(key):
1931 return None
1932 message = msg['message']
1933 # Gerrit spits out nanoseconds.
1934 assert len(msg['date'].split('.')[-1]) == 9
1935 date = datetime.datetime.strptime(msg['date'][:-3],
1936 '%Y-%m-%d %H:%M:%S.%f')
1937 if key in comments:
1938 message += '\n'
1939 for path, patchsets in sorted(comments.get(key, {}).items()):
1940 if readable:
1941 message += '\n%s' % path
1942 for patchset, lines in sorted(patchsets.items()):
1943 for line, (url, content) in sorted(lines.items()):
1944 if line:
1945 line_str = 'Line %d' % line
1946 path_str = '%s:%d:' % (path, line)
1947 else:
1948 line_str = 'File comment'
1949 path_str = '%s:0:' % path
1950 if readable:
1951 message += '\n %s, %s: %s' % (patchset, line_str, url)
1952 message += '\n %s\n' % content
1953 else:
1954 message += '\n%s ' % path_str
1955 message += '\n%s\n' % content
1956
1957 return _CommentSummary(
1958 date=date,
1959 message=message,
1960 sender=msg['author']['email'],
1961 autogenerated=is_autogenerated,
1962 # These could be inferred from the text messages and correlated with
1963 # Code-Review label maximum, however this is not reliable.
1964 # Leaving as is until the need arises.
1965 approval=False,
1966 disapproval=False,
1967 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001968
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001969 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001970 gerrit_util.AbandonChange(
1971 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001972
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001973 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001974 gerrit_util.SubmitChange(
1975 self._GetGerritHost(), self._GerritChangeIdentifier(),
1976 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001977
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001978 def _GetChangeDetail(self, options=None, no_cache=False):
1979 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001980
1981 If fresh data is needed, set no_cache=True which will clear cache and
1982 thus new data will be fetched from Gerrit.
1983 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001984 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001985 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001986
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001987 # Optimization to avoid multiple RPCs:
1988 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1989 'CURRENT_COMMIT' not in options):
1990 options.append('CURRENT_COMMIT')
1991
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001992 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001993 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001994 options = [o.upper() for o in options]
1995
1996 # Check in cache first unless no_cache is True.
1997 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001998 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001999 else:
2000 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002001 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002002 # Assumption: data fetched before with extra options is suitable
2003 # for return for a smaller set of options.
2004 # For example, if we cached data for
2005 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2006 # and request is for options=[CURRENT_REVISION],
2007 # THEN we can return prior cached data.
2008 if options_set.issubset(cached_options_set):
2009 return data
2010
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002011 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002012 data = gerrit_util.GetChangeDetail(
2013 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002014 except gerrit_util.GerritError as e:
2015 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002016 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002017 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002018
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002019 self._detail_cache.setdefault(cache_key, []).append(
2020 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002021 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002022
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002023 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002024 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002025 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002026 data = gerrit_util.GetChangeCommit(
2027 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002028 except gerrit_util.GerritError as e:
2029 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002030 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002031 raise
agable32978d92016-11-01 12:55:02 -07002032 return data
2033
Karen Qian40c19422019-03-13 21:28:29 +00002034 def _IsCqConfigured(self):
2035 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002036 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002037 return False
2038 # TODO(crbug/753213): Remove temporary hack
2039 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002040 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002041 detail['branch'].startswith('refs/branch-heads/')):
2042 return False
2043 return True
2044
Olivier Robin75ee7252018-04-13 10:02:56 +02002045 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002046 if git_common.is_dirty_git_tree('land'):
2047 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002048
tandriid60367b2016-06-22 05:25:12 -07002049 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002050 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002051 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002052 'which can test and land changes for you. '
2053 'Are you sure you wish to bypass it?\n',
2054 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002055 differs = True
tandriic4344b52016-08-29 06:04:54 -07002056 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 # Note: git diff outputs nothing if there is no diff.
2058 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002059 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002060 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002061 if detail['current_revision'] == last_upload:
2062 differs = False
2063 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002064 print('WARNING: Local branch contents differ from latest uploaded '
2065 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 if differs:
2067 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002068 confirm_or_exit(
2069 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2070 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002071 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002072 elif not bypass_hooks:
2073 hook_results = self.RunHook(
2074 committing=True,
2075 may_prompt=not force,
2076 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002077 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2078 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002079 if not hook_results.should_continue():
2080 return 1
2081
2082 self.SubmitIssue(wait_for_merge=True)
2083 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002084 links = self._GetChangeCommit().get('web_links', [])
2085 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002086 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002087 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002088 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002089 return 0
2090
Edward Lemurf38bc172019-09-03 21:02:13 +00002091 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002092 assert parsed_issue_arg.valid
2093
Edward Lemur125d60a2019-09-13 18:25:41 +00002094 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002095
2096 if parsed_issue_arg.hostname:
2097 self._gerrit_host = parsed_issue_arg.hostname
2098 self._gerrit_server = 'https://%s' % self._gerrit_host
2099
tandriic2405f52016-10-10 08:13:15 -07002100 try:
2101 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002102 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002103 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002104
2105 if not parsed_issue_arg.patchset:
2106 # Use current revision by default.
2107 revision_info = detail['revisions'][detail['current_revision']]
2108 patchset = int(revision_info['_number'])
2109 else:
2110 patchset = parsed_issue_arg.patchset
2111 for revision_info in detail['revisions'].itervalues():
2112 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2113 break
2114 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002115 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002116 (parsed_issue_arg.patchset, self.GetIssue()))
2117
Edward Lemur125d60a2019-09-13 18:25:41 +00002118 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002119 if remote_url.endswith('.git'):
2120 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002121 remote_url = remote_url.rstrip('/')
2122
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002124 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002125
2126 if remote_url != fetch_info['url']:
2127 DieWithError('Trying to patch a change from %s but this repo appears '
2128 'to be %s.' % (fetch_info['url'], remote_url))
2129
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002131
Aaron Gable62619a32017-06-16 08:22:09 -07002132 if force:
2133 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2134 print('Checked out commit for change %i patchset %i locally' %
2135 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002136 elif nocommit:
2137 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2138 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002139 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002140 RunGit(['cherry-pick', 'FETCH_HEAD'])
2141 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002142 (parsed_issue_arg.issue, patchset))
2143 print('Note: this created a local commit which does not have '
2144 'the same hash as the one uploaded for review. This will make '
2145 'uploading changes based on top of this branch difficult.\n'
2146 'If you want to do that, use "git cl patch --force" instead.')
2147
Stefan Zagerd08043c2017-10-12 12:07:02 -07002148 if self.GetBranch():
2149 self.SetIssue(parsed_issue_arg.issue)
2150 self.SetPatchset(patchset)
2151 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2152 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2153 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2154 else:
2155 print('WARNING: You are in detached HEAD state.\n'
2156 'The patch has been applied to your checkout, but you will not be '
2157 'able to upload a new patch set to the gerrit issue.\n'
2158 'Try using the \'-b\' option if you would like to work on a '
2159 'branch and/or upload a new patch set.')
2160
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 return 0
2162
2163 @staticmethod
2164 def ParseIssueURL(parsed_url):
2165 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2166 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002167 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2168 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 # Short urls like https://domain/<issue_number> can be used, but don't allow
2170 # specifying the patchset (you'd 404), but we allow that here.
2171 if parsed_url.path == '/':
2172 part = parsed_url.fragment
2173 else:
2174 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002175 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 if match:
2177 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002178 issue=int(match.group(3)),
2179 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002180 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002181 return None
2182
tandrii16e0b4e2016-06-07 10:34:28 -07002183 def _GerritCommitMsgHookCheck(self, offer_removal):
2184 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2185 if not os.path.exists(hook):
2186 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002187 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2188 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002189 data = gclient_utils.FileRead(hook)
2190 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2191 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002192 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002193 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002194 'and may interfere with it in subtle ways.\n'
2195 'We recommend you remove the commit-msg hook.')
2196 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002197 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002198 gclient_utils.rm_file_or_tree(hook)
2199 print('Gerrit commit-msg hook removed.')
2200 else:
2201 print('OK, will keep Gerrit commit-msg hook in place.')
2202
Edward Lemur1b52d872019-05-09 21:12:12 +00002203 def _CleanUpOldTraces(self):
2204 """Keep only the last |MAX_TRACES| traces."""
2205 try:
2206 traces = sorted([
2207 os.path.join(TRACES_DIR, f)
2208 for f in os.listdir(TRACES_DIR)
2209 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2210 and not f.startswith('tmp'))
2211 ])
2212 traces_to_delete = traces[:-MAX_TRACES]
2213 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002214 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002215 except OSError:
2216 print('WARNING: Failed to remove old git traces from\n'
2217 ' %s'
2218 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002219
Edward Lemur5737f022019-05-17 01:24:00 +00002220 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002221 """Zip and write the git push traces stored in traces_dir."""
2222 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 traces_zip = trace_name + '-traces'
2224 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002225 # Create a temporary dir to store git config and gitcookies in. It will be
2226 # compressed and stored next to the traces.
2227 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002228 git_info_zip = trace_name + '-git-info'
2229
Edward Lemur5737f022019-05-17 01:24:00 +00002230 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002231 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002232 git_push_metadata['now'] = git_push_metadata['now'].decode(
2233 sys.stdin.encoding)
2234
Edward Lemur1b52d872019-05-09 21:12:12 +00002235 git_push_metadata['trace_name'] = trace_name
2236 gclient_utils.FileWrite(
2237 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2238
2239 # Keep only the first 6 characters of the git hashes on the packet
2240 # trace. This greatly decreases size after compression.
2241 packet_traces = os.path.join(traces_dir, 'trace-packet')
2242 if os.path.isfile(packet_traces):
2243 contents = gclient_utils.FileRead(packet_traces)
2244 gclient_utils.FileWrite(
2245 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2246 shutil.make_archive(traces_zip, 'zip', traces_dir)
2247
2248 # Collect and compress the git config and gitcookies.
2249 git_config = RunGit(['config', '-l'])
2250 gclient_utils.FileWrite(
2251 os.path.join(git_info_dir, 'git-config'),
2252 git_config)
2253
2254 cookie_auth = gerrit_util.Authenticator.get()
2255 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2256 gitcookies_path = cookie_auth.get_gitcookies_path()
2257 if os.path.isfile(gitcookies_path):
2258 gitcookies = gclient_utils.FileRead(gitcookies_path)
2259 gclient_utils.FileWrite(
2260 os.path.join(git_info_dir, 'gitcookies'),
2261 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2262 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2263
Edward Lemur1b52d872019-05-09 21:12:12 +00002264 gclient_utils.rmtree(git_info_dir)
2265
2266 def _RunGitPushWithTraces(
2267 self, change_desc, refspec, refspec_opts, git_push_metadata):
2268 """Run git push and collect the traces resulting from the execution."""
2269 # Create a temporary directory to store traces in. Traces will be compressed
2270 # and stored in a 'traces' dir inside depot_tools.
2271 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002272 trace_name = os.path.join(
2273 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002274
2275 env = os.environ.copy()
2276 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2277 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002278 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002279 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2280 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2281 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2282
2283 try:
2284 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002285 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002286 before_push = time_time()
2287 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002288 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289 env=env,
2290 print_stdout=True,
2291 # Flush after every line: useful for seeing progress when running as
2292 # recipe.
2293 filter_fn=lambda _: sys.stdout.flush())
2294 except subprocess2.CalledProcessError as e:
2295 push_returncode = e.returncode
2296 DieWithError('Failed to create a change. Please examine output above '
2297 'for the reason of the failure.\n'
2298 'Hint: run command below to diagnose common Git/Gerrit '
2299 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002300 ' git cl creds-check\n'
2301 '\n'
2302 'If git-cl is not working correctly, file a bug under the '
2303 'Infra>SDK component including the files below.\n'
2304 'Review the files before upload, since they might contain '
2305 'sensitive information.\n'
2306 'Set the Restrict-View-Google label so that they are not '
2307 'publicly accessible.\n'
2308 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002309 change_desc)
2310 finally:
2311 execution_time = time_time() - before_push
2312 metrics.collector.add_repeated('sub_commands', {
2313 'command': 'git push',
2314 'execution_time': execution_time,
2315 'exit_code': push_returncode,
2316 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2317 })
2318
Edward Lemur1b52d872019-05-09 21:12:12 +00002319 git_push_metadata['execution_time'] = execution_time
2320 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002321 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002322
Edward Lemur1b52d872019-05-09 21:12:12 +00002323 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002324 gclient_utils.rmtree(traces_dir)
2325
2326 return push_stdout
2327
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002328 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002330 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002331 # Load default for user, repo, squash=true, in this order.
2332 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002333
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002334 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002335 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002336 # This may be None; default fallback value is determined in logic below.
2337 title = options.title
2338
Dominic Battre7d1c4842017-10-27 09:17:28 +02002339 # Extract bug number from branch name.
2340 bug = options.bug
2341 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2342 if not bug and match:
2343 bug = match.group(1)
2344
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002346 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 if self.GetIssue():
2348 # Try to get the message from a previous upload.
2349 message = self.GetDescription()
2350 if not message:
2351 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002352 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002353 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002354 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002355 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002356 # When uploading a subsequent patchset, -m|--message is taken
2357 # as the patchset title if --title was not provided.
2358 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002359 else:
2360 default_title = RunGit(
2361 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002362 if options.force:
2363 title = default_title
2364 else:
2365 title = ask_for_data(
2366 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367 change_id = self._GetChangeDetail()['change_id']
2368 while True:
2369 footer_change_ids = git_footers.get_footer_change_id(message)
2370 if footer_change_ids == [change_id]:
2371 break
2372 if not footer_change_ids:
2373 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002374 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002375 continue
2376 # There is already a valid footer but with different or several ids.
2377 # Doing this automatically is non-trivial as we don't want to lose
2378 # existing other footers, yet we want to append just 1 desired
2379 # Change-Id. Thus, just create a new footer, but let user verify the
2380 # new description.
2381 message = '%s\n\nChange-Id: %s' % (message, change_id)
2382 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002383 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002385 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 'Please, check the proposed correction to the description, '
2387 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2388 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2389 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002390 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 if not options.force:
2392 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002393 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 message = change_desc.description
2395 if not message:
2396 DieWithError("Description is empty. Aborting...")
2397 # Continue the while loop.
2398 # Sanity check of this code - we should end up with proper message
2399 # footer.
2400 assert [change_id] == git_footers.get_footer_change_id(message)
2401 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002402 else: # if not self.GetIssue()
2403 if options.message:
2404 message = options.message
2405 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002406 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002407 if options.title:
2408 message = options.title + '\n\n' + message
2409 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002410
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002412 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002413 # On first upload, patchset title is always this string, while
2414 # --title flag gets converted to first line of message.
2415 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 if not change_desc.description:
2417 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002418 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419 if len(change_ids) > 1:
2420 DieWithError('too many Change-Id footers, at most 1 allowed.')
2421 if not change_ids:
2422 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002423 change_desc.set_description(git_footers.add_footer_change_id(
2424 change_desc.description,
2425 GenerateGerritChangeId(change_desc.description)))
2426 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002427 assert len(change_ids) == 1
2428 change_id = change_ids[0]
2429
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002430 if options.reviewers or options.tbrs or options.add_owners_to:
2431 change_desc.update_reviewers(options.reviewers, options.tbrs,
2432 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002433 if options.preserve_tryjobs:
2434 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002435
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002436 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002437 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2438 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002439 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002440 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2441 desc_tempfile.write(change_desc.description)
2442 desc_tempfile.close()
2443 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2444 '-F', desc_tempfile.name]).strip()
2445 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002446 else:
2447 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002448 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 if not change_desc.description:
2450 DieWithError("Description is empty. Aborting...")
2451
2452 if not git_footers.get_footer_change_id(change_desc.description):
2453 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002454 change_desc.set_description(
2455 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002456 if options.reviewers or options.tbrs or options.add_owners_to:
2457 change_desc.update_reviewers(options.reviewers, options.tbrs,
2458 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002459 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002460 # For no-squash mode, we assume the remote called "origin" is the one we
2461 # want. It is not worthwhile to support different workflows for
2462 # no-squash mode.
2463 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002464 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2465
2466 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002467 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002468 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2469 ref_to_push)]).splitlines()
2470 if len(commits) > 1:
2471 print('WARNING: This will upload %d commits. Run the following command '
2472 'to see which commits will be uploaded: ' % len(commits))
2473 print('git log %s..%s' % (parent, ref_to_push))
2474 print('You can also use `git squash-branch` to squash these into a '
2475 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002476 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002477
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002478 if options.reviewers or options.tbrs or options.add_owners_to:
2479 change_desc.update_reviewers(options.reviewers, options.tbrs,
2480 options.add_owners_to, change)
2481
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002482 reviewers = sorted(change_desc.get_reviewers())
2483 # Add cc's from the CC_LIST and --cc flag (if any).
2484 if not options.private and not options.no_autocc:
2485 cc = self.GetCCList().split(',')
2486 else:
2487 cc = []
2488 if options.cc:
2489 cc.extend(options.cc)
2490 cc = filter(None, [email.strip() for email in cc])
2491 if change_desc.get_cced():
2492 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002493 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2494 valid_accounts = set(reviewers + cc)
2495 # TODO(crbug/877717): relax this for all hosts.
2496 else:
2497 valid_accounts = gerrit_util.ValidAccounts(
2498 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002499 logging.info('accounts %s are recognized, %s invalid',
2500 sorted(valid_accounts),
2501 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002502
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002503 # Extra options that can be specified at push time. Doc:
2504 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002505 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002506
Aaron Gable844cf292017-06-28 11:32:59 -07002507 # By default, new changes are started in WIP mode, and subsequent patchsets
2508 # don't send email. At any time, passing --send-mail will mark the change
2509 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002510 if options.send_mail:
2511 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002512 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002513 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002514 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002515 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002516 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002517
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002518 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002519 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002520
Aaron Gable9b713dd2016-12-14 16:04:21 -08002521 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002522 # Punctuation and whitespace in |title| must be percent-encoded.
2523 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002524
agablec6787972016-09-09 16:13:34 -07002525 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002526 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002527
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002528 for r in sorted(reviewers):
2529 if r in valid_accounts:
2530 refspec_opts.append('r=%s' % r)
2531 reviewers.remove(r)
2532 else:
2533 # TODO(tandrii): this should probably be a hard failure.
2534 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2535 % r)
2536 for c in sorted(cc):
2537 # refspec option will be rejected if cc doesn't correspond to an
2538 # account, even though REST call to add such arbitrary cc may succeed.
2539 if c in valid_accounts:
2540 refspec_opts.append('cc=%s' % c)
2541 cc.remove(c)
2542
rmistry9eadede2016-09-19 11:22:43 -07002543 if options.topic:
2544 # Documentation on Gerrit topics is here:
2545 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002546 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002547
Edward Lemur687ca902018-12-05 02:30:30 +00002548 if options.enable_auto_submit:
2549 refspec_opts.append('l=Auto-Submit+1')
2550 if options.use_commit_queue:
2551 refspec_opts.append('l=Commit-Queue+2')
2552 elif options.cq_dry_run:
2553 refspec_opts.append('l=Commit-Queue+1')
2554
2555 if change_desc.get_reviewers(tbr_only=True):
2556 score = gerrit_util.GetCodeReviewTbrScore(
2557 self._GetGerritHost(),
2558 self._GetGerritProject())
2559 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002560
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002561 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002562 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002563 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002564 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002565 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2566
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002567 refspec_suffix = ''
2568 if refspec_opts:
2569 refspec_suffix = '%' + ','.join(refspec_opts)
2570 assert ' ' not in refspec_suffix, (
2571 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2572 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2573
Edward Lemur1b52d872019-05-09 21:12:12 +00002574 git_push_metadata = {
2575 'gerrit_host': self._GetGerritHost(),
2576 'title': title or '<untitled>',
2577 'change_id': change_id,
2578 'description': change_desc.description,
2579 }
2580 push_stdout = self._RunGitPushWithTraces(
2581 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002582
2583 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002584 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002585 change_numbers = [m.group(1)
2586 for m in map(regex.match, push_stdout.splitlines())
2587 if m]
2588 if len(change_numbers) != 1:
2589 DieWithError(
2590 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002591 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002592 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002593 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002594
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002595 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002596 # GetIssue() is not set in case of non-squash uploads according to tests.
2597 # TODO(agable): non-squash uploads in git cl should be removed.
2598 gerrit_util.AddReviewers(
2599 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002600 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002601 reviewers, cc,
2602 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002603
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002604 return 0
2605
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002606 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2607 change_desc):
2608 """Computes parent of the generated commit to be uploaded to Gerrit.
2609
2610 Returns revision or a ref name.
2611 """
2612 if custom_cl_base:
2613 # Try to avoid creating additional unintended CLs when uploading, unless
2614 # user wants to take this risk.
2615 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2616 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2617 local_ref_of_target_remote])
2618 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002619 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002620 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2621 'If you proceed with upload, more than 1 CL may be created by '
2622 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2623 'If you are certain that specified base `%s` has already been '
2624 'uploaded to Gerrit as another CL, you may proceed.\n' %
2625 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2626 if not force:
2627 confirm_or_exit(
2628 'Do you take responsibility for cleaning up potential mess '
2629 'resulting from proceeding with upload?',
2630 action='upload')
2631 return custom_cl_base
2632
Aaron Gablef97e33d2017-03-30 15:44:27 -07002633 if remote != '.':
2634 return self.GetCommonAncestorWithUpstream()
2635
2636 # If our upstream branch is local, we base our squashed commit on its
2637 # squashed version.
2638 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2639
Aaron Gablef97e33d2017-03-30 15:44:27 -07002640 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002641 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002642
2643 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002644 # TODO(tandrii): consider checking parent change in Gerrit and using its
2645 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2646 # the tree hash of the parent branch. The upside is less likely bogus
2647 # requests to reupload parent change just because it's uploadhash is
2648 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002649 parent = RunGit(['config',
2650 'branch.%s.gerritsquashhash' % upstream_branch_name],
2651 error_ok=True).strip()
2652 # Verify that the upstream branch has been uploaded too, otherwise
2653 # Gerrit will create additional CLs when uploading.
2654 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2655 RunGitSilent(['rev-parse', parent + ':'])):
2656 DieWithError(
2657 '\nUpload upstream branch %s first.\n'
2658 'It is likely that this branch has been rebased since its last '
2659 'upload, so you just need to upload it again.\n'
2660 '(If you uploaded it with --no-squash, then branch dependencies '
2661 'are not supported, and you should reupload with --squash.)'
2662 % upstream_branch_name,
2663 change_desc)
2664 return parent
2665
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002666 def _AddChangeIdToCommitMessage(self, options, args):
2667 """Re-commits using the current message, assumes the commit hook is in
2668 place.
2669 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002670 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002671 git_command = ['commit', '--amend', '-m', log_desc]
2672 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002673 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002674 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002675 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002676 return new_log_desc
2677 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002678 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002679
tandriie113dfd2016-10-11 10:20:12 -07002680 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002681 try:
2682 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002683 except GerritChangeNotExists:
2684 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002685
2686 if data['status'] in ('ABANDONED', 'MERGED'):
2687 return 'CL %s is closed' % self.GetIssue()
2688
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002689 def GetGerritChange(self, patchset=None):
2690 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2691 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2692 issue = self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002693 patchset = int(patchset or self.GetPatchset())
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002694 data = self._GetChangeDetail(['ALL_REVISIONS'])
2695
2696 assert host and issue and patchset, 'CL must be uploaded first'
2697
2698 has_patchset = any(
2699 int(revision_data['_number']) == patchset
2700 for revision_data in data['revisions'].itervalues())
2701 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002702 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002703 (patchset, self.GetIssue()))
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002704
tandrii8c5a3532016-11-04 07:52:02 -07002705 return {
Edward Lemur5b6ae8b2019-09-12 23:27:24 +00002706 'host': host,
2707 'change': issue,
2708 'project': data['project'],
2709 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002710 }
tandriie113dfd2016-10-11 10:20:12 -07002711
tandriide281ae2016-10-12 06:02:30 -07002712 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002713 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002714
Edward Lemur707d70b2018-02-07 00:50:14 +01002715 def GetReviewers(self):
2716 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002717 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002718
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002719
2720_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002721 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002722}
2723
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002724
iannuccie53c9352016-08-17 14:40:40 -07002725def _add_codereview_issue_select_options(parser, extra=""):
2726 _add_codereview_select_options(parser)
2727
2728 text = ('Operate on this issue number instead of the current branch\'s '
2729 'implicit issue.')
2730 if extra:
2731 text += ' '+extra
2732 parser.add_option('-i', '--issue', type=int, help=text)
2733
2734
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002735def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002736 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002737 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002738 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002739 parser.add_option_group(parser.codereview_group)
2740 parser.codereview_group.add_option(
2741 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002742 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002743
2744
2745def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002746 options.forced_codereview = None
2747 if options.gerrit:
2748 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002749
2750
tandriif9aefb72016-07-01 09:06:51 -07002751def _get_bug_line_values(default_project, bugs):
2752 """Given default_project and comma separated list of bugs, yields bug line
2753 values.
2754
2755 Each bug can be either:
2756 * a number, which is combined with default_project
2757 * string, which is left as is.
2758
2759 This function may produce more than one line, because bugdroid expects one
2760 project per line.
2761
2762 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2763 ['v8:123', 'chromium:789']
2764 """
2765 default_bugs = []
2766 others = []
2767 for bug in bugs.split(','):
2768 bug = bug.strip()
2769 if bug:
2770 try:
2771 default_bugs.append(int(bug))
2772 except ValueError:
2773 others.append(bug)
2774
2775 if default_bugs:
2776 default_bugs = ','.join(map(str, default_bugs))
2777 if default_project:
2778 yield '%s:%s' % (default_project, default_bugs)
2779 else:
2780 yield default_bugs
2781 for other in sorted(others):
2782 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2783 yield other
2784
2785
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002786class ChangeDescription(object):
2787 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002788 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002789 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002790 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002791 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002792 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2793 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2794 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2795 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002796
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002797 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002798 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002801 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002802 return '\n'.join(self._description_lines)
2803
2804 def set_description(self, desc):
2805 if isinstance(desc, basestring):
2806 lines = desc.splitlines()
2807 else:
2808 lines = [line.rstrip() for line in desc]
2809 while lines and not lines[0]:
2810 lines.pop(0)
2811 while lines and not lines[-1]:
2812 lines.pop(-1)
2813 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002814
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002815 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2816 """Rewrites the R=/TBR= line(s) as a single line each.
2817
2818 Args:
2819 reviewers (list(str)) - list of additional emails to use for reviewers.
2820 tbrs (list(str)) - list of additional emails to use for TBRs.
2821 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2822 the change that are missing OWNER coverage. If this is not None, you
2823 must also pass a value for `change`.
2824 change (Change) - The Change that should be used for OWNERS lookups.
2825 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002826 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002827 assert isinstance(tbrs, list), tbrs
2828
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002829 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002830 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002831
2832 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002833 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002834
2835 reviewers = set(reviewers)
2836 tbrs = set(tbrs)
2837 LOOKUP = {
2838 'TBR': tbrs,
2839 'R': reviewers,
2840 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002841
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002842 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 regexp = re.compile(self.R_LINE)
2844 matches = [regexp.match(line) for line in self._description_lines]
2845 new_desc = [l for i, l in enumerate(self._description_lines)
2846 if not matches[i]]
2847 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002848
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002850
2851 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 for match in matches:
2853 if not match:
2854 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002855 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2856
2857 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002858 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002859 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002860 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002861 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002862 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002863 LOOKUP[add_owners_to].update(
2864 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002865
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002866 # If any folks ended up in both groups, remove them from tbrs.
2867 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002868
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002869 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2870 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002871
2872 # Put the new lines in the description where the old first R= line was.
2873 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2874 if 0 <= line_loc < len(self._description_lines):
2875 if new_tbr_line:
2876 self._description_lines.insert(line_loc, new_tbr_line)
2877 if new_r_line:
2878 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002879 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002880 if new_r_line:
2881 self.append_footer(new_r_line)
2882 if new_tbr_line:
2883 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002884
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002885 def set_preserve_tryjobs(self):
2886 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2887 footers = git_footers.parse_footers(self.description)
2888 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2889 if v.lower() == 'true':
2890 return
2891 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2892
Aaron Gable3a16ed12017-03-23 10:51:55 -07002893 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002894 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002895 self.set_description([
2896 '# Enter a description of the change.',
2897 '# This will be displayed on the codereview site.',
2898 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002899 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002900 '--------------------',
2901 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002902
agable@chromium.org42c20792013-09-12 17:34:49 +00002903 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002904 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002905 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07002906 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07002907 if git_footer:
2908 self.append_footer('Bug: %s' % ', '.join(values))
2909 else:
2910 for value in values:
2911 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07002912
agable@chromium.org42c20792013-09-12 17:34:49 +00002913 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002914 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002915 if not content:
2916 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002917 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002918
Bruce Dawson2377b012018-01-11 16:46:49 -08002919 # Strip off comments and default inserted "Bug:" line.
2920 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002921 (line.startswith('#') or
2922 line.rstrip() == "Bug:" or
2923 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002924 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002925 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002926 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002927
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002929 """Adds a footer line to the description.
2930
2931 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2932 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2933 that Gerrit footers are always at the end.
2934 """
2935 parsed_footer_line = git_footers.parse_footer(line)
2936 if parsed_footer_line:
2937 # Line is a gerrit footer in the form: Footer-Key: any value.
2938 # Thus, must be appended observing Gerrit footer rules.
2939 self.set_description(
2940 git_footers.add_footer(self.description,
2941 key=parsed_footer_line[0],
2942 value=parsed_footer_line[1]))
2943 return
2944
2945 if not self._description_lines:
2946 self._description_lines.append(line)
2947 return
2948
2949 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2950 if gerrit_footers:
2951 # git_footers.split_footers ensures that there is an empty line before
2952 # actual (gerrit) footers, if any. We have to keep it that way.
2953 assert top_lines and top_lines[-1] == ''
2954 top_lines, separator = top_lines[:-1], top_lines[-1:]
2955 else:
2956 separator = [] # No need for separator if there are no gerrit_footers.
2957
2958 prev_line = top_lines[-1] if top_lines else ''
2959 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2960 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2961 top_lines.append('')
2962 top_lines.append(line)
2963 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002964
tandrii99a72f22016-08-17 14:33:24 -07002965 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002966 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002967 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002968 reviewers = [match.group(2).strip()
2969 for match in matches
2970 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002971 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002972
bradnelsond975b302016-10-23 12:20:23 -07002973 def get_cced(self):
2974 """Retrieves the list of reviewers."""
2975 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2976 cced = [match.group(2).strip() for match in matches if match]
2977 return cleanup_list(cced)
2978
Nodir Turakulov23b82142017-11-16 11:04:25 -08002979 def get_hash_tags(self):
2980 """Extracts and sanitizes a list of Gerrit hashtags."""
2981 subject = (self._description_lines or ('',))[0]
2982 subject = re.sub(
2983 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2984
2985 tags = []
2986 start = 0
2987 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2988 while True:
2989 m = bracket_exp.match(subject, start)
2990 if not m:
2991 break
2992 tags.append(self.sanitize_hash_tag(m.group(1)))
2993 start = m.end()
2994
2995 if not tags:
2996 # Try "Tag: " prefix.
2997 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2998 if m:
2999 tags.append(self.sanitize_hash_tag(m.group(1)))
3000 return tags
3001
3002 @classmethod
3003 def sanitize_hash_tag(cls, tag):
3004 """Returns a sanitized Gerrit hash tag.
3005
3006 A sanitized hashtag can be used as a git push refspec parameter value.
3007 """
3008 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3009
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003010 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3011 """Updates this commit description given the parent.
3012
3013 This is essentially what Gnumbd used to do.
3014 Consult https://goo.gl/WMmpDe for more details.
3015 """
3016 assert parent_msg # No, orphan branch creation isn't supported.
3017 assert parent_hash
3018 assert dest_ref
3019 parent_footer_map = git_footers.parse_footers(parent_msg)
3020 # This will also happily parse svn-position, which GnumbD is no longer
3021 # supporting. While we'd generate correct footers, the verifier plugin
3022 # installed in Gerrit will block such commit (ie git push below will fail).
3023 parent_position = git_footers.get_position(parent_footer_map)
3024
3025 # Cherry-picks may have last line obscuring their prior footers,
3026 # from git_footers perspective. This is also what Gnumbd did.
3027 cp_line = None
3028 if (self._description_lines and
3029 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3030 cp_line = self._description_lines.pop()
3031
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003032 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003033
3034 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3035 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003036 for i, line in enumerate(footer_lines):
3037 k, v = git_footers.parse_footer(line) or (None, None)
3038 if k and k.startswith('Cr-'):
3039 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003040
3041 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003042 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003043 if parent_position[0] == dest_ref:
3044 # Same branch as parent.
3045 number = int(parent_position[1]) + 1
3046 else:
3047 number = 1 # New branch, and extra lineage.
3048 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3049 int(parent_position[1])))
3050
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003051 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3052 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003053
3054 self._description_lines = top_lines
3055 if cp_line:
3056 self._description_lines.append(cp_line)
3057 if self._description_lines[-1] != '':
3058 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003059 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003060
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003061
Aaron Gablea1bab272017-04-11 16:38:18 -07003062def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003063 """Retrieves the reviewers that approved a CL from the issue properties with
3064 messages.
3065
3066 Note that the list may contain reviewers that are not committer, thus are not
3067 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003068
3069 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003070 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003071 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003072 return sorted(
3073 set(
3074 message['sender']
3075 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003076 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003077 )
3078 )
3079
3080
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003081def FindCodereviewSettingsFile(filename='codereview.settings'):
3082 """Finds the given file starting in the cwd and going up.
3083
3084 Only looks up to the top of the repository unless an
3085 'inherit-review-settings-ok' file exists in the root of the repository.
3086 """
3087 inherit_ok_file = 'inherit-review-settings-ok'
3088 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003089 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003090 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3091 root = '/'
3092 while True:
3093 if filename in os.listdir(cwd):
3094 if os.path.isfile(os.path.join(cwd, filename)):
3095 return open(os.path.join(cwd, filename))
3096 if cwd == root:
3097 break
3098 cwd = os.path.dirname(cwd)
3099
3100
3101def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003102 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003103 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003105 def SetProperty(name, setting, unset_error_ok=False):
3106 fullname = 'rietveld.' + name
3107 if setting in keyvals:
3108 RunGit(['config', fullname, keyvals[setting]])
3109 else:
3110 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3111
tandrii48df5812016-10-17 03:55:37 -07003112 if not keyvals.get('GERRIT_HOST', False):
3113 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003114 # Only server setting is required. Other settings can be absent.
3115 # In that case, we ignore errors raised during option deletion attempt.
3116 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3117 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3118 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003119 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003120 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3121 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003122 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3123 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003124
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003125 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003126 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003127
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003128 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003129 RunGit(['config', 'gerrit.squash-uploads',
3130 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003131
tandrii@chromium.org28253532016-04-14 13:46:56 +00003132 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003133 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003134 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3135
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003136 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003137 # should be of the form
3138 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3139 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3141 keyvals['ORIGIN_URL_CONFIG']])
3142
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003143
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003144def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003145 """Downloads a network object to a local file, like urllib.urlretrieve.
3146
3147 This is necessary because urllib is broken for SSL connections via a proxy.
3148 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003149 with open(destination, 'w') as f:
3150 f.write(urllib2.urlopen(source).read())
3151
3152
ukai@chromium.org712d6102013-11-27 00:52:58 +00003153def hasSheBang(fname):
3154 """Checks fname is a #! script."""
3155 with open(fname) as f:
3156 return f.read(2).startswith('#!')
3157
3158
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003159# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3160def DownloadHooks(*args, **kwargs):
3161 pass
3162
3163
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003164def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003165 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003166
3167 Args:
3168 force: True to update hooks. False to install hooks if not present.
3169 """
3170 if not settings.GetIsGerrit():
3171 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003172 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003173 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3174 if not os.access(dst, os.X_OK):
3175 if os.path.exists(dst):
3176 if not force:
3177 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003178 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003179 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003180 if not hasSheBang(dst):
3181 DieWithError('Not a script: %s\n'
3182 'You need to download from\n%s\n'
3183 'into .git/hooks/commit-msg and '
3184 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003185 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3186 except Exception:
3187 if os.path.exists(dst):
3188 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003189 DieWithError('\nFailed to download hooks.\n'
3190 'You need to download from\n%s\n'
3191 'into .git/hooks/commit-msg and '
3192 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003193
3194
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003195class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003196 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003197
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003198 _GOOGLESOURCE = 'googlesource.com'
3199
3200 def __init__(self):
3201 # Cached list of [host, identity, source], where source is either
3202 # .gitcookies or .netrc.
3203 self._all_hosts = None
3204
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003205 def ensure_configured_gitcookies(self):
3206 """Runs checks and suggests fixes to make git use .gitcookies from default
3207 path."""
3208 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3209 configured_path = RunGitSilent(
3210 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003211 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003212 if configured_path:
3213 self._ensure_default_gitcookies_path(configured_path, default)
3214 else:
3215 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003216
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003217 @staticmethod
3218 def _ensure_default_gitcookies_path(configured_path, default_path):
3219 assert configured_path
3220 if configured_path == default_path:
3221 print('git is already configured to use your .gitcookies from %s' %
3222 configured_path)
3223 return
3224
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003225 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003226 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3227 (configured_path, default_path))
3228
3229 if not os.path.exists(configured_path):
3230 print('However, your configured .gitcookies file is missing.')
3231 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3232 action='reconfigure')
3233 RunGit(['config', '--global', 'http.cookiefile', default_path])
3234 return
3235
3236 if os.path.exists(default_path):
3237 print('WARNING: default .gitcookies file already exists %s' %
3238 default_path)
3239 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3240 default_path)
3241
3242 confirm_or_exit('Move existing .gitcookies to default location?',
3243 action='move')
3244 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003245 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003246 print('Moved and reconfigured git to use .gitcookies from %s' %
3247 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003248
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003249 @staticmethod
3250 def _configure_gitcookies_path(default_path):
3251 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3252 if os.path.exists(netrc_path):
3253 print('You seem to be using outdated .netrc for git credentials: %s' %
3254 netrc_path)
3255 print('This tool will guide you through setting up recommended '
3256 '.gitcookies store for git credentials.\n'
3257 '\n'
3258 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3259 ' git config --global --unset http.cookiefile\n'
3260 ' mv %s %s.backup\n\n' % (default_path, default_path))
3261 confirm_or_exit(action='setup .gitcookies')
3262 RunGit(['config', '--global', 'http.cookiefile', default_path])
3263 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003264
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003265 def get_hosts_with_creds(self, include_netrc=False):
3266 if self._all_hosts is None:
3267 a = gerrit_util.CookiesAuthenticator()
3268 self._all_hosts = [
3269 (h, u, s)
3270 for h, u, s in itertools.chain(
3271 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3272 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3273 )
3274 if h.endswith(self._GOOGLESOURCE)
3275 ]
3276
3277 if include_netrc:
3278 return self._all_hosts
3279 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3280
3281 def print_current_creds(self, include_netrc=False):
3282 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3283 if not hosts:
3284 print('No Git/Gerrit credentials found')
3285 return
3286 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3287 header = [('Host', 'User', 'Which file'),
3288 ['=' * l for l in lengths]]
3289 for row in (header + hosts):
3290 print('\t'.join((('%%+%ds' % l) % s)
3291 for l, s in zip(lengths, row)))
3292
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003293 @staticmethod
3294 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003295 """Parses identity "git-<username>.domain" into <username> and domain."""
3296 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003297 # distinguishable from sub-domains. But we do know typical domains:
3298 if identity.endswith('.chromium.org'):
3299 domain = 'chromium.org'
3300 username = identity[:-len('.chromium.org')]
3301 else:
3302 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003303 if username.startswith('git-'):
3304 username = username[len('git-'):]
3305 return username, domain
3306
3307 def _get_usernames_of_domain(self, domain):
3308 """Returns list of usernames referenced by .gitcookies in a given domain."""
3309 identities_by_domain = {}
3310 for _, identity, _ in self.get_hosts_with_creds():
3311 username, domain = self._parse_identity(identity)
3312 identities_by_domain.setdefault(domain, []).append(username)
3313 return identities_by_domain.get(domain)
3314
3315 def _canonical_git_googlesource_host(self, host):
3316 """Normalizes Gerrit hosts (with '-review') to Git host."""
3317 assert host.endswith(self._GOOGLESOURCE)
3318 # Prefix doesn't include '.' at the end.
3319 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3320 if prefix.endswith('-review'):
3321 prefix = prefix[:-len('-review')]
3322 return prefix + '.' + self._GOOGLESOURCE
3323
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003324 def _canonical_gerrit_googlesource_host(self, host):
3325 git_host = self._canonical_git_googlesource_host(host)
3326 prefix = git_host.split('.', 1)[0]
3327 return prefix + '-review.' + self._GOOGLESOURCE
3328
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 def _get_counterpart_host(self, host):
3330 assert host.endswith(self._GOOGLESOURCE)
3331 git = self._canonical_git_googlesource_host(host)
3332 gerrit = self._canonical_gerrit_googlesource_host(git)
3333 return git if gerrit == host else gerrit
3334
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003335 def has_generic_host(self):
3336 """Returns whether generic .googlesource.com has been configured.
3337
3338 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3339 """
3340 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3341 if host == '.' + self._GOOGLESOURCE:
3342 return True
3343 return False
3344
3345 def _get_git_gerrit_identity_pairs(self):
3346 """Returns map from canonic host to pair of identities (Git, Gerrit).
3347
3348 One of identities might be None, meaning not configured.
3349 """
3350 host_to_identity_pairs = {}
3351 for host, identity, _ in self.get_hosts_with_creds():
3352 canonical = self._canonical_git_googlesource_host(host)
3353 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3354 idx = 0 if canonical == host else 1
3355 pair[idx] = identity
3356 return host_to_identity_pairs
3357
3358 def get_partially_configured_hosts(self):
3359 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003360 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3361 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3362 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003363
3364 def get_conflicting_hosts(self):
3365 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003366 host
3367 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003368 if None not in (i1, i2) and i1 != i2)
3369
3370 def get_duplicated_hosts(self):
3371 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3372 return set(host for host, count in counters.iteritems() if count > 1)
3373
3374 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3375 'chromium.googlesource.com': 'chromium.org',
3376 'chrome-internal.googlesource.com': 'google.com',
3377 }
3378
3379 def get_hosts_with_wrong_identities(self):
3380 """Finds hosts which **likely** reference wrong identities.
3381
3382 Note: skips hosts which have conflicting identities for Git and Gerrit.
3383 """
3384 hosts = set()
3385 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3386 pair = self._get_git_gerrit_identity_pairs().get(host)
3387 if pair and pair[0] == pair[1]:
3388 _, domain = self._parse_identity(pair[0])
3389 if domain != expected:
3390 hosts.add(host)
3391 return hosts
3392
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003393 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003394 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003395 hosts = sorted(hosts)
3396 assert hosts
3397 if extra_column_func is None:
3398 extras = [''] * len(hosts)
3399 else:
3400 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003401 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3402 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003403 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003404 lines.append(tmpl % he)
3405 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003406
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003407 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003408 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003409 yield ('.googlesource.com wildcard record detected',
3410 ['Chrome Infrastructure team recommends to list full host names '
3411 'explicitly.'],
3412 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413
3414 dups = self.get_duplicated_hosts()
3415 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003416 yield ('The following hosts were defined twice',
3417 self._format_hosts(dups),
3418 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003419
3420 partial = self.get_partially_configured_hosts()
3421 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003422 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3423 'These hosts are missing',
3424 self._format_hosts(partial, lambda host: 'but %s defined' %
3425 self._get_counterpart_host(host)),
3426 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427
3428 conflicting = self.get_conflicting_hosts()
3429 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003430 yield ('The following Git hosts have differing credentials from their '
3431 'Gerrit counterparts',
3432 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3433 tuple(self._get_git_gerrit_identity_pairs()[host])),
3434 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003435
3436 wrong = self.get_hosts_with_wrong_identities()
3437 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003438 yield ('These hosts likely use wrong identity',
3439 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3440 (self._get_git_gerrit_identity_pairs()[host][0],
3441 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3442 wrong)
3443
3444 def find_and_report_problems(self):
3445 """Returns True if there was at least one problem, else False."""
3446 found = False
3447 bad_hosts = set()
3448 for title, sublines, hosts in self._find_problems():
3449 if not found:
3450 found = True
3451 print('\n\n.gitcookies problem report:\n')
3452 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003453 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003454 if sublines:
3455 print()
3456 print(' %s' % '\n '.join(sublines))
3457 print()
3458
3459 if bad_hosts:
3460 assert found
3461 print(' You can manually remove corresponding lines in your %s file and '
3462 'visit the following URLs with correct account to generate '
3463 'correct credential lines:\n' %
3464 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3465 print(' %s' % '\n '.join(sorted(set(
3466 gerrit_util.CookiesAuthenticator().get_new_password_url(
3467 self._canonical_git_googlesource_host(host))
3468 for host in bad_hosts
3469 ))))
3470 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003471
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003472
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003473@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003474def CMDcreds_check(parser, args):
3475 """Checks credentials and suggests changes."""
3476 _, _ = parser.parse_args(args)
3477
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003478 # Code below checks .gitcookies. Abort if using something else.
3479 authn = gerrit_util.Authenticator.get()
3480 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3481 if isinstance(authn, gerrit_util.GceAuthenticator):
3482 DieWithError(
3483 'This command is not designed for GCE, are you on a bot?\n'
3484 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3485 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003486 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003487 'This command is not designed for bot environment. It checks '
3488 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003489
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003490 checker = _GitCookiesChecker()
3491 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003492
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003493 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003494 checker.print_current_creds(include_netrc=True)
3495
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003496 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003497 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003498 return 0
3499 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003500
3501
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003502@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003503def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003504 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003505 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3506 branch = ShortBranchName(branchref)
3507 _, args = parser.parse_args(args)
3508 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003509 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003510 return RunGit(['config', 'branch.%s.base-url' % branch],
3511 error_ok=False).strip()
3512 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003513 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003514 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3515 error_ok=False).strip()
3516
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003517
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003518def color_for_status(status):
3519 """Maps a Changelist status to color, for CMDstatus and other tools."""
3520 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003521 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003522 'waiting': Fore.BLUE,
3523 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003524 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003525 'lgtm': Fore.GREEN,
3526 'commit': Fore.MAGENTA,
3527 'closed': Fore.CYAN,
3528 'error': Fore.WHITE,
3529 }.get(status, Fore.WHITE)
3530
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003531
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003532def get_cl_statuses(changes, fine_grained, max_processes=None):
3533 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003534
3535 If fine_grained is true, this will fetch CL statuses from the server.
3536 Otherwise, simply indicate if there's a matching url for the given branches.
3537
3538 If max_processes is specified, it is used as the maximum number of processes
3539 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3540 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003541
3542 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003543 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003544 if not changes:
3545 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003546
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003547 if not fine_grained:
3548 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003549 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003550 for cl in changes:
3551 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003552 return
3553
3554 # First, sort out authentication issues.
3555 logging.debug('ensuring credentials exist')
3556 for cl in changes:
3557 cl.EnsureAuthenticated(force=False, refresh=True)
3558
3559 def fetch(cl):
3560 try:
3561 return (cl, cl.GetStatus())
3562 except:
3563 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003564 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003565 raise
3566
3567 threads_count = len(changes)
3568 if max_processes:
3569 threads_count = max(1, min(threads_count, max_processes))
3570 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3571
3572 pool = ThreadPool(threads_count)
3573 fetched_cls = set()
3574 try:
3575 it = pool.imap_unordered(fetch, changes).__iter__()
3576 while True:
3577 try:
3578 cl, status = it.next(timeout=5)
3579 except multiprocessing.TimeoutError:
3580 break
3581 fetched_cls.add(cl)
3582 yield cl, status
3583 finally:
3584 pool.close()
3585
3586 # Add any branches that failed to fetch.
3587 for cl in set(changes) - fetched_cls:
3588 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003589
rmistry@google.com2dd99862015-06-22 12:22:18 +00003590
3591def upload_branch_deps(cl, args):
3592 """Uploads CLs of local branches that are dependents of the current branch.
3593
3594 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003595
3596 test1 -> test2.1 -> test3.1
3597 -> test3.2
3598 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003599
3600 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3601 run on the dependent branches in this order:
3602 test2.1, test3.1, test3.2, test2.2, test3.3
3603
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003604 Note: This function does not rebase your local dependent branches. Use it
3605 when you make a change to the parent branch that will not conflict
3606 with its dependent branches, and you would like their dependencies
3607 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003608 """
3609 if git_common.is_dirty_git_tree('upload-branch-deps'):
3610 return 1
3611
3612 root_branch = cl.GetBranch()
3613 if root_branch is None:
3614 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3615 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003616 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003617 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3618 'patchset dependencies without an uploaded CL.')
3619
3620 branches = RunGit(['for-each-ref',
3621 '--format=%(refname:short) %(upstream:short)',
3622 'refs/heads'])
3623 if not branches:
3624 print('No local branches found.')
3625 return 0
3626
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003627 # Create a dictionary of all local branches to the branches that are
3628 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629 tracked_to_dependents = collections.defaultdict(list)
3630 for b in branches.splitlines():
3631 tokens = b.split()
3632 if len(tokens) == 2:
3633 branch_name, tracked = tokens
3634 tracked_to_dependents[tracked].append(branch_name)
3635
vapiera7fbd5a2016-06-16 09:17:49 -07003636 print()
3637 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003638 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003639
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 def traverse_dependents_preorder(branch, padding=''):
3641 dependents_to_process = tracked_to_dependents.get(branch, [])
3642 padding += ' '
3643 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003644 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003645 dependents.append(dependent)
3646 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003647
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003650
3651 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003652 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003653 return 0
3654
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003655 confirm_or_exit('This command will checkout all dependent branches and run '
3656 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003657
rmistry@google.com2dd99862015-06-22 12:22:18 +00003658 # Record all dependents that failed to upload.
3659 failures = {}
3660 # Go through all dependents, checkout the branch and upload.
3661 try:
3662 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003663 print()
3664 print('--------------------------------------')
3665 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003666 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003667 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003668 try:
3669 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003671 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003672 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003673 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675 finally:
3676 # Swap back to the original root branch.
3677 RunGit(['checkout', '-q', root_branch])
3678
vapiera7fbd5a2016-06-16 09:17:49 -07003679 print()
3680 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003681 for dependent_branch in dependents:
3682 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print(' %s : %s' % (dependent_branch, upload_status))
3684 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003685
3686 return 0
3687
3688
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003689@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003690def CMDarchive(parser, args):
3691 """Archives and deletes branches associated with closed changelists."""
3692 parser.add_option(
3693 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003694 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003695 parser.add_option(
3696 '-f', '--force', action='store_true',
3697 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003698 parser.add_option(
3699 '-d', '--dry-run', action='store_true',
3700 help='Skip the branch tagging and removal steps.')
3701 parser.add_option(
3702 '-t', '--notags', action='store_true',
3703 help='Do not tag archived branches. '
3704 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003705
kmarshall3bff56b2016-06-06 18:31:47 -07003706 options, args = parser.parse_args(args)
3707 if args:
3708 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003709
3710 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3711 if not branches:
3712 return 0
3713
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003715 changes = [Changelist(branchref=b)
3716 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003717 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3718 statuses = get_cl_statuses(changes,
3719 fine_grained=True,
3720 max_processes=options.maxjobs)
3721 proposal = [(cl.GetBranch(),
3722 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3723 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003724 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003725 proposal.sort()
3726
3727 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003729 return 0
3730
3731 current_branch = GetCurrentBranch()
3732
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003734 if options.notags:
3735 for next_item in proposal:
3736 print(' ' + next_item[0])
3737 else:
3738 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3739 for next_item in proposal:
3740 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003741
kmarshall9249e012016-08-23 12:02:16 -07003742 # Quit now on precondition failure or if instructed by the user, either
3743 # via an interactive prompt or by command line flags.
3744 if options.dry_run:
3745 print('\nNo changes were made (dry run).\n')
3746 return 0
3747 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003748 print('You are currently on a branch \'%s\' which is associated with a '
3749 'closed codereview issue, so archive cannot proceed. Please '
3750 'checkout another branch and run this command again.' %
3751 current_branch)
3752 return 1
kmarshall9249e012016-08-23 12:02:16 -07003753 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003754 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3755 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003756 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003757 return 1
3758
3759 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003760 if not options.notags:
3761 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003762 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003763
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003765
3766 return 0
3767
3768
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003769@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003770def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003771 """Show status of changelists.
3772
3773 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003774 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003775 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003776 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003777 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003778 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003779 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003780 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003781
3782 Also see 'git cl comments'.
3783 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003784 parser.add_option(
3785 '--no-branch-color',
3786 action='store_true',
3787 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003788 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003789 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003790 parser.add_option('-f', '--fast', action='store_true',
3791 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003792 parser.add_option(
3793 '-j', '--maxjobs', action='store', type=int,
3794 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003795
iannuccie53c9352016-08-17 14:40:40 -07003796 _add_codereview_issue_select_options(
3797 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003798 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003799 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003800 if args:
3801 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003802
iannuccie53c9352016-08-17 14:40:40 -07003803 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003804 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003805
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003806 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003807 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003808 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003810 elif options.field == 'id':
3811 issueid = cl.GetIssue()
3812 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003813 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003814 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003815 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003816 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003817 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003818 elif options.field == 'status':
3819 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820 elif options.field == 'url':
3821 url = cl.GetIssueURL()
3822 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003823 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003824 return 0
3825
3826 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3827 if not branches:
3828 print('No local branch found.')
3829 return 0
3830
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003831 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003832 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003833 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003835 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003836 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003837 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003838
Daniel McArdlea23bf592019-02-12 00:25:12 +00003839 current_branch = GetCurrentBranch()
3840
3841 def FormatBranchName(branch, colorize=False):
3842 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3843 an asterisk when it is the current branch."""
3844
3845 asterisk = ""
3846 color = Fore.RESET
3847 if branch == current_branch:
3848 asterisk = "* "
3849 color = Fore.GREEN
3850 branch_name = ShortBranchName(branch)
3851
3852 if colorize:
3853 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003854 return asterisk + branch_name
3855
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003856 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003857
3858 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003859 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3860 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003861 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003862 c, status = output.next()
3863 branch_statuses[c.GetBranch()] = status
3864 status = branch_statuses.pop(branch)
3865 url = cl.GetIssueURL()
3866 if url and (not status or status == 'error'):
3867 # The issue probably doesn't exist anymore.
3868 url += ' (broken)'
3869
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003870 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003871 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003872 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003873 color = ''
3874 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003875 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003876
Alan Cuttera3be9a52019-03-04 18:50:33 +00003877 branch_display = FormatBranchName(branch)
3878 padding = ' ' * (alignment - len(branch_display))
3879 if not options.no_branch_color:
3880 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003881
Alan Cuttera3be9a52019-03-04 18:50:33 +00003882 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3883 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003884
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003886 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003887 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003888 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003889 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003890 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003892 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003894 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print('Issue description:')
3896 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003897 return 0
3898
3899
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003900def colorize_CMDstatus_doc():
3901 """To be called once in main() to add colors to git cl status help."""
3902 colors = [i for i in dir(Fore) if i[0].isupper()]
3903
3904 def colorize_line(line):
3905 for color in colors:
3906 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003907 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003908 indent = len(line) - len(line.lstrip(' ')) + 1
3909 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3910 return line
3911
3912 lines = CMDstatus.__doc__.splitlines()
3913 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3914
3915
phajdan.jre328cf92016-08-22 04:12:17 -07003916def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003917 if path == '-':
3918 json.dump(contents, sys.stdout)
3919 else:
3920 with open(path, 'w') as f:
3921 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003922
3923
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003924@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003925@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003926def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003927 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003928
3929 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003930 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003931 parser.add_option('-r', '--reverse', action='store_true',
3932 help='Lookup the branch(es) for the specified issues. If '
3933 'no issues are specified, all branches with mapped '
3934 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003935 parser.add_option('--json',
3936 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003937 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003938 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003939 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003940
dnj@chromium.org406c4402015-03-03 17:22:28 +00003941 if options.reverse:
3942 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003943 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003944 # Reverse issue lookup.
3945 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003946
3947 git_config = {}
3948 for config in RunGit(['config', '--get-regexp',
3949 r'branch\..*issue']).splitlines():
3950 name, _space, val = config.partition(' ')
3951 git_config[name] = val
3952
dnj@chromium.org406c4402015-03-03 17:22:28 +00003953 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003954 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3955 config_key = _git_branch_config_key(ShortBranchName(branch),
3956 cls.IssueConfigKey())
3957 issue = git_config.get(config_key)
3958 if issue:
3959 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003960 if not args:
3961 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003962 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003963 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003964 try:
3965 issue_num = int(issue)
3966 except ValueError:
3967 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003968 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003969 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003970 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003971 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003972 if options.json:
3973 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003974 return 0
3975
3976 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003977 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003978 if not issue.valid:
3979 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3980 'or no argument to list it.\n'
3981 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003982 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003983 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003984 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003985 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003986 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3987 if options.json:
3988 write_json(options.json, {
3989 'issue': cl.GetIssue(),
3990 'issue_url': cl.GetIssueURL(),
3991 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003992 return 0
3993
3994
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003995@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003996def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003997 """Shows or posts review comments for any changelist."""
3998 parser.add_option('-a', '--add-comment', dest='comment',
3999 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004000 parser.add_option('-p', '--publish', action='store_true',
4001 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004002 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004003 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004004 parser.add_option('-m', '--machine-readable', dest='readable',
4005 action='store_false', default=True,
4006 help='output comments in a format compatible with '
4007 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004008 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004009 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004010 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004011 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004012 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004013
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004014 issue = None
4015 if options.issue:
4016 try:
4017 issue = int(options.issue)
4018 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004019 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004020
Edward Lemur934836a2019-09-09 20:16:54 +00004021 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004022
4023 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004024 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004025 return 0
4026
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004027 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4028 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004029 for comment in summary:
4030 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004031 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004032 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004033 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004034 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004035 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004036 elif comment.autogenerated:
4037 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004038 else:
4039 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004040 print('\n%s%s %s%s\n%s' % (
4041 color,
4042 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4043 comment.sender,
4044 Fore.RESET,
4045 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4046
smut@google.comc85ac942015-09-15 16:34:43 +00004047 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004048 def pre_serialize(c):
4049 dct = c.__dict__.copy()
4050 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4051 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004052 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004053 return 0
4054
4055
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004056@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004057@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004058def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004059 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004060 parser.add_option('-d', '--display', action='store_true',
4061 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004062 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004063 help='New description to set for this issue (- for stdin, '
4064 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004065 parser.add_option('-f', '--force', action='store_true',
4066 help='Delete any unpublished Gerrit edits for this issue '
4067 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004068
4069 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004070 options, args = parser.parse_args(args)
4071 _process_codereview_select_options(parser, options)
4072
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004073 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004074 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004075 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004076 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004077 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004078
Edward Lemur934836a2019-09-09 20:16:54 +00004079 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004080 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004081 if target_issue_arg:
4082 kwargs['issue'] = target_issue_arg.issue
4083 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004084 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004085 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004086
4087 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004088 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004089 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004090 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004091
4092 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004093 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004094
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004095 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004096
smut@google.com34fb6b12015-07-13 20:03:26 +00004097 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004099 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004100
4101 if options.new_description:
4102 text = options.new_description
4103 if text == '-':
4104 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004105 elif text == '+':
4106 base_branch = cl.GetCommonAncestorWithUpstream()
4107 change = cl.GetChange(base_branch, None, local_description=True)
4108 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004109
4110 description.set_description(text)
4111 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004112 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004113 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004114 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004115 return 0
4116
4117
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004118@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004119def CMDlint(parser, args):
4120 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004121 parser.add_option('--filter', action='append', metavar='-x,+y',
4122 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004123 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004124
4125 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004126 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004127 try:
4128 import cpplint
4129 import cpplint_chromium
4130 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004131 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004132 return 1
4133
4134 # Change the current working directory before calling lint so that it
4135 # shows the correct base.
4136 previous_cwd = os.getcwd()
4137 os.chdir(settings.GetRoot())
4138 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004139 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004140 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4141 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004142 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004143 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004144 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004145
4146 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004147 command = args + files
4148 if options.filter:
4149 command = ['--filter=' + ','.join(options.filter)] + command
4150 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004151
4152 white_regex = re.compile(settings.GetLintRegex())
4153 black_regex = re.compile(settings.GetLintIgnoreRegex())
4154 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4155 for filename in filenames:
4156 if white_regex.match(filename):
4157 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004158 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004159 else:
4160 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4161 extra_check_functions)
4162 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004163 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004164 finally:
4165 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004167 if cpplint._cpplint_state.error_count != 0:
4168 return 1
4169 return 0
4170
4171
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004172@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004173def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004174 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004175 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004176 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004177 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004178 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004179 parser.add_option('--all', action='store_true',
4180 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004181 parser.add_option('--parallel', action='store_true',
4182 help='Run all tests specified by input_api.RunTests in all '
4183 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004184 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004185
sbc@chromium.org71437c02015-04-09 19:29:40 +00004186 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004187 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188 return 1
4189
Edward Lemur934836a2019-09-09 20:16:54 +00004190 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004191 if args:
4192 base_branch = args[0]
4193 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004194 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004195 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196
Aaron Gable8076c282017-11-29 14:39:41 -08004197 if options.all:
4198 base_change = cl.GetChange(base_branch, None)
4199 files = [('M', f) for f in base_change.AllFiles()]
4200 change = presubmit_support.GitChange(
4201 base_change.Name(),
4202 base_change.FullDescriptionText(),
4203 base_change.RepositoryRoot(),
4204 files,
4205 base_change.issue,
4206 base_change.patchset,
4207 base_change.author_email,
4208 base_change._upstream)
4209 else:
4210 change = cl.GetChange(base_branch, None)
4211
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004212 cl.RunHook(
4213 committing=not options.upload,
4214 may_prompt=False,
4215 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004216 change=change,
4217 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004218 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219
4220
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004221def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004222 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004223
4224 Works the same way as
4225 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4226 but can be called on demand on all platforms.
4227
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004228 The basic idea is to generate git hash of a state of the tree, original
4229 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004230 """
4231 lines = []
4232 tree_hash = RunGitSilent(['write-tree'])
4233 lines.append('tree %s' % tree_hash.strip())
4234 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4235 if code == 0:
4236 lines.append('parent %s' % parent.strip())
4237 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4238 lines.append('author %s' % author.strip())
4239 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4240 lines.append('committer %s' % committer.strip())
4241 lines.append('')
4242 # Note: Gerrit's commit-hook actually cleans message of some lines and
4243 # whitespace. This code is not doing this, but it clearly won't decrease
4244 # entropy.
4245 lines.append(message)
4246 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004247 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004248 return 'I%s' % change_hash.strip()
4249
4250
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004251def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004252 """Computes the remote branch ref to use for the CL.
4253
4254 Args:
4255 remote (str): The git remote for the CL.
4256 remote_branch (str): The git remote branch for the CL.
4257 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004258 """
4259 if not (remote and remote_branch):
4260 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004261
wittman@chromium.org455dc922015-01-26 20:15:50 +00004262 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004263 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004264 # refs, which are then translated into the remote full symbolic refs
4265 # below.
4266 if '/' not in target_branch:
4267 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4268 else:
4269 prefix_replacements = (
4270 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4271 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4272 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4273 )
4274 match = None
4275 for regex, replacement in prefix_replacements:
4276 match = re.search(regex, target_branch)
4277 if match:
4278 remote_branch = target_branch.replace(match.group(0), replacement)
4279 break
4280 if not match:
4281 # This is a branch path but not one we recognize; use as-is.
4282 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004283 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4284 # Handle the refs that need to land in different refs.
4285 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004286
wittman@chromium.org455dc922015-01-26 20:15:50 +00004287 # Create the true path to the remote branch.
4288 # Does the following translation:
4289 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4290 # * refs/remotes/origin/master -> refs/heads/master
4291 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4292 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4293 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4294 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4295 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4296 'refs/heads/')
4297 elif remote_branch.startswith('refs/remotes/branch-heads'):
4298 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004299
wittman@chromium.org455dc922015-01-26 20:15:50 +00004300 return remote_branch
4301
4302
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004303def cleanup_list(l):
4304 """Fixes a list so that comma separated items are put as individual items.
4305
4306 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4307 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4308 """
4309 items = sum((i.split(',') for i in l), [])
4310 stripped_items = (i.strip() for i in items)
4311 return sorted(filter(None, stripped_items))
4312
4313
Aaron Gable4db38df2017-11-03 14:59:07 -07004314@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004315@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004316def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004317 """Uploads the current changelist to codereview.
4318
4319 Can skip dependency patchset uploads for a branch by running:
4320 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004321 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004322 git config --unset branch.branch_name.skip-deps-uploads
4323 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004324
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004325 If the name of the checked out branch starts with "bug-" or "fix-" followed
4326 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004327 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004328
4329 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004330 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004331 [git-cl] add support for hashtags
4332 Foo bar: implement foo
4333 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004334 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004335 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4336 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004337 parser.add_option('--bypass-watchlists', action='store_true',
4338 dest='bypass_watchlists',
4339 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004340 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004341 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004342 parser.add_option('--message', '-m', dest='message',
4343 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004344 parser.add_option('-b', '--bug',
4345 help='pre-populate the bug number(s) for this issue. '
4346 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004347 parser.add_option('--message-file', dest='message_file',
4348 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004349 parser.add_option('--title', '-t', dest='title',
4350 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004351 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004352 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004353 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004354 parser.add_option('--tbrs',
4355 action='append', default=[],
4356 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004357 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004358 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004359 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004360 parser.add_option('--hashtag', dest='hashtags',
4361 action='append', default=[],
4362 help=('Gerrit hashtag for new CL; '
4363 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004364 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004365 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004366 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004367 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004368 metavar='TARGET',
4369 help='Apply CL to remote ref TARGET. ' +
4370 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004371 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004372 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004373 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004374 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004375 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004376 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004377 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4378 const='TBR', help='add a set of OWNERS to TBR')
4379 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4380 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004381 parser.add_option('-c', '--use-commit-queue', action='store_true',
4382 help='tell the CQ to commit this patchset; '
4383 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004384 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4385 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004386 help='Send the patchset to do a CQ dry run right after '
4387 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004388 parser.add_option('--preserve-tryjobs', action='store_true',
4389 help='instruct the CQ to let tryjobs running even after '
4390 'new patchsets are uploaded instead of canceling '
4391 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004392 parser.add_option('--dependencies', action='store_true',
4393 help='Uploads CLs of all the local branches that depend on '
4394 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004395 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4396 help='Sends your change to the CQ after an approval. Only '
4397 'works on repos that have the Auto-Submit label '
4398 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004399 parser.add_option('--parallel', action='store_true',
4400 help='Run all tests specified by input_api.RunTests in all '
4401 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004402
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004403 parser.add_option('--no-autocc', action='store_true',
4404 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004405 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004406 help='Set the review private. This implies --no-autocc.')
4407
rmistry@google.com2dd99862015-06-22 12:22:18 +00004408 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004409 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004410 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004411 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004412
sbc@chromium.org71437c02015-04-09 19:29:40 +00004413 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004414 return 1
4415
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004416 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004417 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004418 options.cc = cleanup_list(options.cc)
4419
tandriib80458a2016-06-23 12:20:07 -07004420 if options.message_file:
4421 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004422 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004423 options.message = gclient_utils.FileRead(options.message_file)
4424 options.message_file = None
4425
tandrii4d0545a2016-07-06 03:56:49 -07004426 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004427 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004428
Aaron Gableedbc4132017-09-11 13:22:28 -07004429 if options.use_commit_queue:
4430 options.send_mail = True
4431
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004432 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4433 settings.GetIsGerrit()
4434
Edward Lemur934836a2019-09-09 20:16:54 +00004435 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004436
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004437 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004438
4439
Francois Dorayd42c6812017-05-30 15:10:20 -04004440@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004441@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004442def CMDsplit(parser, args):
4443 """Splits a branch into smaller branches and uploads CLs.
4444
4445 Creates a branch and uploads a CL for each group of files modified in the
4446 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004447 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004448 the shared OWNERS file.
4449 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004450 parser.add_option('-d', '--description', dest='description_file',
4451 help='A text file containing a CL description in which '
4452 '$directory will be replaced by each CL\'s directory.')
4453 parser.add_option('-c', '--comment', dest='comment_file',
4454 help='A text file containing a CL comment.')
4455 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004456 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004457 help='List the files and reviewers for each CL that would '
4458 'be created, but don\'t create branches or CLs.')
4459 parser.add_option('--cq-dry-run', action='store_true',
4460 help='If set, will do a cq dry run for each uploaded CL. '
4461 'Please be careful when doing this; more than ~10 CLs '
4462 'has the potential to overload our build '
4463 'infrastructure. Try to upload these not during high '
4464 'load times (usually 11-3 Mountain View time). Email '
4465 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004466 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4467 default=True,
4468 help='Sends your change to the CQ after an approval. Only '
4469 'works on repos that have the Auto-Submit label '
4470 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004471 options, _ = parser.parse_args(args)
4472
4473 if not options.description_file:
4474 parser.error('No --description flag specified.')
4475
4476 def WrappedCMDupload(args):
4477 return CMDupload(OptionParser(), args)
4478
4479 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004480 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004481 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004482
4483
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004484@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004485@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004486def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004487 """DEPRECATED: Used to commit the current changelist via git-svn."""
4488 message = ('git-cl no longer supports committing to SVN repositories via '
4489 'git-svn. You probably want to use `git cl land` instead.')
4490 print(message)
4491 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004492
4493
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004494# Two special branches used by git cl land.
4495MERGE_BRANCH = 'git-cl-commit'
4496CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4497
4498
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004499@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004500@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004501def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004502 """Commits the current changelist via git.
4503
4504 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4505 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004506 """
4507 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4508 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004509 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004510 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004511 parser.add_option('--parallel', action='store_true',
4512 help='Run all tests specified by input_api.RunTests in all '
4513 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004514 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004515
Edward Lemur934836a2019-09-09 20:16:54 +00004516 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004517
Robert Iannucci2e73d432018-03-14 01:10:47 -07004518 if not cl.GetIssue():
4519 DieWithError('You must upload the change first to Gerrit.\n'
4520 ' If you would rather have `git cl land` upload '
4521 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004522 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004523 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004524
4525
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004526@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004527@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004528def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004529 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530 parser.add_option('-b', dest='newbranch',
4531 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004532 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004533 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004535 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004536
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004537 group = optparse.OptionGroup(
4538 parser,
4539 'Options for continuing work on the current issue uploaded from a '
4540 'different clone (e.g. different machine). Must be used independently '
4541 'from the other options. No issue number should be specified, and the '
4542 'branch must have an issue number associated with it')
4543 group.add_option('--reapply', action='store_true', dest='reapply',
4544 help='Reset the branch and reapply the issue.\n'
4545 'CAUTION: This will undo any local changes in this '
4546 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004547
4548 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004549 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004550 parser.add_option_group(group)
4551
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004552 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004554 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004555
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004556 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004557 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004558 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004559 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004560 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004561
Edward Lemur934836a2019-09-09 20:16:54 +00004562 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004563 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004564 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004565
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004566 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004567 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004568 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004569
4570 RunGit(['reset', '--hard', upstream])
4571 if options.pull:
4572 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004573
Edward Lemurf38bc172019-09-03 21:02:13 +00004574 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004575
4576 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004577 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004578
Edward Lemurf38bc172019-09-03 21:02:13 +00004579 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004580 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004581 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004582
4583 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004584 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004585 }
4586 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004587 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004588 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004589 cl_kwargs['issue'] = target_issue_arg.issue
4590
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004591 # We don't want uncommitted changes mixed up with the patch.
4592 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004593 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004594
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004595 if options.newbranch:
4596 if options.force:
4597 RunGit(['branch', '-D', options.newbranch],
4598 stderr=subprocess2.PIPE, error_ok=True)
4599 RunGit(['new-branch', options.newbranch])
4600
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004601 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004602
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004603 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004604 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004605
Edward Lemurf38bc172019-09-03 21:02:13 +00004606 return cl.CMDPatchWithParsedIssue(
4607 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608
4609
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004610def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611 """Fetches the tree status and returns either 'open', 'closed',
4612 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004613 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614 if url:
4615 status = urllib2.urlopen(url).read().lower()
4616 if status.find('closed') != -1 or status == '0':
4617 return 'closed'
4618 elif status.find('open') != -1 or status == '1':
4619 return 'open'
4620 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004621 return 'unset'
4622
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004623
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004624def GetTreeStatusReason():
4625 """Fetches the tree status from a json url and returns the message
4626 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004627 url = settings.GetTreeStatusUrl()
4628 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629 connection = urllib2.urlopen(json_url)
4630 status = json.loads(connection.read())
4631 connection.close()
4632 return status['message']
4633
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004634
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004635@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004636def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004637 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004638 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 status = GetTreeStatus()
4640 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004641 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004642 return 2
4643
vapiera7fbd5a2016-06-16 09:17:49 -07004644 print('The tree is %s' % status)
4645 print()
4646 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647 if status != 'open':
4648 return 1
4649 return 0
4650
4651
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004652@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004653def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004654 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4655 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004656 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004657 '-b', '--bot', action='append',
4658 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4659 'times to specify multiple builders. ex: '
4660 '"-b win_rel -b win_layout". See '
4661 'the try server waterfall for the builders name and the tests '
4662 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004663 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004664 '-B', '--bucket', default='',
4665 help=('Buildbucket bucket to send the try requests.'))
4666 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004667 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004668 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004669 'be determined by the try recipe that builder runs, which usually '
4670 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004671 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004672 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004673 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004674 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004675 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004676 '--category', default='git_cl_try', help='Specify custom build category.')
4677 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004678 '--project',
4679 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004680 'in recipe to determine to which repository or directory to '
4681 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004682 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004683 '-p', '--property', dest='properties', action='append', default=[],
4684 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004685 'key2=value2 etc. The value will be treated as '
4686 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004687 'NOTE: using this may make your tryjob not usable for CQ, '
4688 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004689 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004690 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4691 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004692 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004693 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004694 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004695 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004696 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004697 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004698
machenbach@chromium.org45453142015-09-15 08:45:22 +00004699 # Make sure that all properties are prop=value pairs.
4700 bad_params = [x for x in options.properties if '=' not in x]
4701 if bad_params:
4702 parser.error('Got properties with missing "=": %s' % bad_params)
4703
maruel@chromium.org15192402012-09-06 12:38:29 +00004704 if args:
4705 parser.error('Unknown arguments: %s' % args)
4706
Edward Lemur934836a2019-09-09 20:16:54 +00004707 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004708 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004709 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004710
Edward Lemurf38bc172019-09-03 21:02:13 +00004711 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004712 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004713
tandriie113dfd2016-10-11 10:20:12 -07004714 error_message = cl.CannotTriggerTryJobReason()
4715 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004716 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004717
qyearsley1fdfcb62016-10-24 13:22:03 -07004718 buckets = _get_bucket_map(cl, options, parser)
Edward Lemurc8b67ed2019-09-12 20:28:58 +00004719 if buckets and any(b.startswith('master.') for b in buckets):
4720 print('ERROR: Buildbot masters are not supported.')
4721 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004722
qyearsleydd49f942016-10-28 11:57:22 -07004723 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4724 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004725 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004726 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004727 print('git cl try with no bots now defaults to CQ dry run.')
4728 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4729 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004730
borenet6c0efe62016-10-19 08:13:29 -07004731 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004732 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004733 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004734 'of bot requires an initial job from a parent (usually a builder). '
4735 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004736 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004737 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004738
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004739 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07004740 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004741 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07004742 except BuildbucketResponseException as ex:
4743 print('ERROR: %s' % ex)
4744 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00004745 return 0
4746
4747
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004748@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004750 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004751 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004753 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004754 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004755 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004756 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004757 '--color', action='store_true', default=setup_color.IS_TTY,
4758 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004759 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004760 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4761 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004762 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004763 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004764 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 parser.add_option_group(group)
4766 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004767 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004768 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004769 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004770 if args:
4771 parser.error('Unrecognized args: %s' % ' '.join(args))
4772
4773 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004774 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004775 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004776 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777
tandrii221ab252016-10-06 08:12:04 -07004778 patchset = options.patchset
4779 if not patchset:
4780 patchset = cl.GetMostRecentPatchset()
4781 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004782 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004783 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004784 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004785 cl.GetIssue())
4786
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004787 try:
tandrii221ab252016-10-06 08:12:04 -07004788 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004789 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004790 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004791 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004792 if options.json:
4793 write_try_results_json(options.json, jobs)
4794 else:
4795 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004796 return 0
4797
4798
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004799@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004800@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004801def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004802 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004803 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004804 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004805 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004807 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004808 if args:
4809 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004810 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004811 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004812 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004813 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004814
4815 # Clear configured merge-base, if there is one.
4816 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004817 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004818 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004819 return 0
4820
4821
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004822@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004823def CMDweb(parser, args):
4824 """Opens the current CL in the web browser."""
4825 _, args = parser.parse_args(args)
4826 if args:
4827 parser.error('Unrecognized args: %s' % ' '.join(args))
4828
4829 issue_url = Changelist().GetIssueURL()
4830 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004831 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004832 return 1
4833
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004834 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004835 # allows us to hide the "Created new window in existing browser session."
4836 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004837 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004838 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004839 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004840 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004841 os.open(os.devnull, os.O_RDWR)
4842 try:
4843 webbrowser.open(issue_url)
4844 finally:
4845 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004846 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004847 return 0
4848
4849
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004850@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004851def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004852 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004853 parser.add_option('-d', '--dry-run', action='store_true',
4854 help='trigger in dry run mode')
4855 parser.add_option('-c', '--clear', action='store_true',
4856 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004857 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004858 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004859 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004860 if args:
4861 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004862 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004863 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004864
Edward Lemur934836a2019-09-09 20:16:54 +00004865 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004866 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004867 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004868 elif options.dry_run:
4869 state = _CQState.DRY_RUN
4870 else:
4871 state = _CQState.COMMIT
4872 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004873 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004874 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004875 return 0
4876
4877
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004878@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004879def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004880 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004881 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004882 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004883 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004884 if args:
4885 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004886 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004887 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004888 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004889 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004890 cl.CloseIssue()
4891 return 0
4892
4893
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004894@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004895def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004896 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004897 parser.add_option(
4898 '--stat',
4899 action='store_true',
4900 dest='stat',
4901 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004902 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004903 if args:
4904 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004905
Edward Lemur934836a2019-09-09 20:16:54 +00004906 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004907 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004908 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004909 if not issue:
4910 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004911
Aaron Gablea718c3e2017-08-28 17:47:28 -07004912 base = cl._GitGetBranchConfigValue('last-upload-hash')
4913 if not base:
4914 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4915 if not base:
4916 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4917 revision_info = detail['revisions'][detail['current_revision']]
4918 fetch_info = revision_info['fetch']['http']
4919 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4920 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004921
Aaron Gablea718c3e2017-08-28 17:47:28 -07004922 cmd = ['git', 'diff']
4923 if options.stat:
4924 cmd.append('--stat')
4925 cmd.append(base)
4926 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004927
4928 return 0
4929
4930
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004931@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004932def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004933 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004934 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004935 '--ignore-current',
4936 action='store_true',
4937 help='Ignore the CL\'s current reviewers and start from scratch.')
4938 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004939 '--ignore-self',
4940 action='store_true',
4941 help='Do not consider CL\'s author as an owners.')
4942 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004943 '--no-color',
4944 action='store_true',
4945 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004946 parser.add_option(
4947 '--batch',
4948 action='store_true',
4949 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004950 # TODO: Consider moving this to another command, since other
4951 # git-cl owners commands deal with owners for a given CL.
4952 parser.add_option(
4953 '--show-all',
4954 action='store_true',
4955 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004956 options, args = parser.parse_args(args)
4957
4958 author = RunGit(['config', 'user.email']).strip() or None
4959
Edward Lemur934836a2019-09-09 20:16:54 +00004960 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004961
Yang Guo6e269a02019-06-26 11:17:02 +00004962 if options.show_all:
4963 for arg in args:
4964 base_branch = cl.GetCommonAncestorWithUpstream()
4965 change = cl.GetChange(base_branch, None)
4966 database = owners.Database(change.RepositoryRoot(), file, os.path)
4967 database.load_data_needed_for([arg])
4968 print('Owners for %s:' % arg)
4969 for owner in sorted(database.all_possible_owners([arg], None)):
4970 print(' - %s' % owner)
4971 return 0
4972
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004973 if args:
4974 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004975 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004976 base_branch = args[0]
4977 else:
4978 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004979 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004980
4981 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004982 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4983
4984 if options.batch:
4985 db = owners.Database(change.RepositoryRoot(), file, os.path)
4986 print('\n'.join(db.reviewers_for(affected_files, author)))
4987 return 0
4988
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004989 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004990 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004991 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004992 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004993 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004994 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004995 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004996 override_files=change.OriginalOwnersFiles(),
4997 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004998
4999
Aiden Bennerc08566e2018-10-03 17:52:42 +00005000def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005001 """Generates a diff command."""
5002 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005003 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5004
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005005 if allow_prefix:
5006 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5007 # case that diff.noprefix is set in the user's git config.
5008 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5009 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005010 diff_cmd += ['--no-prefix']
5011
5012 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005013
5014 if args:
5015 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005016 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005017 diff_cmd.append(arg)
5018 else:
5019 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005020
5021 return diff_cmd
5022
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005023
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005024def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005025 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005026 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005027
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005028
enne@chromium.org555cfe42014-01-29 18:21:39 +00005029@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005030@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005031def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005032 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005033 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005034 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005035 parser.add_option('--full', action='store_true',
5036 help='Reformat the full content of all touched files')
5037 parser.add_option('--dry-run', action='store_true',
5038 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005039 parser.add_option(
5040 '--python',
5041 action='store_true',
5042 default=None,
5043 help='Enables python formatting on all python files.')
5044 parser.add_option(
5045 '--no-python',
5046 action='store_true',
5047 dest='python',
5048 help='Disables python formatting on all python files. '
5049 'Takes precedence over --python. '
5050 'If neither --python or --no-python are set, python '
5051 'files that have a .style.yapf file in an ancestor '
5052 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005053 parser.add_option('--js', action='store_true',
5054 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005055 parser.add_option('--diff', action='store_true',
5056 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005057 parser.add_option('--presubmit', action='store_true',
5058 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005059 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005060
Daniel Chengc55eecf2016-12-30 03:11:02 -08005061 # Normalize any remaining args against the current path, so paths relative to
5062 # the current directory are still resolved as expected.
5063 args = [os.path.join(os.getcwd(), arg) for arg in args]
5064
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005065 # git diff generates paths against the root of the repository. Change
5066 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005067 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005068 if rel_base_path:
5069 os.chdir(rel_base_path)
5070
digit@chromium.org29e47272013-05-17 17:01:46 +00005071 # Grab the merge-base commit, i.e. the upstream commit of the current
5072 # branch when it was created or the last time it was rebased. This is
5073 # to cover the case where the user may have called "git fetch origin",
5074 # moving the origin branch to a newer commit, but hasn't rebased yet.
5075 upstream_commit = None
5076 cl = Changelist()
5077 upstream_branch = cl.GetUpstreamBranch()
5078 if upstream_branch:
5079 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5080 upstream_commit = upstream_commit.strip()
5081
5082 if not upstream_commit:
5083 DieWithError('Could not find base commit for this branch. '
5084 'Are you in detached state?')
5085
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005086 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5087 diff_output = RunGit(changed_files_cmd)
5088 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005089 # Filter out files deleted by this CL
5090 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005091
Christopher Lamc5ba6922017-01-24 11:19:14 +11005092 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005093 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005094
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005095 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5096 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5097 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005098 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005099
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005100 top_dir = os.path.normpath(
5101 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5102
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005103 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5104 # formatted. This is used to block during the presubmit.
5105 return_value = 0
5106
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005107 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005108 # Locate the clang-format binary in the checkout
5109 try:
5110 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005111 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005112 DieWithError(e)
5113
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005114 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005115 cmd = [clang_format_tool]
5116 if not opts.dry_run and not opts.diff:
5117 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005118 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005119 if opts.diff:
5120 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005121 else:
5122 env = os.environ.copy()
5123 env['PATH'] = str(os.path.dirname(clang_format_tool))
5124 try:
5125 script = clang_format.FindClangFormatScriptInChromiumTree(
5126 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005127 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005128 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005129
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005130 cmd = [sys.executable, script, '-p0']
5131 if not opts.dry_run and not opts.diff:
5132 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005133
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005134 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5135 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005136
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005137 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5138 if opts.diff:
5139 sys.stdout.write(stdout)
5140 if opts.dry_run and len(stdout) > 0:
5141 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005142
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005143 # Similar code to above, but using yapf on .py files rather than clang-format
5144 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005145 py_explicitly_disabled = opts.python is not None and not opts.python
5146 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005147 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5148 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5149 if sys.platform.startswith('win'):
5150 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005151
Aiden Bennerc08566e2018-10-03 17:52:42 +00005152 # If we couldn't find a yapf file we'll default to the chromium style
5153 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005154 chromium_default_yapf_style = os.path.join(depot_tools_path,
5155 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005156 # Used for caching.
5157 yapf_configs = {}
5158 for f in python_diff_files:
5159 # Find the yapf style config for the current file, defaults to depot
5160 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005161 _FindYapfConfigFile(f, yapf_configs, top_dir)
5162
5163 # Turn on python formatting by default if a yapf config is specified.
5164 # This breaks in the case of this repo though since the specified
5165 # style file is also the global default.
5166 if opts.python is None:
5167 filtered_py_files = []
5168 for f in python_diff_files:
5169 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5170 filtered_py_files.append(f)
5171 else:
5172 filtered_py_files = python_diff_files
5173
5174 # Note: yapf still seems to fix indentation of the entire file
5175 # even if line ranges are specified.
5176 # See https://github.com/google/yapf/issues/499
5177 if not opts.full and filtered_py_files:
5178 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5179
5180 for f in filtered_py_files:
5181 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5182 if yapf_config is None:
5183 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005184
5185 cmd = [yapf_tool, '--style', yapf_config, f]
5186
5187 has_formattable_lines = False
5188 if not opts.full:
5189 # Only run yapf over changed line ranges.
5190 for diff_start, diff_len in py_line_diffs[f]:
5191 diff_end = diff_start + diff_len - 1
5192 # Yapf errors out if diff_end < diff_start but this
5193 # is a valid line range diff for a removal.
5194 if diff_end >= diff_start:
5195 has_formattable_lines = True
5196 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5197 # If all line diffs were removals we have nothing to format.
5198 if not has_formattable_lines:
5199 continue
5200
5201 if opts.diff or opts.dry_run:
5202 cmd += ['--diff']
5203 # Will return non-zero exit code if non-empty diff.
5204 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5205 if opts.diff:
5206 sys.stdout.write(stdout)
5207 elif len(stdout) > 0:
5208 return_value = 2
5209 else:
5210 cmd += ['-i']
5211 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005212
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005213 # Dart's formatter does not have the nice property of only operating on
5214 # modified chunks, so hard code full.
5215 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005216 try:
5217 command = [dart_format.FindDartFmtToolInChromiumTree()]
5218 if not opts.dry_run and not opts.diff:
5219 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005220 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005221
ppi@chromium.org6593d932016-03-03 15:41:15 +00005222 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005223 if opts.dry_run and stdout:
5224 return_value = 2
5225 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005226 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5227 'found in this checkout. Files in other languages are still '
5228 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005229
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005230 # Format GN build files. Always run on full build files for canonical form.
5231 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005232 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005233 if opts.dry_run or opts.diff:
5234 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005235 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005236 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5237 shell=sys.platform == 'win32',
5238 cwd=top_dir)
5239 if opts.dry_run and gn_ret == 2:
5240 return_value = 2 # Not formatted.
5241 elif opts.diff and gn_ret == 2:
5242 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005243 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005244 elif gn_ret != 0:
5245 # For non-dry run cases (and non-2 return values for dry-run), a
5246 # nonzero error code indicates a failure, probably because the file
5247 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005248 DieWithError('gn format failed on ' + gn_diff_file +
5249 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005250
Ilya Shermane081cbe2017-08-15 17:51:04 -07005251 # Skip the metrics formatting from the global presubmit hook. These files have
5252 # a separate presubmit hook that issues an error if the files need formatting,
5253 # whereas the top-level presubmit script merely issues a warning. Formatting
5254 # these files is somewhat slow, so it's important not to duplicate the work.
5255 if not opts.presubmit:
5256 for xml_dir in GetDirtyMetricsDirs(diff_files):
5257 tool_dir = os.path.join(top_dir, xml_dir)
5258 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5259 if opts.dry_run or opts.diff:
5260 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005261 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005262 if opts.diff:
5263 sys.stdout.write(stdout)
5264 if opts.dry_run and stdout:
5265 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005266
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005267 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005268
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005269
Steven Holte2e664bf2017-04-21 13:10:47 -07005270def GetDirtyMetricsDirs(diff_files):
5271 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5272 metrics_xml_dirs = [
5273 os.path.join('tools', 'metrics', 'actions'),
5274 os.path.join('tools', 'metrics', 'histograms'),
5275 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005276 os.path.join('tools', 'metrics', 'ukm'),
5277 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005278 for xml_dir in metrics_xml_dirs:
5279 if any(file.startswith(xml_dir) for file in xml_diff_files):
5280 yield xml_dir
5281
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005282
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005283@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005284@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005285def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005286 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005287 _, args = parser.parse_args(args)
5288
5289 if len(args) != 1:
5290 parser.print_help()
5291 return 1
5292
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005293 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005294 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005295 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005296
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005297 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005298
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005299 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005300 output = RunGit(['config', '--local', '--get-regexp',
5301 r'branch\..*\.%s' % issueprefix],
5302 error_ok=True)
5303 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005304 if issue == target_issue:
5305 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005306
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005307 branches = []
5308 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005309 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005310 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005311 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312 return 1
5313 if len(branches) == 1:
5314 RunGit(['checkout', branches[0]])
5315 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005316 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005317 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005318 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005319 which = raw_input('Choose by index: ')
5320 try:
5321 RunGit(['checkout', branches[int(which)]])
5322 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005323 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005324 return 1
5325
5326 return 0
5327
5328
maruel@chromium.org29404b52014-09-08 22:58:00 +00005329def CMDlol(parser, args):
5330 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005331 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005332 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5333 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5334 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005335 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005336 return 0
5337
5338
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005339class OptionParser(optparse.OptionParser):
5340 """Creates the option parse and add --verbose support."""
5341 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005342 optparse.OptionParser.__init__(
5343 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005344 self.add_option(
5345 '-v', '--verbose', action='count', default=0,
5346 help='Use 2 times for more debugging info')
5347
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005348 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005349 try:
5350 return self._parse_args(args)
5351 finally:
5352 # Regardless of success or failure of args parsing, we want to report
5353 # metrics, but only after logging has been initialized (if parsing
5354 # succeeded).
5355 global settings
5356 settings = Settings()
5357
5358 if not metrics.DISABLE_METRICS_COLLECTION:
5359 # GetViewVCUrl ultimately calls logging method.
5360 project_url = settings.GetViewVCUrl().strip('/+')
5361 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5362 metrics.collector.add('project_urls', [project_url])
5363
5364 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005365 # Create an optparse.Values object that will store only the actual passed
5366 # options, without the defaults.
5367 actual_options = optparse.Values()
5368 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5369 # Create an optparse.Values object with the default options.
5370 options = optparse.Values(self.get_default_values().__dict__)
5371 # Update it with the options passed by the user.
5372 options._update_careful(actual_options.__dict__)
5373 # Store the options passed by the user in an _actual_options attribute.
5374 # We store only the keys, and not the values, since the values can contain
5375 # arbitrary information, which might be PII.
5376 metrics.collector.add('arguments', actual_options.__dict__.keys())
5377
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005378 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005379 logging.basicConfig(
5380 level=levels[min(options.verbose, len(levels) - 1)],
5381 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5382 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005383
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005384 return options, args
5385
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005386
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005387def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005388 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005389 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005390 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005391 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005392
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005393 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005394 dispatcher = subcommand.CommandDispatcher(__name__)
5395 try:
5396 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005397 except auth.AuthenticationError as e:
5398 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005399 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005400 if e.code != 500:
5401 raise
5402 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005403 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005404 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005405 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005406
5407
5408if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005409 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5410 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005411 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005412 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005413 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005414 sys.exit(main(sys.argv[1:]))