blob: 42f689bc1eb095bc1d58106b2139963629e8dcf8 [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 Lemurd4d1ba42019-09-20 21:46:37 +000074MAX_ATTEMPTS = 3
75
Edward Lemur1b52d872019-05-09 21:12:12 +000076# The maximum number of traces we will keep. Multiplied by 3 since we store
77# 3 files per trace.
78MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000079# Message to be displayed to the user to inform where to find the traces for a
80# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000081TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000082'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000083'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000084' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000085'Copies of your gitcookies file and git config have been recorded at:\n'
86' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000087# Format of the message to be stored as part of the traces to give developers a
88# better context when they go through traces.
89TRACES_README_FORMAT = (
90'Date: %(now)s\n'
91'\n'
92'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
93'Title: %(title)s\n'
94'\n'
95'%(description)s\n'
96'\n'
97'Execution time: %(execution_time)s\n'
98'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000099
tandrii9d2c7a32016-06-22 03:42:45 -0700100COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800101POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000103REFS_THAT_ALIAS_TO_OTHER_REFS = {
104 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
105 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
106}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000107
thestig@chromium.org44202a22014-03-11 19:22:18 +0000108# Valid extensions for files we want to lint.
109DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
110DEFAULT_LINT_IGNORE_REGEX = r"$^"
111
Aiden Bennerc08566e2018-10-03 17:52:42 +0000112# File name for yapf style config files.
113YAPF_CONFIG_FILENAME = '.style.yapf'
114
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000115# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000116Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000117
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000118# Initialized in main()
119settings = None
120
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100121# Used by tests/git_cl_test.py to add extra logging.
122# Inside the weirdly failing test, add this:
123# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700124# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125_IS_BEING_TESTED = False
126
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000127
Christopher Lamf732cd52017-01-24 12:40:11 +1100128def DieWithError(message, change_desc=None):
129 if change_desc:
130 SaveDescriptionBackup(change_desc)
131
vapiera7fbd5a2016-06-16 09:17:49 -0700132 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133 sys.exit(1)
134
135
Christopher Lamf732cd52017-01-24 12:40:11 +1100136def SaveDescriptionBackup(change_desc):
137 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000138 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100139 backup_file = open(backup_path, 'w')
140 backup_file.write(change_desc.description)
141 backup_file.close()
142
143
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000144def GetNoGitPagerEnv():
145 env = os.environ.copy()
146 # 'cat' is a magical git string that disables pagers on all platforms.
147 env['GIT_PAGER'] = 'cat'
148 return env
149
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000150
bsep@chromium.org627d9002016-04-29 00:00:52 +0000151def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000152 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000153 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000154 except subprocess2.CalledProcessError as e:
155 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000156 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000157 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000158 'Command "%s" failed.\n%s' % (
159 ' '.join(args), error_message or e.stdout or ''))
160 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161
162
163def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000164 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000165 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166
167
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000168def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000169 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700170 if suppress_stderr:
171 stderr = subprocess2.VOID
172 else:
173 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000174 try:
tandrii5d48c322016-08-18 16:19:37 -0700175 (out, _), code = subprocess2.communicate(['git'] + args,
176 env=GetNoGitPagerEnv(),
177 stdout=subprocess2.PIPE,
178 stderr=stderr)
179 return code, out
180 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900181 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700182 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183
184
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000185def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000186 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000187 return RunGitWithCode(args, suppress_stderr=True)[1]
188
189
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000190def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000191 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000192 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000193 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000194 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195
196
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000197def BranchExists(branch):
198 """Return True if specified branch exists."""
199 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
200 suppress_stderr=True)
201 return not code
202
203
tandrii2a16b952016-10-19 07:09:44 -0700204def time_sleep(seconds):
205 # Use this so that it can be mocked in tests without interfering with python
206 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700207 return time.sleep(seconds)
208
209
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000210def time_time():
211 # Use this so that it can be mocked in tests without interfering with python
212 # system machinery.
213 return time.time()
214
215
Edward Lemur1b52d872019-05-09 21:12:12 +0000216def datetime_now():
217 # Use this so that it can be mocked in tests without interfering with python
218 # system machinery.
219 return datetime.datetime.now()
220
221
maruel@chromium.org90541732011-04-01 17:54:18 +0000222def ask_for_data(prompt):
223 try:
224 return raw_input(prompt)
225 except KeyboardInterrupt:
226 # Hide the exception.
227 sys.exit(1)
228
229
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100230def confirm_or_exit(prefix='', action='confirm'):
231 """Asks user to press enter to continue or press Ctrl+C to abort."""
232 if not prefix or prefix.endswith('\n'):
233 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100234 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235 mid = ' Press'
236 elif prefix.endswith(' '):
237 mid = 'press'
238 else:
239 mid = ' press'
240 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
241
242
243def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000244 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
246 while True:
247 if 'yes'.startswith(result):
248 return True
249 if 'no'.startswith(result):
250 return False
251 result = ask_for_data('Please, type yes or no: ').lower()
252
253
tandrii5d48c322016-08-18 16:19:37 -0700254def _git_branch_config_key(branch, key):
255 """Helper method to return Git config key for a branch."""
256 assert branch, 'branch name is required to set git config for it'
257 return 'branch.%s.%s' % (branch, key)
258
259
260def _git_get_branch_config_value(key, default=None, value_type=str,
261 branch=False):
262 """Returns git config value of given or current branch if any.
263
264 Returns default in all other cases.
265 """
266 assert value_type in (int, str, bool)
267 if branch is False: # Distinguishing default arg value from None.
268 branch = GetCurrentBranch()
269
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000270 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700271 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000272
tandrii5d48c322016-08-18 16:19:37 -0700273 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700274 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700275 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000276 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700277 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700278 args.append(_git_branch_config_key(branch, key))
279 code, out = RunGitWithCode(args)
280 if code == 0:
281 value = out.strip()
282 if value_type == int:
283 return int(value)
284 if value_type == bool:
285 return bool(value.lower() == 'true')
286 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000287 return default
288
289
tandrii5d48c322016-08-18 16:19:37 -0700290def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000291 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700292
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000293 If value is None, the key will be unset, otherwise it will be set.
294 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700295 """
296 if not branch:
297 branch = GetCurrentBranch()
298 assert branch, 'a branch name OR currently checked out branch is required'
299 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700300 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700301 if value is None:
302 args.append('--unset')
303 elif isinstance(value, bool):
304 args.append('--bool')
305 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700306 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000307 # `git config` also has --int, but apparently git config suffers from
308 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700309 value = str(value)
310 args.append(_git_branch_config_key(branch, key))
311 if value is not None:
312 args.append(value)
313 RunGit(args, **kwargs)
314
315
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100316def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700317 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100318
319 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
320 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000321 # Git also stores timezone offset, but it only affects visual display;
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100322 # actual point in time is defined by this timestamp only.
323 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
324
325
326def _git_amend_head(message, committer_timestamp):
327 """Amends commit with new message and desired committer_timestamp.
328
329 Sets committer timezone to UTC.
330 """
331 env = os.environ.copy()
332 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
333 return RunGit(['commit', '--amend', '-m', message], env=env)
334
335
machenbach@chromium.org45453142015-09-15 08:45:22 +0000336def _get_properties_from_options(options):
337 properties = dict(x.split('=', 1) for x in options.properties)
338 for key, val in properties.iteritems():
339 try:
340 properties[key] = json.loads(val)
341 except ValueError:
342 pass # If a value couldn't be evaluated, treat it as a string.
343 return properties
344
345
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000346# TODO(crbug.com/976104): Remove this function once git-cl try-results has
347# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000348def _buildbucket_retry(operation_name, http, *args, **kwargs):
349 """Retries requests to buildbucket service and returns parsed json content."""
350 try_count = 0
351 while True:
352 response, content = http.request(*args, **kwargs)
353 try:
354 content_json = json.loads(content)
355 except ValueError:
356 content_json = None
357
358 # Buildbucket could return an error even if status==200.
359 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000360 error = content_json.get('error')
361 if error.get('code') == 403:
362 raise BuildbucketResponseException(
363 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000364 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000365 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 raise BuildbucketResponseException(msg)
367
368 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700369 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000371 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700372 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000373 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000374 content)
375 return content_json
376 if response.status < 500 or try_count >= 2:
377 raise httplib2.HttpLib2Error(content)
378
379 # status >= 500 means transient failures.
380 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000381 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000382 try_count += 1
383 assert False, 'unreachable'
384
385
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000386def _call_buildbucket(http, buildbucket_host, method, request=None):
387 """Calls a buildbucket v2 method and returns the parsed json response."""
388 headers = {
389 'Accept': 'application/json',
390 'Content-Type': 'application/json',
391 }
392 request = json.dumps(request)
393 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
394
395 logging.info('POST %s with %s' % (url, request))
396
397 attempts = 1
398 time_to_sleep = 1
399 while True:
400 response, content = http.request(url, 'POST', body=request, headers=headers)
401 if response.status == 200:
402 return json.loads(content[4:])
403 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
404 msg = '%s error when calling POST %s with %s: %s' % (
405 response.status, url, request, content)
406 raise BuildbucketResponseException(msg)
407 logging.debug(
408 '%s error when calling POST %s with %s. '
409 'Sleeping for %d seconds and retrying...' % (
410 response.status, url, request, time_to_sleep))
411 time.sleep(time_to_sleep)
412 time_to_sleep *= 2
413 attempts += 1
414
415 assert False, 'unreachable'
416
417
qyearsley1fdfcb62016-10-24 13:22:03 -0700418def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700419 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000420 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 """
qyearsleydd49f942016-10-28 11:57:22 -0700422 # If no bots are listed, we try to get a set of builders and tests based
423 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700424 if not options.bot:
425 change = changelist.GetChange(
426 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700427 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700428 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 change=change,
430 changed_files=change.LocalPaths(),
431 repository_root=settings.GetRoot(),
432 default_presubmit=None,
433 project=None,
434 verbose=options.verbose,
435 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700436 if masters is None:
437 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000438 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700439
qyearsley1fdfcb62016-10-24 13:22:03 -0700440 if options.bucket:
441 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000442 option_parser.error(
443 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700444
445
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000446def _parse_bucket(bucket):
447 if '/' in bucket:
448 return tuple(bucket.split('/', 1))
449 # Legacy buckets.
450 print('WARNING Please specify buckets as <project>/<bucket>.')
451 # Assume luci.<project>.<bucket>.
452 if bucket.startswith('luci.'):
453 return tuple(bucket[len('luci.'):].split('.', 1))
454 # Otherwise, assume prefix is also the project name.
455 if '.' in bucket:
456 project = bucket.split('.')[0]
457 return project, bucket
458 return None, None
459
460
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800461def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000462 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700463
464 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700465 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000466 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700467 buckets: A nested dict mapping bucket names to builders to tests.
468 options: Command-line options.
469 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000470 print('Scheduling jobs on:')
471 for bucket, builders_and_tests in sorted(buckets.iteritems()):
472 print('Bucket:', bucket)
473 print('\n'.join(
474 ' %s: %s' % (builder, tests)
475 for builder, tests in sorted(builders_and_tests.iteritems())))
476 print('To see results here, run: git cl try-results')
477 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700478
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000479 gerrit_changes = [changelist.GetGerritChange()]
480 shared_properties = {
481 'category': options.category,
482 }
483 if options.clobber:
484 shared_properties['clobber'] = True
485 shared_properties.update(_get_properties_from_options(options) or {})
486
487 requests = []
488 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
489 project, bucket = _parse_bucket(raw_bucket)
490 if not project or not bucket:
491 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
492 continue
493
494 for builder, tests in sorted(builders_and_tests.iteritems()):
495 properties = shared_properties.copy()
496 if 'presubmit' in builder.lower():
497 properties['dry_run'] = 'true'
498 if tests:
499 properties['testfilter'] = tests
500
501 requests.append({
502 'scheduleBuild': {
503 'requestId': str(uuid.uuid4()),
504 'builder': {
505 'project': options.project or project,
506 'bucket': bucket,
507 'builder': builder,
508 },
509 'gerritChanges': gerrit_changes,
510 'properties': properties,
511 'tags': [
512 {'key': 'builder', 'value': builder},
513 {'key': 'user_agent', 'value': 'git_cl_try'},
514 ],
515 }
516 })
517
518 if not requests:
519 return
520
521 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000522 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000523
Edward Lemur2c210a42019-09-16 23:58:35 +0000524 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
525 http = authenticator.authorize(httplib2.Http())
526 http.force_exception_to_status_code = True
527
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000528 batch_request = {'requests': requests}
529 batch_response = _call_buildbucket(
530 http, options.buildbucket_host, 'Batch', request=batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000531
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000532 errors = [
533 ' ' + response['error']['message']
534 for response in batch_response.get('responses', [])
535 if 'error' in response
536 ]
537 if errors:
538 raise BuildbucketResponseException(
539 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000540
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000541
tandrii221ab252016-10-06 08:12:04 -0700542def fetch_try_jobs(auth_config, changelist, buildbucket_host,
543 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000544 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545
qyearsley53f48a12016-09-01 10:45:13 -0700546 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000547 """
tandrii221ab252016-10-06 08:12:04 -0700548 assert buildbucket_host
549 assert changelist.GetIssue(), 'CL must be uploaded first'
550 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
551 patchset = patchset or changelist.GetMostRecentPatchset()
552 assert patchset, 'CL must be uploaded first'
553
554 codereview_url = changelist.GetCodereviewServer()
555 codereview_host = urlparse.urlparse(codereview_url).hostname
556 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 if authenticator.has_cached_credentials():
558 http = authenticator.authorize(httplib2.Http())
559 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700560 print('Warning: Some results might be missing because %s' %
561 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700562 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 http = httplib2.Http()
564
565 http.force_exception_to_status_code = True
566
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000567 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700568 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700570 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 params = {'tag': 'buildset:%s' % buildset}
572
573 builds = {}
574 while True:
575 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700576 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000578 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 for build in content.get('builds', []):
580 builds[build['id']] = build
581 if 'next_cursor' in content:
582 params['start_cursor'] = content['next_cursor']
583 else:
584 break
585 return builds
586
587
qyearsleyeab3c042016-08-24 09:18:28 -0700588def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589 """Prints nicely result of fetch_try_jobs."""
590 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000591 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 return
593
594 # Make a copy, because we'll be modifying builds dictionary.
595 builds = builds.copy()
596 builder_names_cache = {}
597
598 def get_builder(b):
599 try:
600 return builder_names_cache[b['id']]
601 except KeyError:
602 try:
603 parameters = json.loads(b['parameters_json'])
604 name = parameters['builder_name']
605 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700606 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700607 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 name = None
609 builder_names_cache[b['id']] = name
610 return name
611
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 if options.print_master:
613 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000614 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 max(len(str(get_builder(b))) for b in builds.itervalues()))
616 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000617 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000618 else:
619 name_fmt = '%%-%ds' % (
620 max(len(str(get_builder(b))) for b in builds.itervalues()))
621 def get_name(b):
622 return name_fmt % get_builder(b)
623
624 def sort_key(b):
625 return b['status'], b.get('result'), get_name(b), b.get('url')
626
627 def pop(title, f, color=None, **kwargs):
628 """Pop matching builds from `builds` dict and print them."""
629
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000630 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 colorize = str
632 else:
633 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
634
635 result = []
636 for b in builds.values():
637 if all(b.get(k) == v for k, v in kwargs.iteritems()):
638 builds.pop(b['id'])
639 result.append(b)
640 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700641 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000642 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700643 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000644
645 total = len(builds)
646 pop(status='COMPLETED', result='SUCCESS',
647 title='Successes:', color=Fore.GREEN,
648 f=lambda b: (get_name(b), b.get('url')))
649 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
650 title='Infra Failures:', color=Fore.MAGENTA,
651 f=lambda b: (get_name(b), b.get('url')))
652 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
653 title='Failures:', color=Fore.RED,
654 f=lambda b: (get_name(b), b.get('url')))
655 pop(status='COMPLETED', result='CANCELED',
656 title='Canceled:', color=Fore.MAGENTA,
657 f=lambda b: (get_name(b),))
658 pop(status='COMPLETED', result='FAILURE',
659 failure_reason='INVALID_BUILD_DEFINITION',
660 title='Wrong master/builder name:', color=Fore.MAGENTA,
661 f=lambda b: (get_name(b),))
662 pop(status='COMPLETED', result='FAILURE',
663 title='Other failures:',
664 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
665 pop(status='COMPLETED',
666 title='Other finished:',
667 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
668 pop(status='STARTED',
669 title='Started:', color=Fore.YELLOW,
670 f=lambda b: (get_name(b), b.get('url')))
671 pop(status='SCHEDULED',
672 title='Scheduled:',
673 f=lambda b: (get_name(b), 'id=%s' % b['id']))
674 # The last section is just in case buildbucket API changes OR there is a bug.
675 pop(title='Other:',
676 f=lambda b: (get_name(b), 'id=%s' % b['id']))
677 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000678 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000679
680
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681def _ComputeDiffLineRanges(files, upstream_commit):
682 """Gets the changed line ranges for each file since upstream_commit.
683
684 Parses a git diff on provided files and returns a dict that maps a file name
685 to an ordered list of range tuples in the form (start_line, count).
686 Ranges are in the same format as a git diff.
687 """
688 # If files is empty then diff_output will be a full diff.
689 if len(files) == 0:
690 return {}
691
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000692 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
694 diff_output = RunGit(diff_cmd)
695
696 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
697 # 2 capture groups
698 # 0 == fname of diff file
699 # 1 == 'diff_start,diff_count' or 'diff_start'
700 # will match each of
701 # diff --git a/foo.foo b/foo.py
702 # @@ -12,2 +14,3 @@
703 # @@ -12,2 +17 @@
704 # running re.findall on the above string with pattern will give
705 # [('foo.py', ''), ('', '14,3'), ('', '17')]
706
707 curr_file = None
708 line_diffs = {}
709 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
710 if match[0] != '':
711 # Will match the second filename in diff --git a/a.py b/b.py.
712 curr_file = match[0]
713 line_diffs[curr_file] = []
714 else:
715 # Matches +14,3
716 if ',' in match[1]:
717 diff_start, diff_count = match[1].split(',')
718 else:
719 # Single line changes are of the form +12 instead of +12,1.
720 diff_start = match[1]
721 diff_count = 1
722
723 diff_start = int(diff_start)
724 diff_count = int(diff_count)
725
726 # If diff_count == 0 this is a removal we can ignore.
727 line_diffs[curr_file].append((diff_start, diff_count))
728
729 return line_diffs
730
731
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000732def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000733 """Checks if a yapf file is in any parent directory of fpath until top_dir.
734
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000735 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000736 is found returns None. Uses yapf_config_cache as a cache for previously found
737 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000738 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000740 # Return result if we've already computed it.
741 if fpath in yapf_config_cache:
742 return yapf_config_cache[fpath]
743
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000744 parent_dir = os.path.dirname(fpath)
745 if os.path.isfile(fpath):
746 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000747 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000748 # Otherwise fpath is a directory
749 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
750 if os.path.isfile(yapf_file):
751 ret = yapf_file
752 elif fpath == top_dir or parent_dir == fpath:
753 # If we're at the top level directory, or if we're at root
754 # there is no provided style.
755 ret = None
756 else:
757 # Otherwise recurse on the current directory.
758 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000759 yapf_config_cache[fpath] = ret
760 return ret
761
762
qyearsley53f48a12016-09-01 10:45:13 -0700763def write_try_results_json(output_file, builds):
764 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
765
766 The input |builds| dict is assumed to be generated by Buildbucket.
767 Buildbucket documentation: http://goo.gl/G0s101
768 """
769
770 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800771 """Extracts some of the information from one build dict."""
772 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700773 return {
774 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700775 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800776 'builder_name': parameters.get('builder_name'),
777 'created_ts': build.get('created_ts'),
778 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700779 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800780 'result': build.get('result'),
781 'status': build.get('status'),
782 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700783 'url': build.get('url'),
784 }
785
786 converted = []
787 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000788 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700789 write_json(output_file, converted)
790
791
Aaron Gable13101a62018-02-09 13:20:41 -0800792def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000793 """Prints statistics about the change to the user."""
794 # --no-ext-diff is broken in some versions of Git, so try to work around
795 # this by overriding the environment (but there is still a problem if the
796 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000797 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000798 if 'GIT_EXTERNAL_DIFF' in env:
799 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000800
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000801 try:
802 stdout = sys.stdout.fileno()
803 except AttributeError:
804 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000805 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800806 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000807 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000808
809
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000810class BuildbucketResponseException(Exception):
811 pass
812
813
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814class Settings(object):
815 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000817 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000818 self.tree_status_url = None
819 self.viewvc_url = None
820 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000821 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000822 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000823 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000824 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000825
826 def LazyUpdateIfNeeded(self):
827 """Updates the settings from a codereview.settings file, if available."""
828 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000829 # The only value that actually changes the behavior is
830 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000831 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000832 error_ok=True
833 ).strip().lower()
834
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000836 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000837 LoadCodereviewSettingsFromFile(cr_settings_file)
838 self.updated = True
839
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000840 @staticmethod
841 def GetRelativeRoot():
842 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000843
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000845 if self.root is None:
846 self.root = os.path.abspath(self.GetRelativeRoot())
847 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000848
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000849 def GetTreeStatusUrl(self, error_ok=False):
850 if not self.tree_status_url:
851 error_message = ('You must configure your tree status URL by running '
852 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000853 self.tree_status_url = self._GetConfig(
854 'rietveld.tree-status-url', error_ok=error_ok,
855 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 return self.tree_status_url
857
858 def GetViewVCUrl(self):
859 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000860 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000861 return self.viewvc_url
862
rmistry@google.com90752582014-01-14 21:04:50 +0000863 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000864 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000865
rmistry@google.com5626a922015-02-26 14:03:30 +0000866 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000867 run_post_upload_hook = self._GetConfig(
868 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000869 return run_post_upload_hook == "True"
870
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000871 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000872 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000873
ukai@chromium.orge8077812012-02-03 03:41:46 +0000874 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000875 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000876 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700877 self.is_gerrit = (
878 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000879 return self.is_gerrit
880
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000881 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000882 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000883 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700884 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
885 if self.squash_gerrit_uploads is None:
886 # Default is squash now (http://crbug.com/611892#c23).
887 self.squash_gerrit_uploads = not (
888 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
889 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000890 return self.squash_gerrit_uploads
891
tandriia60502f2016-06-20 02:01:53 -0700892 def GetSquashGerritUploadsOverride(self):
893 """Return True or False if codereview.settings should be overridden.
894
895 Returns None if no override has been defined.
896 """
897 # See also http://crbug.com/611892#c23
898 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
899 error_ok=True).strip()
900 if result == 'true':
901 return True
902 if result == 'false':
903 return False
904 return None
905
tandrii@chromium.org28253532016-04-14 13:46:56 +0000906 def GetGerritSkipEnsureAuthenticated(self):
907 """Return True if EnsureAuthenticated should not be done for Gerrit
908 uploads."""
909 if self.gerrit_skip_ensure_authenticated is None:
910 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000911 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000912 error_ok=True).strip() == 'true')
913 return self.gerrit_skip_ensure_authenticated
914
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000915 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000916 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000917 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000918 # Git requires single quotes for paths with spaces. We need to replace
919 # them with double quotes for Windows to treat such paths as a single
920 # path.
921 self.git_editor = self._GetConfig(
922 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000923 return self.git_editor or None
924
thestig@chromium.org44202a22014-03-11 19:22:18 +0000925 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000926 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000927 DEFAULT_LINT_REGEX)
928
929 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000930 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000931 DEFAULT_LINT_IGNORE_REGEX)
932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933 def _GetConfig(self, param, **kwargs):
934 self.LazyUpdateIfNeeded()
935 return RunGit(['config', param], **kwargs).strip()
936
937
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100938@contextlib.contextmanager
939def _get_gerrit_project_config_file(remote_url):
940 """Context manager to fetch and store Gerrit's project.config from
941 refs/meta/config branch and store it in temp file.
942
943 Provides a temporary filename or None if there was error.
944 """
945 error, _ = RunGitWithCode([
946 'fetch', remote_url,
947 '+refs/meta/config:refs/git_cl/meta/config'])
948 if error:
949 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700950 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100951 (remote_url, error))
952 yield None
953 return
954
955 error, project_config_data = RunGitWithCode(
956 ['show', 'refs/git_cl/meta/config:project.config'])
957 if error:
958 print('WARNING: project.config file not found')
959 yield None
960 return
961
962 with gclient_utils.temporary_directory() as tempdir:
963 project_config_file = os.path.join(tempdir, 'project.config')
964 gclient_utils.FileWrite(project_config_file, project_config_data)
965 yield project_config_file
966
967
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000968def ShortBranchName(branch):
969 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000970 return branch.replace('refs/heads/', '', 1)
971
972
973def GetCurrentBranchRef():
974 """Returns branch ref (e.g., refs/heads/master) or None."""
975 return RunGit(['symbolic-ref', 'HEAD'],
976 stderr=subprocess2.VOID, error_ok=True).strip() or None
977
978
979def GetCurrentBranch():
980 """Returns current branch or None.
981
982 For refs/heads/* branches, returns just last part. For others, full ref.
983 """
984 branchref = GetCurrentBranchRef()
985 if branchref:
986 return ShortBranchName(branchref)
987 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988
989
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000990class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000991 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000992 NONE = 'none'
993 DRY_RUN = 'dry_run'
994 COMMIT = 'commit'
995
996 ALL_STATES = [NONE, DRY_RUN, COMMIT]
997
998
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000999class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001000 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001001 self.issue = issue
1002 self.patchset = patchset
1003 self.hostname = hostname
1004
1005 @property
1006 def valid(self):
1007 return self.issue is not None
1008
1009
Edward Lemurf38bc172019-09-03 21:02:13 +00001010def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001011 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1012 fail_result = _ParsedIssueNumberArgument()
1013
1014 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001015 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 if not arg.startswith('http'):
1017 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001018
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001019 url = gclient_utils.UpgradeToHttps(arg)
1020 try:
1021 parsed_url = urlparse.urlparse(url)
1022 except ValueError:
1023 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001024
Edward Lemur125d60a2019-09-13 18:25:41 +00001025 return Changelist.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001026
1027
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001028def _create_description_from_log(args):
1029 """Pulls out the commit log to use as a base for the CL description."""
1030 log_args = []
1031 if len(args) == 1 and not args[0].endswith('.'):
1032 log_args = [args[0] + '..']
1033 elif len(args) == 1 and args[0].endswith('...'):
1034 log_args = [args[0][:-1]]
1035 elif len(args) == 2:
1036 log_args = [args[0] + '..' + args[1]]
1037 else:
1038 log_args = args[:] # Hope for the best!
1039 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1040
1041
Aaron Gablea45ee112016-11-22 15:14:38 -08001042class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001043 def __init__(self, issue, url):
1044 self.issue = issue
1045 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001046 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001047
1048 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001049 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001050 self.issue, self.url)
1051
1052
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001053_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001054 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001055 # TODO(tandrii): these two aren't known in Gerrit.
1056 'approval', 'disapproval'])
1057
1058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001060 """Changelist works with one changelist in local branch.
1061
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001062 Notes:
1063 * Not safe for concurrent multi-{thread,process} use.
1064 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001065 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001066 """
1067
Edward Lemur125d60a2019-09-13 18:25:41 +00001068 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001069 """Create a new ChangeList instance.
1070
Edward Lemurf38bc172019-09-03 21:02:13 +00001071 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001072 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001073 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001074 global settings
1075 if not settings:
1076 # Happens when git_cl.py is used as a utility library.
1077 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001078
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001079 self.branchref = branchref
1080 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001081 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 self.branch = ShortBranchName(self.branchref)
1083 else:
1084 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001086 self.lookedup_issue = False
1087 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088 self.has_description = False
1089 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001090 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001091 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001092 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001093 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001094 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001095 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001096
Edward Lemur125d60a2019-09-13 18:25:41 +00001097 self._change_id = None
1098 # Lazily cached values.
1099 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1100 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1101 # Map from change number (issue) to its detail cache.
1102 self._detail_cache = {}
1103
1104 if codereview_host is not None:
1105 assert not codereview_host.startswith('https://'), codereview_host
1106 self._gerrit_host = codereview_host
1107 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001108
1109 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001110 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001111
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001112 The return value is a string suitable for passing to git cl with the --cc
1113 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001114 """
1115 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001116 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001117 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001118 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1119 return self.cc
1120
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001121 def GetCCListWithoutDefault(self):
1122 """Return the users cc'd on this CL excluding default ones."""
1123 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001124 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001125 return self.cc
1126
Daniel Cheng7227d212017-11-17 08:12:37 -08001127 def ExtendCC(self, more_cc):
1128 """Extends the list of users to cc on this CL based on the changed files."""
1129 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130
1131 def GetBranch(self):
1132 """Returns the short branch name, e.g. 'master'."""
1133 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001134 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001135 if not branchref:
1136 return None
1137 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.branch = ShortBranchName(self.branchref)
1139 return self.branch
1140
1141 def GetBranchRef(self):
1142 """Returns the full branch name, e.g. 'refs/heads/master'."""
1143 self.GetBranch() # Poke the lazy loader.
1144 return self.branchref
1145
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001146 def ClearBranch(self):
1147 """Clears cached branch data of this object."""
1148 self.branch = self.branchref = None
1149
tandrii5d48c322016-08-18 16:19:37 -07001150 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1151 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1152 kwargs['branch'] = self.GetBranch()
1153 return _git_get_branch_config_value(key, default, **kwargs)
1154
1155 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1156 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1157 assert self.GetBranch(), (
1158 'this CL must have an associated branch to %sset %s%s' %
1159 ('un' if value is None else '',
1160 key,
1161 '' if value is None else ' to %r' % value))
1162 kwargs['branch'] = self.GetBranch()
1163 return _git_set_branch_config_value(key, value, **kwargs)
1164
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 @staticmethod
1166 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001167 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168 e.g. 'origin', 'refs/heads/master'
1169 """
1170 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001171 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1172
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001174 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001175 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001176 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1177 error_ok=True).strip()
1178 if upstream_branch:
1179 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001181 # Else, try to guess the origin remote.
1182 remote_branches = RunGit(['branch', '-r']).split()
1183 if 'origin/master' in remote_branches:
1184 # Fall back on origin/master if it exits.
1185 remote = 'origin'
1186 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001188 DieWithError(
1189 'Unable to determine default branch to diff against.\n'
1190 'Either pass complete "git diff"-style arguments, like\n'
1191 ' git cl upload origin/master\n'
1192 'or verify this branch is set up to track another \n'
1193 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001194
1195 return remote, upstream_branch
1196
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001197 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001198 upstream_branch = self.GetUpstreamBranch()
1199 if not BranchExists(upstream_branch):
1200 DieWithError('The upstream for the current branch (%s) does not exist '
1201 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001202 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001203 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001204
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 def GetUpstreamBranch(self):
1206 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001207 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001208 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001209 upstream_branch = upstream_branch.replace('refs/heads/',
1210 'refs/remotes/%s/' % remote)
1211 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1212 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001213 self.upstream_branch = upstream_branch
1214 return self.upstream_branch
1215
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001216 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001217 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001218 remote, branch = None, self.GetBranch()
1219 seen_branches = set()
1220 while branch not in seen_branches:
1221 seen_branches.add(branch)
1222 remote, branch = self.FetchUpstreamTuple(branch)
1223 branch = ShortBranchName(branch)
1224 if remote != '.' or branch.startswith('refs/remotes'):
1225 break
1226 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001227 remotes = RunGit(['remote'], error_ok=True).split()
1228 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001229 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001230 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001231 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001232 logging.warn('Could not determine which remote this change is '
1233 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001234 else:
1235 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001236 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001237 branch = 'HEAD'
1238 if branch.startswith('refs/remotes'):
1239 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001240 elif branch.startswith('refs/branch-heads/'):
1241 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001242 else:
1243 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001244 return self._remote
1245
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001246 def GitSanityChecks(self, upstream_git_obj):
1247 """Checks git repo status and ensures diff is from local commits."""
1248
sbc@chromium.org79706062015-01-14 21:18:12 +00001249 if upstream_git_obj is None:
1250 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001251 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001252 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001253 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001254 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001255 return False
1256
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 # Verify the commit we're diffing against is in our current branch.
1258 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1259 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1260 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001261 print('ERROR: %s is not in the current branch. You may need to rebase '
1262 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001263 return False
1264
1265 # List the commits inside the diff, and verify they are all local.
1266 commits_in_diff = RunGit(
1267 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1268 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1269 remote_branch = remote_branch.strip()
1270 if code != 0:
1271 _, remote_branch = self.GetRemoteBranch()
1272
1273 commits_in_remote = RunGit(
1274 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1275
1276 common_commits = set(commits_in_diff) & set(commits_in_remote)
1277 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001278 print('ERROR: Your diff contains %d commits already in %s.\n'
1279 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1280 'the diff. If you are using a custom git flow, you can override'
1281 ' the reference used for this check with "git config '
1282 'gitcl.remotebranch <git-ref>".' % (
1283 len(common_commits), remote_branch, upstream_git_obj),
1284 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 return False
1286 return True
1287
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001288 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001289 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001290
1291 Returns None if it is not set.
1292 """
tandrii5d48c322016-08-18 16:19:37 -07001293 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 def GetRemoteUrl(self):
1296 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1297
1298 Returns None if there is no remote.
1299 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001300 is_cached, value = self._cached_remote_url
1301 if is_cached:
1302 return value
1303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001305 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1306
Edward Lemur298f2cf2019-02-22 21:40:39 +00001307 # Check if the remote url can be parsed as an URL.
1308 host = urlparse.urlparse(url).netloc
1309 if host:
1310 self._cached_remote_url = (True, url)
1311 return url
1312
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001313 # If it cannot be parsed as an url, assume it is a local directory,
1314 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001315 logging.warning('"%s" doesn\'t appear to point to a git host. '
1316 'Interpreting it as a local directory.', url)
1317 if not os.path.isdir(url):
1318 logging.error(
1319 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001320 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001321 return None
1322
1323 cache_path = url
1324 url = RunGit(['config', 'remote.%s.url' % remote],
1325 error_ok=True,
1326 cwd=url).strip()
1327
1328 host = urlparse.urlparse(url).netloc
1329 if not host:
1330 logging.error(
1331 'Remote "%(remote)s" for branch "%(branch)s" points to '
1332 '"%(cache_path)s", but it is misconfigured.\n'
1333 '"%(cache_path)s" must be a git repo and must have a remote named '
1334 '"%(remote)s" pointing to the git host.', {
1335 'remote': remote,
1336 'cache_path': cache_path,
1337 'branch': self.GetBranch()})
1338 return None
1339
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001340 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001341 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001343 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001344 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001345 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001346 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001347 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001348 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001349 return self.issue
1350
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001351 def GetIssueURL(self):
1352 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001353 issue = self.GetIssue()
1354 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001355 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001356 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001357
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001358 def GetDescription(self, pretty=False, force=False):
1359 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001360 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001361 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 self.has_description = True
1363 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001364 # Set width to 72 columns + 2 space indent.
1365 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001366 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001367 lines = self.description.splitlines()
1368 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 return self.description
1370
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001371 def GetDescriptionFooters(self):
1372 """Returns (non_footer_lines, footers) for the commit message.
1373
1374 Returns:
1375 non_footer_lines (list(str)) - Simple list of description lines without
1376 any footer. The lines do not contain newlines, nor does the list contain
1377 the empty line between the message and the footers.
1378 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1379 [("Change-Id", "Ideadbeef...."), ...]
1380 """
1381 raw_description = self.GetDescription()
1382 msg_lines, _, footers = git_footers.split_footers(raw_description)
1383 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001384 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001385 return msg_lines, footers
1386
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001387 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001388 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001389 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001390 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001391 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001392 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 return self.patchset
1394
1395 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001396 """Set this branch's patchset. If patchset=0, clears the patchset."""
1397 assert self.GetBranch()
1398 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001399 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001400 else:
1401 self.patchset = int(patchset)
1402 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001403 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001405 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001406 """Set this branch's issue. If issue isn't given, clears the issue."""
1407 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001409 issue = int(issue)
1410 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001411 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001413 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001414 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001415 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001416 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001417 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 else:
tandrii5d48c322016-08-18 16:19:37 -07001419 # Reset all of these just to be clean.
1420 reset_suffixes = [
1421 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001422 self.IssueConfigKey(),
1423 self.PatchsetConfigKey(),
1424 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001425 ] + self._PostUnsetIssueProperties()
1426 for prop in reset_suffixes:
1427 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001428 msg = RunGit(['log', '-1', '--format=%B']).strip()
1429 if msg and git_footers.get_footer_change_id(msg):
1430 print('WARNING: The change patched into this branch has a Change-Id. '
1431 'Removing it.')
1432 RunGit(['commit', '--amend', '-m',
1433 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001434 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001435 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001436 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437
dnjba1b0f32016-09-02 12:37:42 -07001438 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001439 if not self.GitSanityChecks(upstream_branch):
1440 DieWithError('\nGit sanity check failure')
1441
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001442 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001443 if not root:
1444 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001445 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001446
1447 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001448 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001449 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001450 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001451 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001452 except subprocess2.CalledProcessError:
1453 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001454 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001455 'This branch probably doesn\'t exist anymore. To reset the\n'
1456 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001457 ' git branch --set-upstream-to origin/master %s\n'
1458 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001459 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001460
maruel@chromium.org52424302012-08-29 15:14:30 +00001461 issue = self.GetIssue()
1462 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001463 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001464 description = self.GetDescription()
1465 else:
1466 # If the change was never uploaded, use the log messages of all commits
1467 # up to the branch point, as git cl upload will prefill the description
1468 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001469 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1470 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001471
1472 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001473 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001474 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001475 name,
1476 description,
1477 absroot,
1478 files,
1479 issue,
1480 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001481 author,
1482 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483
dsansomee2d6fd92016-09-08 00:10:47 -07001484 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001485 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001486 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001487 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001488
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001489 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1490 """Sets the description for this CL remotely.
1491
1492 You can get description_lines and footers with GetDescriptionFooters.
1493
1494 Args:
1495 description_lines (list(str)) - List of CL description lines without
1496 newline characters.
1497 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1498 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1499 `List-Of-Tokens`). It will be case-normalized so that each token is
1500 title-cased.
1501 """
1502 new_description = '\n'.join(description_lines)
1503 if footers:
1504 new_description += '\n'
1505 for k, v in footers:
1506 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1507 if not git_footers.FOOTER_PATTERN.match(foot):
1508 raise ValueError('Invalid footer %r' % foot)
1509 new_description += foot + '\n'
1510 self.UpdateDescription(new_description, force)
1511
Edward Lesmes8e282792018-04-03 18:50:29 -04001512 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001513 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1514 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001515 start = time_time()
1516 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1518 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001519 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001520 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001521 metrics.collector.add_repeated('sub_commands', {
1522 'command': 'presubmit',
1523 'execution_time': time_time() - start,
1524 'exit_code': 0 if result.should_continue() else 1,
1525 })
1526 return result
vapierfd77ac72016-06-16 08:33:57 -07001527 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001528 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001529
Edward Lemurf38bc172019-09-03 21:02:13 +00001530 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001531 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001532 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1533 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001534 else:
1535 # Assume url.
Edward Lemur125d60a2019-09-13 18:25:41 +00001536 parsed_issue_arg = self.ParseIssueURL(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001537 urlparse.urlparse(issue_arg))
1538 if not parsed_issue_arg or not parsed_issue_arg.valid:
1539 DieWithError('Failed to parse issue argument "%s". '
1540 'Must be an issue number or a valid URL.' % issue_arg)
Edward Lemur125d60a2019-09-13 18:25:41 +00001541 return self.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001542 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001543
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 def CMDUpload(self, options, git_diff_args, orig_args):
1545 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001546 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001548 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549 else:
1550 if self.GetBranch() is None:
1551 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1552
1553 # Default to diffing against common ancestor of upstream branch
1554 base_branch = self.GetCommonAncestorWithUpstream()
1555 git_diff_args = [base_branch, 'HEAD']
1556
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001557 # Fast best-effort checks to abort before running potentially expensive
1558 # hooks if uploading is likely to fail anyway. Passing these checks does
1559 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001560 self.EnsureAuthenticated(force=options.force)
1561 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562
1563 # Apply watchlists on upload.
1564 change = self.GetChange(base_branch, None)
1565 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1566 files = [f.LocalPath() for f in change.AffectedFiles()]
1567 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001568 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569
1570 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001571 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572 # Set the reviewer list now so that presubmit checks can access it.
1573 change_description = ChangeDescription(change.FullDescriptionText())
1574 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001575 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001576 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001577 change)
1578 change.SetDescriptionText(change_description.description)
1579 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001580 may_prompt=not options.force,
1581 verbose=options.verbose,
1582 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583 if not hook_results.should_continue():
1584 return 1
1585 if not options.reviewers and hook_results.reviewers:
1586 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001587 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001588
Aaron Gable13101a62018-02-09 13:20:41 -08001589 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001590 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001592 _git_set_branch_config_value('last-upload-hash',
1593 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594 # Run post upload hooks, if specified.
1595 if settings.GetRunPostUploadHook():
1596 presubmit_support.DoPostUploadExecuter(
1597 change,
1598 self,
1599 settings.GetRoot(),
1600 options.verbose,
1601 sys.stdout)
1602
1603 # Upload all dependencies if specified.
1604 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001605 print()
1606 print('--dependencies has been specified.')
1607 print('All dependent local branches will be re-uploaded.')
1608 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001609 # Remove the dependencies flag from args so that we do not end up in a
1610 # loop.
1611 orig_args.remove('--dependencies')
1612 ret = upload_branch_deps(self, orig_args)
1613 return ret
1614
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001615 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001616 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001617
1618 Issue must have been already uploaded and known.
1619 """
1620 assert new_state in _CQState.ALL_STATES
1621 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001622 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001623 vote_map = {
1624 _CQState.NONE: 0,
1625 _CQState.DRY_RUN: 1,
1626 _CQState.COMMIT: 2,
1627 }
1628 labels = {'Commit-Queue': vote_map[new_state]}
1629 notify = False if new_state == _CQState.DRY_RUN else None
1630 gerrit_util.SetReview(
1631 self._GetGerritHost(), self._GerritChangeIdentifier(),
1632 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001633 return 0
1634 except KeyboardInterrupt:
1635 raise
1636 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001637 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001638 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001639 ' * Your project has no CQ,\n'
1640 ' * You don\'t have permission to change the CQ state,\n'
1641 ' * There\'s a bug in this code (see stack trace below).\n'
1642 'Consider specifying which bots to trigger manually or asking your '
1643 'project owners for permissions or contacting Chrome Infra at:\n'
1644 'https://www.chromium.org/infra\n\n' %
1645 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001646 # Still raise exception so that stack trace is printed.
1647 raise
1648
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001649 def _GetGerritHost(self):
1650 # Lazy load of configs.
1651 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001652 if self._gerrit_host and '.' not in self._gerrit_host:
1653 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1654 # This happens for internal stuff http://crbug.com/614312.
1655 parsed = urlparse.urlparse(self.GetRemoteUrl())
1656 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001657 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001658 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001659 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1660 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001661 return self._gerrit_host
1662
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001663 def _GetGitHost(self):
1664 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001665 remote_url = self.GetRemoteUrl()
1666 if not remote_url:
1667 return None
1668 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001669
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001670 def GetCodereviewServer(self):
1671 if not self._gerrit_server:
1672 # If we're on a branch then get the server potentially associated
1673 # with that branch.
1674 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001675 self._gerrit_server = self._GitGetBranchConfigValue(
1676 self.CodereviewServerConfigKey())
1677 if self._gerrit_server:
1678 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001679 if not self._gerrit_server:
1680 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1681 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001682 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001683 parts[0] = parts[0] + '-review'
1684 self._gerrit_host = '.'.join(parts)
1685 self._gerrit_server = 'https://%s' % self._gerrit_host
1686 return self._gerrit_server
1687
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001688 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001689 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001690 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001691 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001692 logging.warn('can\'t detect Gerrit project.')
1693 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001694 project = urlparse.urlparse(remote_url).path.strip('/')
1695 if project.endswith('.git'):
1696 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001697 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1698 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1699 # gitiles/git-over-https protocol. E.g.,
1700 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1701 # as
1702 # https://chromium.googlesource.com/v8/v8
1703 if project.startswith('a/'):
1704 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001705 return project
1706
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001707 def _GerritChangeIdentifier(self):
1708 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1709
1710 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001711 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001712 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001713 project = self._GetGerritProject()
1714 if project:
1715 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1716 # Fall back on still unique, but less efficient change number.
1717 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001718
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001719 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001720 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001721 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001722
tandrii5d48c322016-08-18 16:19:37 -07001723 @classmethod
1724 def PatchsetConfigKey(cls):
1725 return 'gerritpatchset'
1726
1727 @classmethod
1728 def CodereviewServerConfigKey(cls):
1729 return 'gerritserver'
1730
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001731 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001732 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001733 if settings.GetGerritSkipEnsureAuthenticated():
1734 # For projects with unusual authentication schemes.
1735 # See http://crbug.com/603378.
1736 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001737
1738 # Check presence of cookies only if using cookies-based auth method.
1739 cookie_auth = gerrit_util.Authenticator.get()
1740 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001741 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001742
Daniel Chengcf6269b2019-05-18 01:02:12 +00001743 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1744 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001745 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001746 return
1747
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001749 self.GetCodereviewServer()
1750 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001751 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001752
1753 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1754 git_auth = cookie_auth.get_auth_header(git_host)
1755 if gerrit_auth and git_auth:
1756 if gerrit_auth == git_auth:
1757 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001758 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001759 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001760 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001761 ' %s\n'
1762 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001763 ' Consider running the following command:\n'
1764 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001765 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001766 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001767 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001768 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769 cookie_auth.get_new_password_message(git_host)))
1770 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001771 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001772 return
1773 else:
1774 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001775 ([] if gerrit_auth else [self._gerrit_host]) +
1776 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001777 DieWithError('Credentials for the following hosts are required:\n'
1778 ' %s\n'
1779 'These are read from %s (or legacy %s)\n'
1780 '%s' % (
1781 '\n '.join(missing),
1782 cookie_auth.get_gitcookies_path(),
1783 cookie_auth.get_netrc_path(),
1784 cookie_auth.get_new_password_message(git_host)))
1785
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001786 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001787 if not self.GetIssue():
1788 return
1789
1790 # Warm change details cache now to avoid RPCs later, reducing latency for
1791 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001792 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001793 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001794
1795 status = self._GetChangeDetail()['status']
1796 if status in ('MERGED', 'ABANDONED'):
1797 DieWithError('Change %s has been %s, new uploads are not allowed' %
1798 (self.GetIssueURL(),
1799 'submitted' if status == 'MERGED' else 'abandoned'))
1800
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001801 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1802 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1803 # Apparently this check is not very important? Otherwise get_auth_email
1804 # could have been added to other implementations of Authenticator.
1805 cookies_auth = gerrit_util.Authenticator.get()
1806 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001807 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001808
1809 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001810 if self.GetIssueOwner() == cookies_user:
1811 return
1812 logging.debug('change %s owner is %s, cookies user is %s',
1813 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001814 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001815 # so ask what Gerrit thinks of this user.
1816 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1817 if details['email'] == self.GetIssueOwner():
1818 return
1819 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001820 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001821 'as %s.\n'
1822 'Uploading may fail due to lack of permissions.' %
1823 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1824 confirm_or_exit(action='upload')
1825
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001826 def _PostUnsetIssueProperties(self):
1827 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001828 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001829
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001830 def GetGerritObjForPresubmit(self):
1831 return presubmit_support.GerritAccessor(self._GetGerritHost())
1832
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001834 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001835 or CQ status, assuming adherence to a common workflow.
1836
1837 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001838 * 'error' - error from review tool (including deleted issues)
1839 * 'unsent' - no reviewers added
1840 * 'waiting' - waiting for review
1841 * 'reply' - waiting for uploader to reply to review
1842 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001843 * 'dry-run' - dry-running in the CQ
1844 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001845 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001846 """
1847 if not self.GetIssue():
1848 return None
1849
1850 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001851 data = self._GetChangeDetail([
1852 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001853 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001854 return 'error'
1855
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001856 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001857 return 'closed'
1858
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001859 cq_label = data['labels'].get('Commit-Queue', {})
1860 max_cq_vote = 0
1861 for vote in cq_label.get('all', []):
1862 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1863 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001864 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001865 if max_cq_vote == 1:
1866 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001867
Aaron Gable9ab38c62017-04-06 14:36:33 -07001868 if data['labels'].get('Code-Review', {}).get('approved'):
1869 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001870
1871 if not data.get('reviewers', {}).get('REVIEWER', []):
1872 return 'unsent'
1873
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001874 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001875 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1876 last_message_author = messages.pop().get('author', {})
1877 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001878 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1879 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001880 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001881 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001882 if last_message_author.get('_account_id') == owner:
1883 # Most recent message was by owner.
1884 return 'waiting'
1885 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001886 # Some reply from non-owner.
1887 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001888
1889 # Somehow there are no messages even though there are reviewers.
1890 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001891
1892 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001893 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001894 patchset = data['revisions'][data['current_revision']]['_number']
1895 self.SetPatchset(patchset)
1896 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001898 def FetchDescription(self, force=False):
1899 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1900 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001901 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001902 return data['revisions'][current_rev]['commit']['message'].encode(
1903 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001904
dsansomee2d6fd92016-09-08 00:10:47 -07001905 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001906 if gerrit_util.HasPendingChangeEdit(
1907 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001908 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001909 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001910 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001911 'unpublished edit. Either publish the edit in the Gerrit web UI '
1912 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001913
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001914 gerrit_util.DeletePendingChangeEdit(
1915 self._GetGerritHost(), self._GerritChangeIdentifier())
1916 gerrit_util.SetCommitMessage(
1917 self._GetGerritHost(), self._GerritChangeIdentifier(),
1918 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919
Aaron Gable636b13f2017-07-14 10:42:48 -07001920 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001921 gerrit_util.SetReview(
1922 self._GetGerritHost(), self._GerritChangeIdentifier(),
1923 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001924
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001925 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001926 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001927 # CURRENT_REVISION is included to get the latest patchset so that
1928 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001929 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001930 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1931 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001932 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001933 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001934 robot_file_comments = gerrit_util.GetChangeRobotComments(
1935 self._GetGerritHost(), self._GerritChangeIdentifier())
1936
1937 # Add the robot comments onto the list of comments, but only
1938 # keep those that are from the latest pachset.
1939 latest_patch_set = self.GetMostRecentPatchset()
1940 for path, robot_comments in robot_file_comments.iteritems():
1941 line_comments = file_comments.setdefault(path, [])
1942 line_comments.extend(
1943 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001944
1945 # Build dictionary of file comments for easy access and sorting later.
1946 # {author+date: {path: {patchset: {line: url+message}}}}
1947 comments = collections.defaultdict(
1948 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1949 for path, line_comments in file_comments.iteritems():
1950 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001951 tag = comment.get('tag', '')
1952 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001953 continue
1954 key = (comment['author']['email'], comment['updated'])
1955 if comment.get('side', 'REVISION') == 'PARENT':
1956 patchset = 'Base'
1957 else:
1958 patchset = 'PS%d' % comment['patch_set']
1959 line = comment.get('line', 0)
1960 url = ('https://%s/c/%s/%s/%s#%s%s' %
1961 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1962 'b' if comment.get('side') == 'PARENT' else '',
1963 str(line) if line else ''))
1964 comments[key][path][patchset][line] = (url, comment['message'])
1965
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001966 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001967 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001968 summary = self._BuildCommentSummary(msg, comments, readable)
1969 if summary:
1970 summaries.append(summary)
1971 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001972
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001973 @staticmethod
1974 def _BuildCommentSummary(msg, comments, readable):
1975 key = (msg['author']['email'], msg['date'])
1976 # Don't bother showing autogenerated messages that don't have associated
1977 # file or line comments. this will filter out most autogenerated
1978 # messages, but will keep robot comments like those from Tricium.
1979 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1980 if is_autogenerated and not comments.get(key):
1981 return None
1982 message = msg['message']
1983 # Gerrit spits out nanoseconds.
1984 assert len(msg['date'].split('.')[-1]) == 9
1985 date = datetime.datetime.strptime(msg['date'][:-3],
1986 '%Y-%m-%d %H:%M:%S.%f')
1987 if key in comments:
1988 message += '\n'
1989 for path, patchsets in sorted(comments.get(key, {}).items()):
1990 if readable:
1991 message += '\n%s' % path
1992 for patchset, lines in sorted(patchsets.items()):
1993 for line, (url, content) in sorted(lines.items()):
1994 if line:
1995 line_str = 'Line %d' % line
1996 path_str = '%s:%d:' % (path, line)
1997 else:
1998 line_str = 'File comment'
1999 path_str = '%s:0:' % path
2000 if readable:
2001 message += '\n %s, %s: %s' % (patchset, line_str, url)
2002 message += '\n %s\n' % content
2003 else:
2004 message += '\n%s ' % path_str
2005 message += '\n%s\n' % content
2006
2007 return _CommentSummary(
2008 date=date,
2009 message=message,
2010 sender=msg['author']['email'],
2011 autogenerated=is_autogenerated,
2012 # These could be inferred from the text messages and correlated with
2013 # Code-Review label maximum, however this is not reliable.
2014 # Leaving as is until the need arises.
2015 approval=False,
2016 disapproval=False,
2017 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002018
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002019 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002020 gerrit_util.AbandonChange(
2021 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002022
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002023 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002024 gerrit_util.SubmitChange(
2025 self._GetGerritHost(), self._GerritChangeIdentifier(),
2026 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002027
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002028 def _GetChangeDetail(self, options=None, no_cache=False):
2029 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002030
2031 If fresh data is needed, set no_cache=True which will clear cache and
2032 thus new data will be fetched from Gerrit.
2033 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002034 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002035 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002036
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002037 # Optimization to avoid multiple RPCs:
2038 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2039 'CURRENT_COMMIT' not in options):
2040 options.append('CURRENT_COMMIT')
2041
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002042 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002043 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002044 options = [o.upper() for o in options]
2045
2046 # Check in cache first unless no_cache is True.
2047 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002048 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049 else:
2050 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002051 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002052 # Assumption: data fetched before with extra options is suitable
2053 # for return for a smaller set of options.
2054 # For example, if we cached data for
2055 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2056 # and request is for options=[CURRENT_REVISION],
2057 # THEN we can return prior cached data.
2058 if options_set.issubset(cached_options_set):
2059 return data
2060
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002061 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002062 data = gerrit_util.GetChangeDetail(
2063 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002064 except gerrit_util.GerritError as e:
2065 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002066 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002067 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002068
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002069 self._detail_cache.setdefault(cache_key, []).append(
2070 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002071 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002072
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002073 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002074 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002075 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002076 data = gerrit_util.GetChangeCommit(
2077 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002078 except gerrit_util.GerritError as e:
2079 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002080 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002081 raise
agable32978d92016-11-01 12:55:02 -07002082 return data
2083
Karen Qian40c19422019-03-13 21:28:29 +00002084 def _IsCqConfigured(self):
2085 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002086 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002087 return False
2088 # TODO(crbug/753213): Remove temporary hack
2089 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002090 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002091 detail['branch'].startswith('refs/branch-heads/')):
2092 return False
2093 return True
2094
Olivier Robin75ee7252018-04-13 10:02:56 +02002095 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002096 if git_common.is_dirty_git_tree('land'):
2097 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002098
tandriid60367b2016-06-22 05:25:12 -07002099 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002100 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002101 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002102 'which can test and land changes for you. '
2103 'Are you sure you wish to bypass it?\n',
2104 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002105 differs = True
tandriic4344b52016-08-29 06:04:54 -07002106 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002107 # Note: git diff outputs nothing if there is no diff.
2108 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002109 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002110 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002111 if detail['current_revision'] == last_upload:
2112 differs = False
2113 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002114 print('WARNING: Local branch contents differ from latest uploaded '
2115 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002116 if differs:
2117 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002118 confirm_or_exit(
2119 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2120 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002122 elif not bypass_hooks:
2123 hook_results = self.RunHook(
2124 committing=True,
2125 may_prompt=not force,
2126 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002127 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2128 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002129 if not hook_results.should_continue():
2130 return 1
2131
2132 self.SubmitIssue(wait_for_merge=True)
2133 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002134 links = self._GetChangeCommit().get('web_links', [])
2135 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002136 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002137 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002138 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002139 return 0
2140
Edward Lemurf38bc172019-09-03 21:02:13 +00002141 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142 assert parsed_issue_arg.valid
2143
Edward Lemur125d60a2019-09-13 18:25:41 +00002144 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002145
2146 if parsed_issue_arg.hostname:
2147 self._gerrit_host = parsed_issue_arg.hostname
2148 self._gerrit_server = 'https://%s' % self._gerrit_host
2149
tandriic2405f52016-10-10 08:13:15 -07002150 try:
2151 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002152 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002153 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154
2155 if not parsed_issue_arg.patchset:
2156 # Use current revision by default.
2157 revision_info = detail['revisions'][detail['current_revision']]
2158 patchset = int(revision_info['_number'])
2159 else:
2160 patchset = parsed_issue_arg.patchset
2161 for revision_info in detail['revisions'].itervalues():
2162 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2163 break
2164 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002165 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002166 (parsed_issue_arg.patchset, self.GetIssue()))
2167
Edward Lemur125d60a2019-09-13 18:25:41 +00002168 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002169 if remote_url.endswith('.git'):
2170 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002171 remote_url = remote_url.rstrip('/')
2172
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002173 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002174 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002175
2176 if remote_url != fetch_info['url']:
2177 DieWithError('Trying to patch a change from %s but this repo appears '
2178 'to be %s.' % (fetch_info['url'], remote_url))
2179
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002181
Aaron Gable62619a32017-06-16 08:22:09 -07002182 if force:
2183 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2184 print('Checked out commit for change %i patchset %i locally' %
2185 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002186 elif nocommit:
2187 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2188 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002189 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002190 RunGit(['cherry-pick', 'FETCH_HEAD'])
2191 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002192 (parsed_issue_arg.issue, patchset))
2193 print('Note: this created a local commit which does not have '
2194 'the same hash as the one uploaded for review. This will make '
2195 'uploading changes based on top of this branch difficult.\n'
2196 'If you want to do that, use "git cl patch --force" instead.')
2197
Stefan Zagerd08043c2017-10-12 12:07:02 -07002198 if self.GetBranch():
2199 self.SetIssue(parsed_issue_arg.issue)
2200 self.SetPatchset(patchset)
2201 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2202 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2203 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2204 else:
2205 print('WARNING: You are in detached HEAD state.\n'
2206 'The patch has been applied to your checkout, but you will not be '
2207 'able to upload a new patch set to the gerrit issue.\n'
2208 'Try using the \'-b\' option if you would like to work on a '
2209 'branch and/or upload a new patch set.')
2210
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002211 return 0
2212
2213 @staticmethod
2214 def ParseIssueURL(parsed_url):
2215 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2216 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002217 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2218 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002219 # Short urls like https://domain/<issue_number> can be used, but don't allow
2220 # specifying the patchset (you'd 404), but we allow that here.
2221 if parsed_url.path == '/':
2222 part = parsed_url.fragment
2223 else:
2224 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002225 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002226 if match:
2227 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002228 issue=int(match.group(3)),
2229 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002230 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002231 return None
2232
tandrii16e0b4e2016-06-07 10:34:28 -07002233 def _GerritCommitMsgHookCheck(self, offer_removal):
2234 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2235 if not os.path.exists(hook):
2236 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002237 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2238 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002239 data = gclient_utils.FileRead(hook)
2240 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2241 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002242 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002243 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002244 'and may interfere with it in subtle ways.\n'
2245 'We recommend you remove the commit-msg hook.')
2246 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002247 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002248 gclient_utils.rm_file_or_tree(hook)
2249 print('Gerrit commit-msg hook removed.')
2250 else:
2251 print('OK, will keep Gerrit commit-msg hook in place.')
2252
Edward Lemur1b52d872019-05-09 21:12:12 +00002253 def _CleanUpOldTraces(self):
2254 """Keep only the last |MAX_TRACES| traces."""
2255 try:
2256 traces = sorted([
2257 os.path.join(TRACES_DIR, f)
2258 for f in os.listdir(TRACES_DIR)
2259 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2260 and not f.startswith('tmp'))
2261 ])
2262 traces_to_delete = traces[:-MAX_TRACES]
2263 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002264 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002265 except OSError:
2266 print('WARNING: Failed to remove old git traces from\n'
2267 ' %s'
2268 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002269
Edward Lemur5737f022019-05-17 01:24:00 +00002270 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002271 """Zip and write the git push traces stored in traces_dir."""
2272 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002273 traces_zip = trace_name + '-traces'
2274 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002275 # Create a temporary dir to store git config and gitcookies in. It will be
2276 # compressed and stored next to the traces.
2277 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002278 git_info_zip = trace_name + '-git-info'
2279
Edward Lemur5737f022019-05-17 01:24:00 +00002280 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002281 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002282 git_push_metadata['now'] = git_push_metadata['now'].decode(
2283 sys.stdin.encoding)
2284
Edward Lemur1b52d872019-05-09 21:12:12 +00002285 git_push_metadata['trace_name'] = trace_name
2286 gclient_utils.FileWrite(
2287 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2288
2289 # Keep only the first 6 characters of the git hashes on the packet
2290 # trace. This greatly decreases size after compression.
2291 packet_traces = os.path.join(traces_dir, 'trace-packet')
2292 if os.path.isfile(packet_traces):
2293 contents = gclient_utils.FileRead(packet_traces)
2294 gclient_utils.FileWrite(
2295 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2296 shutil.make_archive(traces_zip, 'zip', traces_dir)
2297
2298 # Collect and compress the git config and gitcookies.
2299 git_config = RunGit(['config', '-l'])
2300 gclient_utils.FileWrite(
2301 os.path.join(git_info_dir, 'git-config'),
2302 git_config)
2303
2304 cookie_auth = gerrit_util.Authenticator.get()
2305 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2306 gitcookies_path = cookie_auth.get_gitcookies_path()
2307 if os.path.isfile(gitcookies_path):
2308 gitcookies = gclient_utils.FileRead(gitcookies_path)
2309 gclient_utils.FileWrite(
2310 os.path.join(git_info_dir, 'gitcookies'),
2311 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2312 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2313
Edward Lemur1b52d872019-05-09 21:12:12 +00002314 gclient_utils.rmtree(git_info_dir)
2315
2316 def _RunGitPushWithTraces(
2317 self, change_desc, refspec, refspec_opts, git_push_metadata):
2318 """Run git push and collect the traces resulting from the execution."""
2319 # Create a temporary directory to store traces in. Traces will be compressed
2320 # and stored in a 'traces' dir inside depot_tools.
2321 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002322 trace_name = os.path.join(
2323 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002324
2325 env = os.environ.copy()
2326 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2327 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002328 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002329 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2330 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2331 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2332
2333 try:
2334 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002335 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002336 before_push = time_time()
2337 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002338 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002339 env=env,
2340 print_stdout=True,
2341 # Flush after every line: useful for seeing progress when running as
2342 # recipe.
2343 filter_fn=lambda _: sys.stdout.flush())
2344 except subprocess2.CalledProcessError as e:
2345 push_returncode = e.returncode
2346 DieWithError('Failed to create a change. Please examine output above '
2347 'for the reason of the failure.\n'
2348 'Hint: run command below to diagnose common Git/Gerrit '
2349 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002350 ' git cl creds-check\n'
2351 '\n'
2352 'If git-cl is not working correctly, file a bug under the '
2353 'Infra>SDK component including the files below.\n'
2354 'Review the files before upload, since they might contain '
2355 'sensitive information.\n'
2356 'Set the Restrict-View-Google label so that they are not '
2357 'publicly accessible.\n'
2358 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002359 change_desc)
2360 finally:
2361 execution_time = time_time() - before_push
2362 metrics.collector.add_repeated('sub_commands', {
2363 'command': 'git push',
2364 'execution_time': execution_time,
2365 'exit_code': push_returncode,
2366 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2367 })
2368
Edward Lemur1b52d872019-05-09 21:12:12 +00002369 git_push_metadata['execution_time'] = execution_time
2370 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002371 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002372
Edward Lemur1b52d872019-05-09 21:12:12 +00002373 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002374 gclient_utils.rmtree(traces_dir)
2375
2376 return push_stdout
2377
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002378 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002380 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002381 # Load default for user, repo, squash=true, in this order.
2382 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002383
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002385 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002386 # This may be None; default fallback value is determined in logic below.
2387 title = options.title
2388
Dominic Battre7d1c4842017-10-27 09:17:28 +02002389 # Extract bug number from branch name.
2390 bug = options.bug
2391 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2392 if not bug and match:
2393 bug = match.group(1)
2394
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002396 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002397 if self.GetIssue():
2398 # Try to get the message from a previous upload.
2399 message = self.GetDescription()
2400 if not message:
2401 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002402 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002404 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002405 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002406 # When uploading a subsequent patchset, -m|--message is taken
2407 # as the patchset title if --title was not provided.
2408 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002409 else:
2410 default_title = RunGit(
2411 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002412 if options.force:
2413 title = default_title
2414 else:
2415 title = ask_for_data(
2416 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002417 change_id = self._GetChangeDetail()['change_id']
2418 while True:
2419 footer_change_ids = git_footers.get_footer_change_id(message)
2420 if footer_change_ids == [change_id]:
2421 break
2422 if not footer_change_ids:
2423 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002424 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 continue
2426 # There is already a valid footer but with different or several ids.
2427 # Doing this automatically is non-trivial as we don't want to lose
2428 # existing other footers, yet we want to append just 1 desired
2429 # Change-Id. Thus, just create a new footer, but let user verify the
2430 # new description.
2431 message = '%s\n\nChange-Id: %s' % (message, change_id)
2432 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002433 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002434 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002435 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002436 'Please, check the proposed correction to the description, '
2437 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2438 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2439 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002440 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 if not options.force:
2442 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002443 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002444 message = change_desc.description
2445 if not message:
2446 DieWithError("Description is empty. Aborting...")
2447 # Continue the while loop.
2448 # Sanity check of this code - we should end up with proper message
2449 # footer.
2450 assert [change_id] == git_footers.get_footer_change_id(message)
2451 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002452 else: # if not self.GetIssue()
2453 if options.message:
2454 message = options.message
2455 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002456 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002457 if options.title:
2458 message = options.title + '\n\n' + message
2459 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002460
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002462 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002463 # On first upload, patchset title is always this string, while
2464 # --title flag gets converted to first line of message.
2465 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466 if not change_desc.description:
2467 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002468 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002469 if len(change_ids) > 1:
2470 DieWithError('too many Change-Id footers, at most 1 allowed.')
2471 if not change_ids:
2472 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002473 change_desc.set_description(git_footers.add_footer_change_id(
2474 change_desc.description,
2475 GenerateGerritChangeId(change_desc.description)))
2476 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002477 assert len(change_ids) == 1
2478 change_id = change_ids[0]
2479
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002480 if options.reviewers or options.tbrs or options.add_owners_to:
2481 change_desc.update_reviewers(options.reviewers, options.tbrs,
2482 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002483 if options.preserve_tryjobs:
2484 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002485
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002486 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002487 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2488 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002489 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002490 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2491 desc_tempfile.write(change_desc.description)
2492 desc_tempfile.close()
2493 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2494 '-F', desc_tempfile.name]).strip()
2495 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002496 else:
2497 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002498 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002499 if not change_desc.description:
2500 DieWithError("Description is empty. Aborting...")
2501
2502 if not git_footers.get_footer_change_id(change_desc.description):
2503 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002504 change_desc.set_description(
2505 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002506 if options.reviewers or options.tbrs or options.add_owners_to:
2507 change_desc.update_reviewers(options.reviewers, options.tbrs,
2508 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002509 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002510 # For no-squash mode, we assume the remote called "origin" is the one we
2511 # want. It is not worthwhile to support different workflows for
2512 # no-squash mode.
2513 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002514 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2515
2516 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002517 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2519 ref_to_push)]).splitlines()
2520 if len(commits) > 1:
2521 print('WARNING: This will upload %d commits. Run the following command '
2522 'to see which commits will be uploaded: ' % len(commits))
2523 print('git log %s..%s' % (parent, ref_to_push))
2524 print('You can also use `git squash-branch` to squash these into a '
2525 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002526 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002527
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002528 if options.reviewers or options.tbrs or options.add_owners_to:
2529 change_desc.update_reviewers(options.reviewers, options.tbrs,
2530 options.add_owners_to, change)
2531
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002532 reviewers = sorted(change_desc.get_reviewers())
2533 # Add cc's from the CC_LIST and --cc flag (if any).
2534 if not options.private and not options.no_autocc:
2535 cc = self.GetCCList().split(',')
2536 else:
2537 cc = []
2538 if options.cc:
2539 cc.extend(options.cc)
2540 cc = filter(None, [email.strip() for email in cc])
2541 if change_desc.get_cced():
2542 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002543 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2544 valid_accounts = set(reviewers + cc)
2545 # TODO(crbug/877717): relax this for all hosts.
2546 else:
2547 valid_accounts = gerrit_util.ValidAccounts(
2548 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002549 logging.info('accounts %s are recognized, %s invalid',
2550 sorted(valid_accounts),
2551 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002552
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002553 # Extra options that can be specified at push time. Doc:
2554 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002555 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002556
Aaron Gable844cf292017-06-28 11:32:59 -07002557 # By default, new changes are started in WIP mode, and subsequent patchsets
2558 # don't send email. At any time, passing --send-mail will mark the change
2559 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002560 if options.send_mail:
2561 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002562 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002563 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002564 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002565 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002566 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002567
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002568 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002569 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002570
Aaron Gable9b713dd2016-12-14 16:04:21 -08002571 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002572 # Punctuation and whitespace in |title| must be percent-encoded.
2573 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002574
agablec6787972016-09-09 16:13:34 -07002575 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002576 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002577
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002578 for r in sorted(reviewers):
2579 if r in valid_accounts:
2580 refspec_opts.append('r=%s' % r)
2581 reviewers.remove(r)
2582 else:
2583 # TODO(tandrii): this should probably be a hard failure.
2584 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2585 % r)
2586 for c in sorted(cc):
2587 # refspec option will be rejected if cc doesn't correspond to an
2588 # account, even though REST call to add such arbitrary cc may succeed.
2589 if c in valid_accounts:
2590 refspec_opts.append('cc=%s' % c)
2591 cc.remove(c)
2592
rmistry9eadede2016-09-19 11:22:43 -07002593 if options.topic:
2594 # Documentation on Gerrit topics is here:
2595 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002596 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002597
Edward Lemur687ca902018-12-05 02:30:30 +00002598 if options.enable_auto_submit:
2599 refspec_opts.append('l=Auto-Submit+1')
2600 if options.use_commit_queue:
2601 refspec_opts.append('l=Commit-Queue+2')
2602 elif options.cq_dry_run:
2603 refspec_opts.append('l=Commit-Queue+1')
2604
2605 if change_desc.get_reviewers(tbr_only=True):
2606 score = gerrit_util.GetCodeReviewTbrScore(
2607 self._GetGerritHost(),
2608 self._GetGerritProject())
2609 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002610
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002611 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002612 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002613 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002614 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002615 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2616
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002617 refspec_suffix = ''
2618 if refspec_opts:
2619 refspec_suffix = '%' + ','.join(refspec_opts)
2620 assert ' ' not in refspec_suffix, (
2621 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2622 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2623
Edward Lemur1b52d872019-05-09 21:12:12 +00002624 git_push_metadata = {
2625 'gerrit_host': self._GetGerritHost(),
2626 'title': title or '<untitled>',
2627 'change_id': change_id,
2628 'description': change_desc.description,
2629 }
2630 push_stdout = self._RunGitPushWithTraces(
2631 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002632
2633 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002634 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002635 change_numbers = [m.group(1)
2636 for m in map(regex.match, push_stdout.splitlines())
2637 if m]
2638 if len(change_numbers) != 1:
2639 DieWithError(
2640 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002641 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002642 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002643 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002644
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002645 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002646 # GetIssue() is not set in case of non-squash uploads according to tests.
2647 # TODO(agable): non-squash uploads in git cl should be removed.
2648 gerrit_util.AddReviewers(
2649 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002650 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002651 reviewers, cc,
2652 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002653
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002654 return 0
2655
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002656 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2657 change_desc):
2658 """Computes parent of the generated commit to be uploaded to Gerrit.
2659
2660 Returns revision or a ref name.
2661 """
2662 if custom_cl_base:
2663 # Try to avoid creating additional unintended CLs when uploading, unless
2664 # user wants to take this risk.
2665 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2666 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2667 local_ref_of_target_remote])
2668 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002669 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002670 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2671 'If you proceed with upload, more than 1 CL may be created by '
2672 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2673 'If you are certain that specified base `%s` has already been '
2674 'uploaded to Gerrit as another CL, you may proceed.\n' %
2675 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2676 if not force:
2677 confirm_or_exit(
2678 'Do you take responsibility for cleaning up potential mess '
2679 'resulting from proceeding with upload?',
2680 action='upload')
2681 return custom_cl_base
2682
Aaron Gablef97e33d2017-03-30 15:44:27 -07002683 if remote != '.':
2684 return self.GetCommonAncestorWithUpstream()
2685
2686 # If our upstream branch is local, we base our squashed commit on its
2687 # squashed version.
2688 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2689
Aaron Gablef97e33d2017-03-30 15:44:27 -07002690 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002691 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002692
2693 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002694 # TODO(tandrii): consider checking parent change in Gerrit and using its
2695 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2696 # the tree hash of the parent branch. The upside is less likely bogus
2697 # requests to reupload parent change just because it's uploadhash is
2698 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002699 parent = RunGit(['config',
2700 'branch.%s.gerritsquashhash' % upstream_branch_name],
2701 error_ok=True).strip()
2702 # Verify that the upstream branch has been uploaded too, otherwise
2703 # Gerrit will create additional CLs when uploading.
2704 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2705 RunGitSilent(['rev-parse', parent + ':'])):
2706 DieWithError(
2707 '\nUpload upstream branch %s first.\n'
2708 'It is likely that this branch has been rebased since its last '
2709 'upload, so you just need to upload it again.\n'
2710 '(If you uploaded it with --no-squash, then branch dependencies '
2711 'are not supported, and you should reupload with --squash.)'
2712 % upstream_branch_name,
2713 change_desc)
2714 return parent
2715
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002716 def _AddChangeIdToCommitMessage(self, options, args):
2717 """Re-commits using the current message, assumes the commit hook is in
2718 place.
2719 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002720 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002721 git_command = ['commit', '--amend', '-m', log_desc]
2722 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002723 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002724 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002725 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002726 return new_log_desc
2727 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002728 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002729
tandriie113dfd2016-10-11 10:20:12 -07002730 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002731 try:
2732 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002733 except GerritChangeNotExists:
2734 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002735
2736 if data['status'] in ('ABANDONED', 'MERGED'):
2737 return 'CL %s is closed' % self.GetIssue()
2738
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002739 def GetGerritChange(self, patchset=None):
2740 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2741 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2742 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002743 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002744 data = self._GetChangeDetail(['ALL_REVISIONS'])
2745
2746 assert host and issue and patchset, 'CL must be uploaded first'
2747
2748 has_patchset = any(
2749 int(revision_data['_number']) == patchset
2750 for revision_data in data['revisions'].itervalues())
2751 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002752 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002753 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002754
tandrii8c5a3532016-11-04 07:52:02 -07002755 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002756 'host': host,
2757 'change': issue,
2758 'project': data['project'],
2759 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002760 }
tandriie113dfd2016-10-11 10:20:12 -07002761
tandriide281ae2016-10-12 06:02:30 -07002762 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002763 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002764
Edward Lemur707d70b2018-02-07 00:50:14 +01002765 def GetReviewers(self):
2766 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002767 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002768
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002769
2770_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002771 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002772}
2773
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002774
iannuccie53c9352016-08-17 14:40:40 -07002775def _add_codereview_issue_select_options(parser, extra=""):
2776 _add_codereview_select_options(parser)
2777
2778 text = ('Operate on this issue number instead of the current branch\'s '
2779 'implicit issue.')
2780 if extra:
2781 text += ' '+extra
2782 parser.add_option('-i', '--issue', type=int, help=text)
2783
2784
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002785def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002786 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002787 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002788 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002789 parser.add_option_group(parser.codereview_group)
2790 parser.codereview_group.add_option(
2791 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002792 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002793
2794
2795def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002796 options.forced_codereview = None
2797 if options.gerrit:
2798 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002799
2800
tandriif9aefb72016-07-01 09:06:51 -07002801def _get_bug_line_values(default_project, bugs):
2802 """Given default_project and comma separated list of bugs, yields bug line
2803 values.
2804
2805 Each bug can be either:
2806 * a number, which is combined with default_project
2807 * string, which is left as is.
2808
2809 This function may produce more than one line, because bugdroid expects one
2810 project per line.
2811
2812 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2813 ['v8:123', 'chromium:789']
2814 """
2815 default_bugs = []
2816 others = []
2817 for bug in bugs.split(','):
2818 bug = bug.strip()
2819 if bug:
2820 try:
2821 default_bugs.append(int(bug))
2822 except ValueError:
2823 others.append(bug)
2824
2825 if default_bugs:
2826 default_bugs = ','.join(map(str, default_bugs))
2827 if default_project:
2828 yield '%s:%s' % (default_project, default_bugs)
2829 else:
2830 yield default_bugs
2831 for other in sorted(others):
2832 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2833 yield other
2834
2835
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002836class ChangeDescription(object):
2837 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002838 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002839 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002840 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002841 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002842 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2843 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2844 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2845 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002846
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002849
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002851 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 return '\n'.join(self._description_lines)
2853
2854 def set_description(self, desc):
2855 if isinstance(desc, basestring):
2856 lines = desc.splitlines()
2857 else:
2858 lines = [line.rstrip() for line in desc]
2859 while lines and not lines[0]:
2860 lines.pop(0)
2861 while lines and not lines[-1]:
2862 lines.pop(-1)
2863 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002864
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002865 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2866 """Rewrites the R=/TBR= line(s) as a single line each.
2867
2868 Args:
2869 reviewers (list(str)) - list of additional emails to use for reviewers.
2870 tbrs (list(str)) - list of additional emails to use for TBRs.
2871 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2872 the change that are missing OWNER coverage. If this is not None, you
2873 must also pass a value for `change`.
2874 change (Change) - The Change that should be used for OWNERS lookups.
2875 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002876 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002877 assert isinstance(tbrs, list), tbrs
2878
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002879 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002880 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002881
2882 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002883 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002884
2885 reviewers = set(reviewers)
2886 tbrs = set(tbrs)
2887 LOOKUP = {
2888 'TBR': tbrs,
2889 'R': reviewers,
2890 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002891
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002892 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 regexp = re.compile(self.R_LINE)
2894 matches = [regexp.match(line) for line in self._description_lines]
2895 new_desc = [l for i, l in enumerate(self._description_lines)
2896 if not matches[i]]
2897 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002898
agable@chromium.org42c20792013-09-12 17:34:49 +00002899 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002900
2901 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 for match in matches:
2903 if not match:
2904 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002905 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2906
2907 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002908 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002909 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002910 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002911 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002912 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002913 LOOKUP[add_owners_to].update(
2914 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002915
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002916 # If any folks ended up in both groups, remove them from tbrs.
2917 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002918
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002919 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2920 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002921
2922 # Put the new lines in the description where the old first R= line was.
2923 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2924 if 0 <= line_loc < len(self._description_lines):
2925 if new_tbr_line:
2926 self._description_lines.insert(line_loc, new_tbr_line)
2927 if new_r_line:
2928 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002929 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002930 if new_r_line:
2931 self.append_footer(new_r_line)
2932 if new_tbr_line:
2933 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002934
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002935 def set_preserve_tryjobs(self):
2936 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2937 footers = git_footers.parse_footers(self.description)
2938 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2939 if v.lower() == 'true':
2940 return
2941 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2942
Aaron Gable3a16ed12017-03-23 10:51:55 -07002943 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002944 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002945 self.set_description([
2946 '# Enter a description of the change.',
2947 '# This will be displayed on the codereview site.',
2948 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002949 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002950 '--------------------',
2951 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002952
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002954 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002955 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07002956 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07002957 if git_footer:
2958 self.append_footer('Bug: %s' % ', '.join(values))
2959 else:
2960 for value in values:
2961 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07002962
agable@chromium.org42c20792013-09-12 17:34:49 +00002963 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002964 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002965 if not content:
2966 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002967 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002968
Bruce Dawson2377b012018-01-11 16:46:49 -08002969 # Strip off comments and default inserted "Bug:" line.
2970 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002971 (line.startswith('#') or
2972 line.rstrip() == "Bug:" or
2973 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002974 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002975 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002976 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002977
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002978 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002979 """Adds a footer line to the description.
2980
2981 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2982 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2983 that Gerrit footers are always at the end.
2984 """
2985 parsed_footer_line = git_footers.parse_footer(line)
2986 if parsed_footer_line:
2987 # Line is a gerrit footer in the form: Footer-Key: any value.
2988 # Thus, must be appended observing Gerrit footer rules.
2989 self.set_description(
2990 git_footers.add_footer(self.description,
2991 key=parsed_footer_line[0],
2992 value=parsed_footer_line[1]))
2993 return
2994
2995 if not self._description_lines:
2996 self._description_lines.append(line)
2997 return
2998
2999 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3000 if gerrit_footers:
3001 # git_footers.split_footers ensures that there is an empty line before
3002 # actual (gerrit) footers, if any. We have to keep it that way.
3003 assert top_lines and top_lines[-1] == ''
3004 top_lines, separator = top_lines[:-1], top_lines[-1:]
3005 else:
3006 separator = [] # No need for separator if there are no gerrit_footers.
3007
3008 prev_line = top_lines[-1] if top_lines else ''
3009 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3010 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3011 top_lines.append('')
3012 top_lines.append(line)
3013 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003014
tandrii99a72f22016-08-17 14:33:24 -07003015 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003016 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003017 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003018 reviewers = [match.group(2).strip()
3019 for match in matches
3020 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003021 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003022
bradnelsond975b302016-10-23 12:20:23 -07003023 def get_cced(self):
3024 """Retrieves the list of reviewers."""
3025 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3026 cced = [match.group(2).strip() for match in matches if match]
3027 return cleanup_list(cced)
3028
Nodir Turakulov23b82142017-11-16 11:04:25 -08003029 def get_hash_tags(self):
3030 """Extracts and sanitizes a list of Gerrit hashtags."""
3031 subject = (self._description_lines or ('',))[0]
3032 subject = re.sub(
3033 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3034
3035 tags = []
3036 start = 0
3037 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3038 while True:
3039 m = bracket_exp.match(subject, start)
3040 if not m:
3041 break
3042 tags.append(self.sanitize_hash_tag(m.group(1)))
3043 start = m.end()
3044
3045 if not tags:
3046 # Try "Tag: " prefix.
3047 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3048 if m:
3049 tags.append(self.sanitize_hash_tag(m.group(1)))
3050 return tags
3051
3052 @classmethod
3053 def sanitize_hash_tag(cls, tag):
3054 """Returns a sanitized Gerrit hash tag.
3055
3056 A sanitized hashtag can be used as a git push refspec parameter value.
3057 """
3058 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3059
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003060 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3061 """Updates this commit description given the parent.
3062
3063 This is essentially what Gnumbd used to do.
3064 Consult https://goo.gl/WMmpDe for more details.
3065 """
3066 assert parent_msg # No, orphan branch creation isn't supported.
3067 assert parent_hash
3068 assert dest_ref
3069 parent_footer_map = git_footers.parse_footers(parent_msg)
3070 # This will also happily parse svn-position, which GnumbD is no longer
3071 # supporting. While we'd generate correct footers, the verifier plugin
3072 # installed in Gerrit will block such commit (ie git push below will fail).
3073 parent_position = git_footers.get_position(parent_footer_map)
3074
3075 # Cherry-picks may have last line obscuring their prior footers,
3076 # from git_footers perspective. This is also what Gnumbd did.
3077 cp_line = None
3078 if (self._description_lines and
3079 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3080 cp_line = self._description_lines.pop()
3081
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003082 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003083
3084 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3085 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003086 for i, line in enumerate(footer_lines):
3087 k, v = git_footers.parse_footer(line) or (None, None)
3088 if k and k.startswith('Cr-'):
3089 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003090
3091 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003092 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003093 if parent_position[0] == dest_ref:
3094 # Same branch as parent.
3095 number = int(parent_position[1]) + 1
3096 else:
3097 number = 1 # New branch, and extra lineage.
3098 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3099 int(parent_position[1])))
3100
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003101 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3102 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003103
3104 self._description_lines = top_lines
3105 if cp_line:
3106 self._description_lines.append(cp_line)
3107 if self._description_lines[-1] != '':
3108 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003109 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003110
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003111
Aaron Gablea1bab272017-04-11 16:38:18 -07003112def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003113 """Retrieves the reviewers that approved a CL from the issue properties with
3114 messages.
3115
3116 Note that the list may contain reviewers that are not committer, thus are not
3117 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003118
3119 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003120 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003121 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003122 return sorted(
3123 set(
3124 message['sender']
3125 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003126 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003127 )
3128 )
3129
3130
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003131def FindCodereviewSettingsFile(filename='codereview.settings'):
3132 """Finds the given file starting in the cwd and going up.
3133
3134 Only looks up to the top of the repository unless an
3135 'inherit-review-settings-ok' file exists in the root of the repository.
3136 """
3137 inherit_ok_file = 'inherit-review-settings-ok'
3138 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003139 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3141 root = '/'
3142 while True:
3143 if filename in os.listdir(cwd):
3144 if os.path.isfile(os.path.join(cwd, filename)):
3145 return open(os.path.join(cwd, filename))
3146 if cwd == root:
3147 break
3148 cwd = os.path.dirname(cwd)
3149
3150
3151def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003152 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003153 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003154
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003155 def SetProperty(name, setting, unset_error_ok=False):
3156 fullname = 'rietveld.' + name
3157 if setting in keyvals:
3158 RunGit(['config', fullname, keyvals[setting]])
3159 else:
3160 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3161
tandrii48df5812016-10-17 03:55:37 -07003162 if not keyvals.get('GERRIT_HOST', False):
3163 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003164 # Only server setting is required. Other settings can be absent.
3165 # In that case, we ignore errors raised during option deletion attempt.
3166 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3167 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3168 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003169 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003170 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3171 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003172 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3173 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003174
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003175 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003176 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003177
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003178 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003179 RunGit(['config', 'gerrit.squash-uploads',
3180 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003181
tandrii@chromium.org28253532016-04-14 13:46:56 +00003182 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003183 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003184 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3185
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003186 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003187 # should be of the form
3188 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3189 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003190 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3191 keyvals['ORIGIN_URL_CONFIG']])
3192
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003193
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003194def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003195 """Downloads a network object to a local file, like urllib.urlretrieve.
3196
3197 This is necessary because urllib is broken for SSL connections via a proxy.
3198 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003199 with open(destination, 'w') as f:
3200 f.write(urllib2.urlopen(source).read())
3201
3202
ukai@chromium.org712d6102013-11-27 00:52:58 +00003203def hasSheBang(fname):
3204 """Checks fname is a #! script."""
3205 with open(fname) as f:
3206 return f.read(2).startswith('#!')
3207
3208
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003209# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3210def DownloadHooks(*args, **kwargs):
3211 pass
3212
3213
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003214def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003215 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003216
3217 Args:
3218 force: True to update hooks. False to install hooks if not present.
3219 """
3220 if not settings.GetIsGerrit():
3221 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003222 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003223 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3224 if not os.access(dst, os.X_OK):
3225 if os.path.exists(dst):
3226 if not force:
3227 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003228 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003229 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003230 if not hasSheBang(dst):
3231 DieWithError('Not a script: %s\n'
3232 'You need to download from\n%s\n'
3233 'into .git/hooks/commit-msg and '
3234 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003235 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3236 except Exception:
3237 if os.path.exists(dst):
3238 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003239 DieWithError('\nFailed to download hooks.\n'
3240 'You need to download from\n%s\n'
3241 'into .git/hooks/commit-msg and '
3242 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003243
3244
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003245class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003246 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003247
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003248 _GOOGLESOURCE = 'googlesource.com'
3249
3250 def __init__(self):
3251 # Cached list of [host, identity, source], where source is either
3252 # .gitcookies or .netrc.
3253 self._all_hosts = None
3254
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003255 def ensure_configured_gitcookies(self):
3256 """Runs checks and suggests fixes to make git use .gitcookies from default
3257 path."""
3258 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3259 configured_path = RunGitSilent(
3260 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003261 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003262 if configured_path:
3263 self._ensure_default_gitcookies_path(configured_path, default)
3264 else:
3265 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003266
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003267 @staticmethod
3268 def _ensure_default_gitcookies_path(configured_path, default_path):
3269 assert configured_path
3270 if configured_path == default_path:
3271 print('git is already configured to use your .gitcookies from %s' %
3272 configured_path)
3273 return
3274
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003275 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003276 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3277 (configured_path, default_path))
3278
3279 if not os.path.exists(configured_path):
3280 print('However, your configured .gitcookies file is missing.')
3281 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3282 action='reconfigure')
3283 RunGit(['config', '--global', 'http.cookiefile', default_path])
3284 return
3285
3286 if os.path.exists(default_path):
3287 print('WARNING: default .gitcookies file already exists %s' %
3288 default_path)
3289 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3290 default_path)
3291
3292 confirm_or_exit('Move existing .gitcookies to default location?',
3293 action='move')
3294 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003295 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003296 print('Moved and reconfigured git to use .gitcookies from %s' %
3297 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003298
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003299 @staticmethod
3300 def _configure_gitcookies_path(default_path):
3301 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3302 if os.path.exists(netrc_path):
3303 print('You seem to be using outdated .netrc for git credentials: %s' %
3304 netrc_path)
3305 print('This tool will guide you through setting up recommended '
3306 '.gitcookies store for git credentials.\n'
3307 '\n'
3308 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3309 ' git config --global --unset http.cookiefile\n'
3310 ' mv %s %s.backup\n\n' % (default_path, default_path))
3311 confirm_or_exit(action='setup .gitcookies')
3312 RunGit(['config', '--global', 'http.cookiefile', default_path])
3313 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003314
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003315 def get_hosts_with_creds(self, include_netrc=False):
3316 if self._all_hosts is None:
3317 a = gerrit_util.CookiesAuthenticator()
3318 self._all_hosts = [
3319 (h, u, s)
3320 for h, u, s in itertools.chain(
3321 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3322 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3323 )
3324 if h.endswith(self._GOOGLESOURCE)
3325 ]
3326
3327 if include_netrc:
3328 return self._all_hosts
3329 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3330
3331 def print_current_creds(self, include_netrc=False):
3332 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3333 if not hosts:
3334 print('No Git/Gerrit credentials found')
3335 return
3336 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3337 header = [('Host', 'User', 'Which file'),
3338 ['=' * l for l in lengths]]
3339 for row in (header + hosts):
3340 print('\t'.join((('%%+%ds' % l) % s)
3341 for l, s in zip(lengths, row)))
3342
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003343 @staticmethod
3344 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003345 """Parses identity "git-<username>.domain" into <username> and domain."""
3346 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003347 # distinguishable from sub-domains. But we do know typical domains:
3348 if identity.endswith('.chromium.org'):
3349 domain = 'chromium.org'
3350 username = identity[:-len('.chromium.org')]
3351 else:
3352 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003353 if username.startswith('git-'):
3354 username = username[len('git-'):]
3355 return username, domain
3356
3357 def _get_usernames_of_domain(self, domain):
3358 """Returns list of usernames referenced by .gitcookies in a given domain."""
3359 identities_by_domain = {}
3360 for _, identity, _ in self.get_hosts_with_creds():
3361 username, domain = self._parse_identity(identity)
3362 identities_by_domain.setdefault(domain, []).append(username)
3363 return identities_by_domain.get(domain)
3364
3365 def _canonical_git_googlesource_host(self, host):
3366 """Normalizes Gerrit hosts (with '-review') to Git host."""
3367 assert host.endswith(self._GOOGLESOURCE)
3368 # Prefix doesn't include '.' at the end.
3369 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3370 if prefix.endswith('-review'):
3371 prefix = prefix[:-len('-review')]
3372 return prefix + '.' + self._GOOGLESOURCE
3373
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003374 def _canonical_gerrit_googlesource_host(self, host):
3375 git_host = self._canonical_git_googlesource_host(host)
3376 prefix = git_host.split('.', 1)[0]
3377 return prefix + '-review.' + self._GOOGLESOURCE
3378
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003379 def _get_counterpart_host(self, host):
3380 assert host.endswith(self._GOOGLESOURCE)
3381 git = self._canonical_git_googlesource_host(host)
3382 gerrit = self._canonical_gerrit_googlesource_host(git)
3383 return git if gerrit == host else gerrit
3384
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003385 def has_generic_host(self):
3386 """Returns whether generic .googlesource.com has been configured.
3387
3388 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3389 """
3390 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3391 if host == '.' + self._GOOGLESOURCE:
3392 return True
3393 return False
3394
3395 def _get_git_gerrit_identity_pairs(self):
3396 """Returns map from canonic host to pair of identities (Git, Gerrit).
3397
3398 One of identities might be None, meaning not configured.
3399 """
3400 host_to_identity_pairs = {}
3401 for host, identity, _ in self.get_hosts_with_creds():
3402 canonical = self._canonical_git_googlesource_host(host)
3403 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3404 idx = 0 if canonical == host else 1
3405 pair[idx] = identity
3406 return host_to_identity_pairs
3407
3408 def get_partially_configured_hosts(self):
3409 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003410 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3411 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3412 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003413
3414 def get_conflicting_hosts(self):
3415 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003416 host
3417 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003418 if None not in (i1, i2) and i1 != i2)
3419
3420 def get_duplicated_hosts(self):
3421 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3422 return set(host for host, count in counters.iteritems() if count > 1)
3423
3424 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3425 'chromium.googlesource.com': 'chromium.org',
3426 'chrome-internal.googlesource.com': 'google.com',
3427 }
3428
3429 def get_hosts_with_wrong_identities(self):
3430 """Finds hosts which **likely** reference wrong identities.
3431
3432 Note: skips hosts which have conflicting identities for Git and Gerrit.
3433 """
3434 hosts = set()
3435 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3436 pair = self._get_git_gerrit_identity_pairs().get(host)
3437 if pair and pair[0] == pair[1]:
3438 _, domain = self._parse_identity(pair[0])
3439 if domain != expected:
3440 hosts.add(host)
3441 return hosts
3442
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003443 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003444 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003445 hosts = sorted(hosts)
3446 assert hosts
3447 if extra_column_func is None:
3448 extras = [''] * len(hosts)
3449 else:
3450 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003451 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3452 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003453 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003454 lines.append(tmpl % he)
3455 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003456
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003457 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003458 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003459 yield ('.googlesource.com wildcard record detected',
3460 ['Chrome Infrastructure team recommends to list full host names '
3461 'explicitly.'],
3462 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003463
3464 dups = self.get_duplicated_hosts()
3465 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003466 yield ('The following hosts were defined twice',
3467 self._format_hosts(dups),
3468 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003469
3470 partial = self.get_partially_configured_hosts()
3471 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003472 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3473 'These hosts are missing',
3474 self._format_hosts(partial, lambda host: 'but %s defined' %
3475 self._get_counterpart_host(host)),
3476 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003477
3478 conflicting = self.get_conflicting_hosts()
3479 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003480 yield ('The following Git hosts have differing credentials from their '
3481 'Gerrit counterparts',
3482 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3483 tuple(self._get_git_gerrit_identity_pairs()[host])),
3484 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003485
3486 wrong = self.get_hosts_with_wrong_identities()
3487 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003488 yield ('These hosts likely use wrong identity',
3489 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3490 (self._get_git_gerrit_identity_pairs()[host][0],
3491 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3492 wrong)
3493
3494 def find_and_report_problems(self):
3495 """Returns True if there was at least one problem, else False."""
3496 found = False
3497 bad_hosts = set()
3498 for title, sublines, hosts in self._find_problems():
3499 if not found:
3500 found = True
3501 print('\n\n.gitcookies problem report:\n')
3502 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003503 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003504 if sublines:
3505 print()
3506 print(' %s' % '\n '.join(sublines))
3507 print()
3508
3509 if bad_hosts:
3510 assert found
3511 print(' You can manually remove corresponding lines in your %s file and '
3512 'visit the following URLs with correct account to generate '
3513 'correct credential lines:\n' %
3514 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3515 print(' %s' % '\n '.join(sorted(set(
3516 gerrit_util.CookiesAuthenticator().get_new_password_url(
3517 self._canonical_git_googlesource_host(host))
3518 for host in bad_hosts
3519 ))))
3520 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003521
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003522
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003523@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003524def CMDcreds_check(parser, args):
3525 """Checks credentials and suggests changes."""
3526 _, _ = parser.parse_args(args)
3527
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003528 # Code below checks .gitcookies. Abort if using something else.
3529 authn = gerrit_util.Authenticator.get()
3530 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3531 if isinstance(authn, gerrit_util.GceAuthenticator):
3532 DieWithError(
3533 'This command is not designed for GCE, are you on a bot?\n'
3534 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3535 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003536 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003537 'This command is not designed for bot environment. It checks '
3538 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003539
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003540 checker = _GitCookiesChecker()
3541 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003542
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003543 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003544 checker.print_current_creds(include_netrc=True)
3545
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003546 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003547 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003548 return 0
3549 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003550
3551
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003552@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003553def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003554 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003555 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3556 branch = ShortBranchName(branchref)
3557 _, args = parser.parse_args(args)
3558 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003560 return RunGit(['config', 'branch.%s.base-url' % branch],
3561 error_ok=False).strip()
3562 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003563 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003564 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3565 error_ok=False).strip()
3566
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003567
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003568def color_for_status(status):
3569 """Maps a Changelist status to color, for CMDstatus and other tools."""
3570 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003571 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003572 'waiting': Fore.BLUE,
3573 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003574 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003575 'lgtm': Fore.GREEN,
3576 'commit': Fore.MAGENTA,
3577 'closed': Fore.CYAN,
3578 'error': Fore.WHITE,
3579 }.get(status, Fore.WHITE)
3580
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003581
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003582def get_cl_statuses(changes, fine_grained, max_processes=None):
3583 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003584
3585 If fine_grained is true, this will fetch CL statuses from the server.
3586 Otherwise, simply indicate if there's a matching url for the given branches.
3587
3588 If max_processes is specified, it is used as the maximum number of processes
3589 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3590 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003591
3592 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003593 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003594 if not changes:
3595 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003596
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003597 if not fine_grained:
3598 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003599 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003600 for cl in changes:
3601 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003602 return
3603
3604 # First, sort out authentication issues.
3605 logging.debug('ensuring credentials exist')
3606 for cl in changes:
3607 cl.EnsureAuthenticated(force=False, refresh=True)
3608
3609 def fetch(cl):
3610 try:
3611 return (cl, cl.GetStatus())
3612 except:
3613 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003614 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003615 raise
3616
3617 threads_count = len(changes)
3618 if max_processes:
3619 threads_count = max(1, min(threads_count, max_processes))
3620 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3621
3622 pool = ThreadPool(threads_count)
3623 fetched_cls = set()
3624 try:
3625 it = pool.imap_unordered(fetch, changes).__iter__()
3626 while True:
3627 try:
3628 cl, status = it.next(timeout=5)
3629 except multiprocessing.TimeoutError:
3630 break
3631 fetched_cls.add(cl)
3632 yield cl, status
3633 finally:
3634 pool.close()
3635
3636 # Add any branches that failed to fetch.
3637 for cl in set(changes) - fetched_cls:
3638 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003639
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640
3641def upload_branch_deps(cl, args):
3642 """Uploads CLs of local branches that are dependents of the current branch.
3643
3644 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003645
3646 test1 -> test2.1 -> test3.1
3647 -> test3.2
3648 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003649
3650 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3651 run on the dependent branches in this order:
3652 test2.1, test3.1, test3.2, test2.2, test3.3
3653
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003654 Note: This function does not rebase your local dependent branches. Use it
3655 when you make a change to the parent branch that will not conflict
3656 with its dependent branches, and you would like their dependencies
3657 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003658 """
3659 if git_common.is_dirty_git_tree('upload-branch-deps'):
3660 return 1
3661
3662 root_branch = cl.GetBranch()
3663 if root_branch is None:
3664 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3665 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003666 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003667 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3668 'patchset dependencies without an uploaded CL.')
3669
3670 branches = RunGit(['for-each-ref',
3671 '--format=%(refname:short) %(upstream:short)',
3672 'refs/heads'])
3673 if not branches:
3674 print('No local branches found.')
3675 return 0
3676
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003677 # Create a dictionary of all local branches to the branches that are
3678 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003679 tracked_to_dependents = collections.defaultdict(list)
3680 for b in branches.splitlines():
3681 tokens = b.split()
3682 if len(tokens) == 2:
3683 branch_name, tracked = tokens
3684 tracked_to_dependents[tracked].append(branch_name)
3685
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print()
3687 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003688 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003689
rmistry@google.com2dd99862015-06-22 12:22:18 +00003690 def traverse_dependents_preorder(branch, padding=''):
3691 dependents_to_process = tracked_to_dependents.get(branch, [])
3692 padding += ' '
3693 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003694 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003695 dependents.append(dependent)
3696 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003697
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003699 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700
3701 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003703 return 0
3704
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003705 confirm_or_exit('This command will checkout all dependent branches and run '
3706 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707
rmistry@google.com2dd99862015-06-22 12:22:18 +00003708 # Record all dependents that failed to upload.
3709 failures = {}
3710 # Go through all dependents, checkout the branch and upload.
3711 try:
3712 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print()
3714 print('--------------------------------------')
3715 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003716 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003717 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003718 try:
3719 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003721 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003722 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003723 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003724 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003725 finally:
3726 # Swap back to the original root branch.
3727 RunGit(['checkout', '-q', root_branch])
3728
vapiera7fbd5a2016-06-16 09:17:49 -07003729 print()
3730 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003731 for dependent_branch in dependents:
3732 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print(' %s : %s' % (dependent_branch, upload_status))
3734 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003735
3736 return 0
3737
3738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003739@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003740def CMDarchive(parser, args):
3741 """Archives and deletes branches associated with closed changelists."""
3742 parser.add_option(
3743 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003744 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003745 parser.add_option(
3746 '-f', '--force', action='store_true',
3747 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003748 parser.add_option(
3749 '-d', '--dry-run', action='store_true',
3750 help='Skip the branch tagging and removal steps.')
3751 parser.add_option(
3752 '-t', '--notags', action='store_true',
3753 help='Do not tag archived branches. '
3754 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003755
kmarshall3bff56b2016-06-06 18:31:47 -07003756 options, args = parser.parse_args(args)
3757 if args:
3758 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003759
3760 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3761 if not branches:
3762 return 0
3763
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003765 changes = [Changelist(branchref=b)
3766 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003767 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3768 statuses = get_cl_statuses(changes,
3769 fine_grained=True,
3770 max_processes=options.maxjobs)
3771 proposal = [(cl.GetBranch(),
3772 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3773 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003774 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003775 proposal.sort()
3776
3777 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003778 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003779 return 0
3780
3781 current_branch = GetCurrentBranch()
3782
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003784 if options.notags:
3785 for next_item in proposal:
3786 print(' ' + next_item[0])
3787 else:
3788 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3789 for next_item in proposal:
3790 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003791
kmarshall9249e012016-08-23 12:02:16 -07003792 # Quit now on precondition failure or if instructed by the user, either
3793 # via an interactive prompt or by command line flags.
3794 if options.dry_run:
3795 print('\nNo changes were made (dry run).\n')
3796 return 0
3797 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003798 print('You are currently on a branch \'%s\' which is associated with a '
3799 'closed codereview issue, so archive cannot proceed. Please '
3800 'checkout another branch and run this command again.' %
3801 current_branch)
3802 return 1
kmarshall9249e012016-08-23 12:02:16 -07003803 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003804 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3805 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003806 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003807 return 1
3808
3809 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003810 if not options.notags:
3811 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003812 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003813
vapiera7fbd5a2016-06-16 09:17:49 -07003814 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003815
3816 return 0
3817
3818
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003819@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003821 """Show status of changelists.
3822
3823 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003824 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003825 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003826 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003827 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003828 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003829 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003830 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003831
3832 Also see 'git cl comments'.
3833 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003834 parser.add_option(
3835 '--no-branch-color',
3836 action='store_true',
3837 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003838 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003839 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003840 parser.add_option('-f', '--fast', action='store_true',
3841 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003842 parser.add_option(
3843 '-j', '--maxjobs', action='store', type=int,
3844 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003845
iannuccie53c9352016-08-17 14:40:40 -07003846 _add_codereview_issue_select_options(
3847 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003848 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00003849 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003850 if args:
3851 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852
iannuccie53c9352016-08-17 14:40:40 -07003853 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003854 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003855
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003857 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003858 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003859 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860 elif options.field == 'id':
3861 issueid = cl.GetIssue()
3862 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003864 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003865 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003868 elif options.field == 'status':
3869 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003870 elif options.field == 'url':
3871 url = cl.GetIssueURL()
3872 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003873 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003874 return 0
3875
3876 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3877 if not branches:
3878 print('No local branch found.')
3879 return 0
3880
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003881 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003882 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003883 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003885 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003886 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003887 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003888
Daniel McArdlea23bf592019-02-12 00:25:12 +00003889 current_branch = GetCurrentBranch()
3890
3891 def FormatBranchName(branch, colorize=False):
3892 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3893 an asterisk when it is the current branch."""
3894
3895 asterisk = ""
3896 color = Fore.RESET
3897 if branch == current_branch:
3898 asterisk = "* "
3899 color = Fore.GREEN
3900 branch_name = ShortBranchName(branch)
3901
3902 if colorize:
3903 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003904 return asterisk + branch_name
3905
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003906 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003907
3908 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003909 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3910 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003911 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003912 c, status = output.next()
3913 branch_statuses[c.GetBranch()] = status
3914 status = branch_statuses.pop(branch)
3915 url = cl.GetIssueURL()
3916 if url and (not status or status == 'error'):
3917 # The issue probably doesn't exist anymore.
3918 url += ' (broken)'
3919
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003920 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003921 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003922 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003923 color = ''
3924 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003925 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003926
Alan Cuttera3be9a52019-03-04 18:50:33 +00003927 branch_display = FormatBranchName(branch)
3928 padding = ' ' * (alignment - len(branch_display))
3929 if not options.no_branch_color:
3930 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003931
Alan Cuttera3be9a52019-03-04 18:50:33 +00003932 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3933 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003934
vapiera7fbd5a2016-06-16 09:17:49 -07003935 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003936 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003937 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003938 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003939 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003940 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003941 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003942 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003943 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003944 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003945 print('Issue description:')
3946 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003947 return 0
3948
3949
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003950def colorize_CMDstatus_doc():
3951 """To be called once in main() to add colors to git cl status help."""
3952 colors = [i for i in dir(Fore) if i[0].isupper()]
3953
3954 def colorize_line(line):
3955 for color in colors:
3956 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003957 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003958 indent = len(line) - len(line.lstrip(' ')) + 1
3959 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3960 return line
3961
3962 lines = CMDstatus.__doc__.splitlines()
3963 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3964
3965
phajdan.jre328cf92016-08-22 04:12:17 -07003966def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003967 if path == '-':
3968 json.dump(contents, sys.stdout)
3969 else:
3970 with open(path, 'w') as f:
3971 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003972
3973
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003974@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003975@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003976def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003977 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003978
3979 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003980 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003981 parser.add_option('-r', '--reverse', action='store_true',
3982 help='Lookup the branch(es) for the specified issues. If '
3983 'no issues are specified, all branches with mapped '
3984 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003985 parser.add_option('--json',
3986 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003987 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003988 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003989 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003990
dnj@chromium.org406c4402015-03-03 17:22:28 +00003991 if options.reverse:
3992 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003993 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003994 # Reverse issue lookup.
3995 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003996
3997 git_config = {}
3998 for config in RunGit(['config', '--get-regexp',
3999 r'branch\..*issue']).splitlines():
4000 name, _space, val = config.partition(' ')
4001 git_config[name] = val
4002
dnj@chromium.org406c4402015-03-03 17:22:28 +00004003 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004004 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4005 config_key = _git_branch_config_key(ShortBranchName(branch),
4006 cls.IssueConfigKey())
4007 issue = git_config.get(config_key)
4008 if issue:
4009 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004010 if not args:
4011 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004012 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004013 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004014 try:
4015 issue_num = int(issue)
4016 except ValueError:
4017 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004018 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004019 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004021 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004022 if options.json:
4023 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004024 return 0
4025
4026 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004027 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004028 if not issue.valid:
4029 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4030 'or no argument to list it.\n'
4031 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004032 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004033 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004034 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004035 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004036 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4037 if options.json:
4038 write_json(options.json, {
4039 'issue': cl.GetIssue(),
4040 'issue_url': cl.GetIssueURL(),
4041 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 return 0
4043
4044
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004045@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004046def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004047 """Shows or posts review comments for any changelist."""
4048 parser.add_option('-a', '--add-comment', dest='comment',
4049 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004050 parser.add_option('-p', '--publish', action='store_true',
4051 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004052 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004053 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004054 parser.add_option('-m', '--machine-readable', dest='readable',
4055 action='store_false', default=True,
4056 help='output comments in a format compatible with '
4057 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004058 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004059 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004060 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004061 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004062 _process_codereview_select_options(parser, options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004063
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004064 issue = None
4065 if options.issue:
4066 try:
4067 issue = int(options.issue)
4068 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004069 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004070
Edward Lemur934836a2019-09-09 20:16:54 +00004071 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004072
4073 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004074 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004075 return 0
4076
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004077 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4078 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004079 for comment in summary:
4080 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004081 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004082 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004083 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004084 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004085 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004086 elif comment.autogenerated:
4087 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004088 else:
4089 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004090 print('\n%s%s %s%s\n%s' % (
4091 color,
4092 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4093 comment.sender,
4094 Fore.RESET,
4095 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4096
smut@google.comc85ac942015-09-15 16:34:43 +00004097 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004098 def pre_serialize(c):
4099 dct = c.__dict__.copy()
4100 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4101 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004102 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004103 return 0
4104
4105
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004106@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004107@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004108def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004109 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004110 parser.add_option('-d', '--display', action='store_true',
4111 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004112 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004113 help='New description to set for this issue (- for stdin, '
4114 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004115 parser.add_option('-f', '--force', action='store_true',
4116 help='Delete any unpublished Gerrit edits for this issue '
4117 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004118
4119 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004120 options, args = parser.parse_args(args)
4121 _process_codereview_select_options(parser, options)
4122
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004123 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004124 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004125 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004126 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004127 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004128
Edward Lemur934836a2019-09-09 20:16:54 +00004129 kwargs = {}
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004130 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004131 if target_issue_arg:
4132 kwargs['issue'] = target_issue_arg.issue
4133 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004134 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004135 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004136
4137 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004138 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004139 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004140 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004141
4142 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004143 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004144
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004145 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004146
smut@google.com34fb6b12015-07-13 20:03:26 +00004147 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004148 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004149 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004150
4151 if options.new_description:
4152 text = options.new_description
4153 if text == '-':
4154 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004155 elif text == '+':
4156 base_branch = cl.GetCommonAncestorWithUpstream()
4157 change = cl.GetChange(base_branch, None, local_description=True)
4158 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004159
4160 description.set_description(text)
4161 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004162 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004163 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004164 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004165 return 0
4166
4167
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004168@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004169def CMDlint(parser, args):
4170 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004171 parser.add_option('--filter', action='append', metavar='-x,+y',
4172 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004173 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004174
4175 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004176 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004177 try:
4178 import cpplint
4179 import cpplint_chromium
4180 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004182 return 1
4183
4184 # Change the current working directory before calling lint so that it
4185 # shows the correct base.
4186 previous_cwd = os.getcwd()
4187 os.chdir(settings.GetRoot())
4188 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004189 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4191 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004192 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004193 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004194 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004195
4196 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004197 command = args + files
4198 if options.filter:
4199 command = ['--filter=' + ','.join(options.filter)] + command
4200 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004201
4202 white_regex = re.compile(settings.GetLintRegex())
4203 black_regex = re.compile(settings.GetLintIgnoreRegex())
4204 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4205 for filename in filenames:
4206 if white_regex.match(filename):
4207 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004209 else:
4210 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4211 extra_check_functions)
4212 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004213 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004214 finally:
4215 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004217 if cpplint._cpplint_state.error_count != 0:
4218 return 1
4219 return 0
4220
4221
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004222@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004223def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004224 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004225 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004226 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004227 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004228 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004229 parser.add_option('--all', action='store_true',
4230 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004231 parser.add_option('--parallel', action='store_true',
4232 help='Run all tests specified by input_api.RunTests in all '
4233 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004234 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
sbc@chromium.org71437c02015-04-09 19:29:40 +00004236 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238 return 1
4239
Edward Lemur934836a2019-09-09 20:16:54 +00004240 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004241 if args:
4242 base_branch = args[0]
4243 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004244 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004245 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246
Aaron Gable8076c282017-11-29 14:39:41 -08004247 if options.all:
4248 base_change = cl.GetChange(base_branch, None)
4249 files = [('M', f) for f in base_change.AllFiles()]
4250 change = presubmit_support.GitChange(
4251 base_change.Name(),
4252 base_change.FullDescriptionText(),
4253 base_change.RepositoryRoot(),
4254 files,
4255 base_change.issue,
4256 base_change.patchset,
4257 base_change.author_email,
4258 base_change._upstream)
4259 else:
4260 change = cl.GetChange(base_branch, None)
4261
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004262 cl.RunHook(
4263 committing=not options.upload,
4264 may_prompt=False,
4265 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004266 change=change,
4267 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004268 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004269
4270
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004271def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004272 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004273
4274 Works the same way as
4275 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4276 but can be called on demand on all platforms.
4277
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004278 The basic idea is to generate git hash of a state of the tree, original
4279 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004280 """
4281 lines = []
4282 tree_hash = RunGitSilent(['write-tree'])
4283 lines.append('tree %s' % tree_hash.strip())
4284 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4285 if code == 0:
4286 lines.append('parent %s' % parent.strip())
4287 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4288 lines.append('author %s' % author.strip())
4289 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4290 lines.append('committer %s' % committer.strip())
4291 lines.append('')
4292 # Note: Gerrit's commit-hook actually cleans message of some lines and
4293 # whitespace. This code is not doing this, but it clearly won't decrease
4294 # entropy.
4295 lines.append(message)
4296 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004297 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004298 return 'I%s' % change_hash.strip()
4299
4300
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004301def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004302 """Computes the remote branch ref to use for the CL.
4303
4304 Args:
4305 remote (str): The git remote for the CL.
4306 remote_branch (str): The git remote branch for the CL.
4307 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004308 """
4309 if not (remote and remote_branch):
4310 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004311
wittman@chromium.org455dc922015-01-26 20:15:50 +00004312 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004313 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004314 # refs, which are then translated into the remote full symbolic refs
4315 # below.
4316 if '/' not in target_branch:
4317 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4318 else:
4319 prefix_replacements = (
4320 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4321 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4322 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4323 )
4324 match = None
4325 for regex, replacement in prefix_replacements:
4326 match = re.search(regex, target_branch)
4327 if match:
4328 remote_branch = target_branch.replace(match.group(0), replacement)
4329 break
4330 if not match:
4331 # This is a branch path but not one we recognize; use as-is.
4332 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004333 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4334 # Handle the refs that need to land in different refs.
4335 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004336
wittman@chromium.org455dc922015-01-26 20:15:50 +00004337 # Create the true path to the remote branch.
4338 # Does the following translation:
4339 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4340 # * refs/remotes/origin/master -> refs/heads/master
4341 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4342 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4343 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4344 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4345 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4346 'refs/heads/')
4347 elif remote_branch.startswith('refs/remotes/branch-heads'):
4348 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004349
wittman@chromium.org455dc922015-01-26 20:15:50 +00004350 return remote_branch
4351
4352
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004353def cleanup_list(l):
4354 """Fixes a list so that comma separated items are put as individual items.
4355
4356 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4357 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4358 """
4359 items = sum((i.split(',') for i in l), [])
4360 stripped_items = (i.strip() for i in items)
4361 return sorted(filter(None, stripped_items))
4362
4363
Aaron Gable4db38df2017-11-03 14:59:07 -07004364@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004365@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004366def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004367 """Uploads the current changelist to codereview.
4368
4369 Can skip dependency patchset uploads for a branch by running:
4370 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004371 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004372 git config --unset branch.branch_name.skip-deps-uploads
4373 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004374
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004375 If the name of the checked out branch starts with "bug-" or "fix-" followed
4376 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004377 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004378
4379 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004380 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004381 [git-cl] add support for hashtags
4382 Foo bar: implement foo
4383 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004384 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004385 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4386 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004387 parser.add_option('--bypass-watchlists', action='store_true',
4388 dest='bypass_watchlists',
4389 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004390 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004391 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004392 parser.add_option('--message', '-m', dest='message',
4393 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004394 parser.add_option('-b', '--bug',
4395 help='pre-populate the bug number(s) for this issue. '
4396 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004397 parser.add_option('--message-file', dest='message_file',
4398 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004399 parser.add_option('--title', '-t', dest='title',
4400 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004401 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004402 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004403 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004404 parser.add_option('--tbrs',
4405 action='append', default=[],
4406 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004407 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004408 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004409 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004410 parser.add_option('--hashtag', dest='hashtags',
4411 action='append', default=[],
4412 help=('Gerrit hashtag for new CL; '
4413 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004414 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004415 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004416 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004417 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004418 metavar='TARGET',
4419 help='Apply CL to remote ref TARGET. ' +
4420 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004421 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004422 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004423 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004424 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004425 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004426 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004427 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4428 const='TBR', help='add a set of OWNERS to TBR')
4429 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4430 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004431 parser.add_option('-c', '--use-commit-queue', action='store_true',
4432 help='tell the CQ to commit this patchset; '
4433 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004434 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4435 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004436 help='Send the patchset to do a CQ dry run right after '
4437 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004438 parser.add_option('--preserve-tryjobs', action='store_true',
4439 help='instruct the CQ to let tryjobs running even after '
4440 'new patchsets are uploaded instead of canceling '
4441 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004442 parser.add_option('--dependencies', action='store_true',
4443 help='Uploads CLs of all the local branches that depend on '
4444 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004445 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4446 help='Sends your change to the CQ after an approval. Only '
4447 'works on repos that have the Auto-Submit label '
4448 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004449 parser.add_option('--parallel', action='store_true',
4450 help='Run all tests specified by input_api.RunTests in all '
4451 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004452
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004453 parser.add_option('--no-autocc', action='store_true',
4454 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004455 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004456 help='Set the review private. This implies --no-autocc.')
4457
rmistry@google.com2dd99862015-06-22 12:22:18 +00004458 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004459 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004460 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004461 _process_codereview_select_options(parser, options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004462
sbc@chromium.org71437c02015-04-09 19:29:40 +00004463 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004464 return 1
4465
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004466 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004467 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004468 options.cc = cleanup_list(options.cc)
4469
tandriib80458a2016-06-23 12:20:07 -07004470 if options.message_file:
4471 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004472 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004473 options.message = gclient_utils.FileRead(options.message_file)
4474 options.message_file = None
4475
tandrii4d0545a2016-07-06 03:56:49 -07004476 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004477 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004478
Aaron Gableedbc4132017-09-11 13:22:28 -07004479 if options.use_commit_queue:
4480 options.send_mail = True
4481
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004482 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4483 settings.GetIsGerrit()
4484
Edward Lemur934836a2019-09-09 20:16:54 +00004485 cl = Changelist()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004486
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004487 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004488
4489
Francois Dorayd42c6812017-05-30 15:10:20 -04004490@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004491@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004492def CMDsplit(parser, args):
4493 """Splits a branch into smaller branches and uploads CLs.
4494
4495 Creates a branch and uploads a CL for each group of files modified in the
4496 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004497 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004498 the shared OWNERS file.
4499 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004500 parser.add_option('-d', '--description', dest='description_file',
4501 help='A text file containing a CL description in which '
4502 '$directory will be replaced by each CL\'s directory.')
4503 parser.add_option('-c', '--comment', dest='comment_file',
4504 help='A text file containing a CL comment.')
4505 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004506 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004507 help='List the files and reviewers for each CL that would '
4508 'be created, but don\'t create branches or CLs.')
4509 parser.add_option('--cq-dry-run', action='store_true',
4510 help='If set, will do a cq dry run for each uploaded CL. '
4511 'Please be careful when doing this; more than ~10 CLs '
4512 'has the potential to overload our build '
4513 'infrastructure. Try to upload these not during high '
4514 'load times (usually 11-3 Mountain View time). Email '
4515 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004516 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4517 default=True,
4518 help='Sends your change to the CQ after an approval. Only '
4519 'works on repos that have the Auto-Submit label '
4520 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004521 options, _ = parser.parse_args(args)
4522
4523 if not options.description_file:
4524 parser.error('No --description flag specified.')
4525
4526 def WrappedCMDupload(args):
4527 return CMDupload(OptionParser(), args)
4528
4529 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004530 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004531 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004532
4533
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004534@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004535@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004537 """DEPRECATED: Used to commit the current changelist via git-svn."""
4538 message = ('git-cl no longer supports committing to SVN repositories via '
4539 'git-svn. You probably want to use `git cl land` instead.')
4540 print(message)
4541 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542
4543
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004544# Two special branches used by git cl land.
4545MERGE_BRANCH = 'git-cl-commit'
4546CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4547
4548
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004549@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004550@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004551def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004552 """Commits the current changelist via git.
4553
4554 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4555 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004556 """
4557 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4558 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004559 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004560 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004561 parser.add_option('--parallel', action='store_true',
4562 help='Run all tests specified by input_api.RunTests in all '
4563 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004564 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004565
Edward Lemur934836a2019-09-09 20:16:54 +00004566 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004567
Robert Iannucci2e73d432018-03-14 01:10:47 -07004568 if not cl.GetIssue():
4569 DieWithError('You must upload the change first to Gerrit.\n'
4570 ' If you would rather have `git cl land` upload '
4571 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004572 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004573 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004574
4575
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004576@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004577@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004579 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004580 parser.add_option('-b', dest='newbranch',
4581 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004582 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004583 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004585 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004586
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004587 group = optparse.OptionGroup(
4588 parser,
4589 'Options for continuing work on the current issue uploaded from a '
4590 'different clone (e.g. different machine). Must be used independently '
4591 'from the other options. No issue number should be specified, and the '
4592 'branch must have an issue number associated with it')
4593 group.add_option('--reapply', action='store_true', dest='reapply',
4594 help='Reset the branch and reapply the issue.\n'
4595 'CAUTION: This will undo any local changes in this '
4596 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004597
4598 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004599 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004600 parser.add_option_group(group)
4601
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004602 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004604 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004605
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004606 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004607 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004608 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004609 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004610 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004611
Edward Lemur934836a2019-09-09 20:16:54 +00004612 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004614 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004615
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004616 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004617 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004618 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004619
4620 RunGit(['reset', '--hard', upstream])
4621 if options.pull:
4622 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004623
Edward Lemurf38bc172019-09-03 21:02:13 +00004624 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004625
4626 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004627 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004628
Edward Lemurf38bc172019-09-03 21:02:13 +00004629 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004630 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004631 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004632
4633 cl_kwargs = {
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004634 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004635 }
4636 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004637 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004638 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004639 cl_kwargs['issue'] = target_issue_arg.issue
4640
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004641 # We don't want uncommitted changes mixed up with the patch.
4642 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004643 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004645 if options.newbranch:
4646 if options.force:
4647 RunGit(['branch', '-D', options.newbranch],
4648 stderr=subprocess2.PIPE, error_ok=True)
4649 RunGit(['new-branch', options.newbranch])
4650
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004651 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004652
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004653 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004654 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004655
Edward Lemurf38bc172019-09-03 21:02:13 +00004656 return cl.CMDPatchWithParsedIssue(
4657 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004658
4659
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004660def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661 """Fetches the tree status and returns either 'open', 'closed',
4662 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004663 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004664 if url:
4665 status = urllib2.urlopen(url).read().lower()
4666 if status.find('closed') != -1 or status == '0':
4667 return 'closed'
4668 elif status.find('open') != -1 or status == '1':
4669 return 'open'
4670 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004671 return 'unset'
4672
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004673
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004674def GetTreeStatusReason():
4675 """Fetches the tree status from a json url and returns the message
4676 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004677 url = settings.GetTreeStatusUrl()
4678 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004679 connection = urllib2.urlopen(json_url)
4680 status = json.loads(connection.read())
4681 connection.close()
4682 return status['message']
4683
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004684
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004685@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004686def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004687 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004688 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004689 status = GetTreeStatus()
4690 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004691 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004692 return 2
4693
vapiera7fbd5a2016-06-16 09:17:49 -07004694 print('The tree is %s' % status)
4695 print()
4696 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004697 if status != 'open':
4698 return 1
4699 return 0
4700
4701
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004702@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004703def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004704 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4705 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004706 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004707 '-b', '--bot', action='append',
4708 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4709 'times to specify multiple builders. ex: '
4710 '"-b win_rel -b win_layout". See '
4711 'the try server waterfall for the builders name and the tests '
4712 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004713 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004714 '-B', '--bucket', default='',
4715 help=('Buildbucket bucket to send the try requests.'))
4716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004718 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004719 'be determined by the try recipe that builder runs, which usually '
4720 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004723 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004724 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004725 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004726 '--category', default='git_cl_try', help='Specify custom build category.')
4727 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004728 '--project',
4729 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004730 'in recipe to determine to which repository or directory to '
4731 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004732 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004733 '-p', '--property', dest='properties', action='append', default=[],
4734 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004735 'key2=value2 etc. The value will be treated as '
4736 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004737 'NOTE: using this may make your tryjob not usable for CQ, '
4738 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004739 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004740 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4741 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004742 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004743 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004744 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004745 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004746 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004747 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004748
machenbach@chromium.org45453142015-09-15 08:45:22 +00004749 # Make sure that all properties are prop=value pairs.
4750 bad_params = [x for x in options.properties if '=' not in x]
4751 if bad_params:
4752 parser.error('Got properties with missing "=": %s' % bad_params)
4753
maruel@chromium.org15192402012-09-06 12:38:29 +00004754 if args:
4755 parser.error('Unknown arguments: %s' % args)
4756
Edward Lemur934836a2019-09-09 20:16:54 +00004757 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004758 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004759 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004760
Edward Lemurf38bc172019-09-03 21:02:13 +00004761 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004762 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004763
tandriie113dfd2016-10-11 10:20:12 -07004764 error_message = cl.CannotTriggerTryJobReason()
4765 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004766 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004767
qyearsley1fdfcb62016-10-24 13:22:03 -07004768 buckets = _get_bucket_map(cl, options, parser)
Edward Lemurc8b67ed2019-09-12 20:28:58 +00004769 if buckets and any(b.startswith('master.') for b in buckets):
4770 print('ERROR: Buildbot masters are not supported.')
4771 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004772
qyearsleydd49f942016-10-28 11:57:22 -07004773 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4774 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004775 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004776 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004777 print('git cl try with no bots now defaults to CQ dry run.')
4778 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4779 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004780
borenet6c0efe62016-10-19 08:13:29 -07004781 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004782 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004783 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004784 'of bot requires an initial job from a parent (usually a builder). '
4785 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004786 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004787 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004788
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004789 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004790 try:
4791 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4792 except BuildbucketResponseException as ex:
4793 print('ERROR: %s' % ex)
4794 return 1
4795 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004796
4797
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004798@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004799def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004800 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004801 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004802 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004803 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004804 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004805 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004806 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004807 '--color', action='store_true', default=setup_color.IS_TTY,
4808 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004809 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004810 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4811 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004812 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004813 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004814 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004815 parser.add_option_group(group)
4816 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004817 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004818 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004819 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004820 if args:
4821 parser.error('Unrecognized args: %s' % ' '.join(args))
4822
4823 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004824 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004825 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004826 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004827
tandrii221ab252016-10-06 08:12:04 -07004828 patchset = options.patchset
4829 if not patchset:
4830 patchset = cl.GetMostRecentPatchset()
4831 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004832 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004833 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004834 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004835 cl.GetIssue())
4836
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004837 try:
tandrii221ab252016-10-06 08:12:04 -07004838 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004839 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004840 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004841 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004842 if options.json:
4843 write_try_results_json(options.json, jobs)
4844 else:
4845 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004846 return 0
4847
4848
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004849@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004850@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004851def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004852 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004853 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004854 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004855 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004856
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004857 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004858 if args:
4859 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004860 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004861 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004862 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004863 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004864
4865 # Clear configured merge-base, if there is one.
4866 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004867 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004868 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004869 return 0
4870
4871
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004872@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004873def CMDweb(parser, args):
4874 """Opens the current CL in the web browser."""
4875 _, args = parser.parse_args(args)
4876 if args:
4877 parser.error('Unrecognized args: %s' % ' '.join(args))
4878
4879 issue_url = Changelist().GetIssueURL()
4880 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004881 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004882 return 1
4883
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004884 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004885 # allows us to hide the "Created new window in existing browser session."
4886 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004887 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004888 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004889 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004890 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004891 os.open(os.devnull, os.O_RDWR)
4892 try:
4893 webbrowser.open(issue_url)
4894 finally:
4895 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004896 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004897 return 0
4898
4899
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004900@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004901def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004902 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004903 parser.add_option('-d', '--dry-run', action='store_true',
4904 help='trigger in dry run mode')
4905 parser.add_option('-c', '--clear', action='store_true',
4906 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004907 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004908 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004909 _process_codereview_select_options(parser, options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004910 if args:
4911 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004912 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004913 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004914
Edward Lemur934836a2019-09-09 20:16:54 +00004915 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004916 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004917 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004918 elif options.dry_run:
4919 state = _CQState.DRY_RUN
4920 else:
4921 state = _CQState.COMMIT
4922 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004923 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004924 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004925 return 0
4926
4927
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004928@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004929def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004930 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004931 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004932 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004933 _process_codereview_select_options(parser, options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004934 if args:
4935 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004936 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004937 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004938 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004939 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004940 cl.CloseIssue()
4941 return 0
4942
4943
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004944@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004945def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004946 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004947 parser.add_option(
4948 '--stat',
4949 action='store_true',
4950 dest='stat',
4951 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004952 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004953 if args:
4954 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004955
Edward Lemur934836a2019-09-09 20:16:54 +00004956 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004957 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004958 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004959 if not issue:
4960 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004961
Aaron Gablea718c3e2017-08-28 17:47:28 -07004962 base = cl._GitGetBranchConfigValue('last-upload-hash')
4963 if not base:
4964 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4965 if not base:
4966 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4967 revision_info = detail['revisions'][detail['current_revision']]
4968 fetch_info = revision_info['fetch']['http']
4969 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4970 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004971
Aaron Gablea718c3e2017-08-28 17:47:28 -07004972 cmd = ['git', 'diff']
4973 if options.stat:
4974 cmd.append('--stat')
4975 cmd.append(base)
4976 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004977
4978 return 0
4979
4980
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004981@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004982def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004983 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004984 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004985 '--ignore-current',
4986 action='store_true',
4987 help='Ignore the CL\'s current reviewers and start from scratch.')
4988 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004989 '--ignore-self',
4990 action='store_true',
4991 help='Do not consider CL\'s author as an owners.')
4992 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004993 '--no-color',
4994 action='store_true',
4995 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004996 parser.add_option(
4997 '--batch',
4998 action='store_true',
4999 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005000 # TODO: Consider moving this to another command, since other
5001 # git-cl owners commands deal with owners for a given CL.
5002 parser.add_option(
5003 '--show-all',
5004 action='store_true',
5005 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006 options, args = parser.parse_args(args)
5007
5008 author = RunGit(['config', 'user.email']).strip() or None
5009
Edward Lemur934836a2019-09-09 20:16:54 +00005010 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005011
Yang Guo6e269a02019-06-26 11:17:02 +00005012 if options.show_all:
5013 for arg in args:
5014 base_branch = cl.GetCommonAncestorWithUpstream()
5015 change = cl.GetChange(base_branch, None)
5016 database = owners.Database(change.RepositoryRoot(), file, os.path)
5017 database.load_data_needed_for([arg])
5018 print('Owners for %s:' % arg)
5019 for owner in sorted(database.all_possible_owners([arg], None)):
5020 print(' - %s' % owner)
5021 return 0
5022
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023 if args:
5024 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005025 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005026 base_branch = args[0]
5027 else:
5028 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005029 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005030
5031 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005032 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5033
5034 if options.batch:
5035 db = owners.Database(change.RepositoryRoot(), file, os.path)
5036 print('\n'.join(db.reviewers_for(affected_files, author)))
5037 return 0
5038
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005039 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005040 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005041 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005042 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005043 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005044 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005045 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005046 override_files=change.OriginalOwnersFiles(),
5047 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005048
5049
Aiden Bennerc08566e2018-10-03 17:52:42 +00005050def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005051 """Generates a diff command."""
5052 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005053 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5054
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005055 if allow_prefix:
5056 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5057 # case that diff.noprefix is set in the user's git config.
5058 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5059 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005060 diff_cmd += ['--no-prefix']
5061
5062 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005063
5064 if args:
5065 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005066 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005067 diff_cmd.append(arg)
5068 else:
5069 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005070
5071 return diff_cmd
5072
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005073
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005074def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005075 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005076 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005077
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005078
enne@chromium.org555cfe42014-01-29 18:21:39 +00005079@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005080@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005081def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005082 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005083 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005084 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005085 parser.add_option('--full', action='store_true',
5086 help='Reformat the full content of all touched files')
5087 parser.add_option('--dry-run', action='store_true',
5088 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005089 parser.add_option(
5090 '--python',
5091 action='store_true',
5092 default=None,
5093 help='Enables python formatting on all python files.')
5094 parser.add_option(
5095 '--no-python',
5096 action='store_true',
5097 dest='python',
5098 help='Disables python formatting on all python files. '
5099 'Takes precedence over --python. '
5100 'If neither --python or --no-python are set, python '
5101 'files that have a .style.yapf file in an ancestor '
5102 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005103 parser.add_option('--js', action='store_true',
5104 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005105 parser.add_option('--diff', action='store_true',
5106 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005107 parser.add_option('--presubmit', action='store_true',
5108 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005109 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005110
Daniel Chengc55eecf2016-12-30 03:11:02 -08005111 # Normalize any remaining args against the current path, so paths relative to
5112 # the current directory are still resolved as expected.
5113 args = [os.path.join(os.getcwd(), arg) for arg in args]
5114
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005115 # git diff generates paths against the root of the repository. Change
5116 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005117 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005118 if rel_base_path:
5119 os.chdir(rel_base_path)
5120
digit@chromium.org29e47272013-05-17 17:01:46 +00005121 # Grab the merge-base commit, i.e. the upstream commit of the current
5122 # branch when it was created or the last time it was rebased. This is
5123 # to cover the case where the user may have called "git fetch origin",
5124 # moving the origin branch to a newer commit, but hasn't rebased yet.
5125 upstream_commit = None
5126 cl = Changelist()
5127 upstream_branch = cl.GetUpstreamBranch()
5128 if upstream_branch:
5129 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5130 upstream_commit = upstream_commit.strip()
5131
5132 if not upstream_commit:
5133 DieWithError('Could not find base commit for this branch. '
5134 'Are you in detached state?')
5135
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005136 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5137 diff_output = RunGit(changed_files_cmd)
5138 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005139 # Filter out files deleted by this CL
5140 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005141
Christopher Lamc5ba6922017-01-24 11:19:14 +11005142 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005143 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005144
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005145 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5146 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5147 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005148 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005149
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005150 top_dir = os.path.normpath(
5151 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5152
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005153 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5154 # formatted. This is used to block during the presubmit.
5155 return_value = 0
5156
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005157 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005158 # Locate the clang-format binary in the checkout
5159 try:
5160 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005161 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005162 DieWithError(e)
5163
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005164 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005165 cmd = [clang_format_tool]
5166 if not opts.dry_run and not opts.diff:
5167 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005168 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005169 if opts.diff:
5170 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005171 else:
5172 env = os.environ.copy()
5173 env['PATH'] = str(os.path.dirname(clang_format_tool))
5174 try:
5175 script = clang_format.FindClangFormatScriptInChromiumTree(
5176 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005177 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005178 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005179
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005180 cmd = [sys.executable, script, '-p0']
5181 if not opts.dry_run and not opts.diff:
5182 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005183
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005184 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5185 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005186
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005187 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5188 if opts.diff:
5189 sys.stdout.write(stdout)
5190 if opts.dry_run and len(stdout) > 0:
5191 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005192
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005193 # Similar code to above, but using yapf on .py files rather than clang-format
5194 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005195 py_explicitly_disabled = opts.python is not None and not opts.python
5196 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005197 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5198 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5199 if sys.platform.startswith('win'):
5200 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005201
Aiden Bennerc08566e2018-10-03 17:52:42 +00005202 # If we couldn't find a yapf file we'll default to the chromium style
5203 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005204 chromium_default_yapf_style = os.path.join(depot_tools_path,
5205 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005206 # Used for caching.
5207 yapf_configs = {}
5208 for f in python_diff_files:
5209 # Find the yapf style config for the current file, defaults to depot
5210 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005211 _FindYapfConfigFile(f, yapf_configs, top_dir)
5212
5213 # Turn on python formatting by default if a yapf config is specified.
5214 # This breaks in the case of this repo though since the specified
5215 # style file is also the global default.
5216 if opts.python is None:
5217 filtered_py_files = []
5218 for f in python_diff_files:
5219 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5220 filtered_py_files.append(f)
5221 else:
5222 filtered_py_files = python_diff_files
5223
5224 # Note: yapf still seems to fix indentation of the entire file
5225 # even if line ranges are specified.
5226 # See https://github.com/google/yapf/issues/499
5227 if not opts.full and filtered_py_files:
5228 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5229
5230 for f in filtered_py_files:
5231 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5232 if yapf_config is None:
5233 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005234
5235 cmd = [yapf_tool, '--style', yapf_config, f]
5236
5237 has_formattable_lines = False
5238 if not opts.full:
5239 # Only run yapf over changed line ranges.
5240 for diff_start, diff_len in py_line_diffs[f]:
5241 diff_end = diff_start + diff_len - 1
5242 # Yapf errors out if diff_end < diff_start but this
5243 # is a valid line range diff for a removal.
5244 if diff_end >= diff_start:
5245 has_formattable_lines = True
5246 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5247 # If all line diffs were removals we have nothing to format.
5248 if not has_formattable_lines:
5249 continue
5250
5251 if opts.diff or opts.dry_run:
5252 cmd += ['--diff']
5253 # Will return non-zero exit code if non-empty diff.
5254 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5255 if opts.diff:
5256 sys.stdout.write(stdout)
5257 elif len(stdout) > 0:
5258 return_value = 2
5259 else:
5260 cmd += ['-i']
5261 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005262
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005263 # Dart's formatter does not have the nice property of only operating on
5264 # modified chunks, so hard code full.
5265 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005266 try:
5267 command = [dart_format.FindDartFmtToolInChromiumTree()]
5268 if not opts.dry_run and not opts.diff:
5269 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005270 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005271
ppi@chromium.org6593d932016-03-03 15:41:15 +00005272 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005273 if opts.dry_run and stdout:
5274 return_value = 2
5275 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005276 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5277 'found in this checkout. Files in other languages are still '
5278 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005279
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005280 # Format GN build files. Always run on full build files for canonical form.
5281 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005282 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005283 if opts.dry_run or opts.diff:
5284 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005285 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005286 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5287 shell=sys.platform == 'win32',
5288 cwd=top_dir)
5289 if opts.dry_run and gn_ret == 2:
5290 return_value = 2 # Not formatted.
5291 elif opts.diff and gn_ret == 2:
5292 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005293 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005294 elif gn_ret != 0:
5295 # For non-dry run cases (and non-2 return values for dry-run), a
5296 # nonzero error code indicates a failure, probably because the file
5297 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005298 DieWithError('gn format failed on ' + gn_diff_file +
5299 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005300
Ilya Shermane081cbe2017-08-15 17:51:04 -07005301 # Skip the metrics formatting from the global presubmit hook. These files have
5302 # a separate presubmit hook that issues an error if the files need formatting,
5303 # whereas the top-level presubmit script merely issues a warning. Formatting
5304 # these files is somewhat slow, so it's important not to duplicate the work.
5305 if not opts.presubmit:
5306 for xml_dir in GetDirtyMetricsDirs(diff_files):
5307 tool_dir = os.path.join(top_dir, xml_dir)
5308 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5309 if opts.dry_run or opts.diff:
5310 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005311 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005312 if opts.diff:
5313 sys.stdout.write(stdout)
5314 if opts.dry_run and stdout:
5315 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005316
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005317 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005318
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005319
Steven Holte2e664bf2017-04-21 13:10:47 -07005320def GetDirtyMetricsDirs(diff_files):
5321 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5322 metrics_xml_dirs = [
5323 os.path.join('tools', 'metrics', 'actions'),
5324 os.path.join('tools', 'metrics', 'histograms'),
5325 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005326 os.path.join('tools', 'metrics', 'ukm'),
5327 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005328 for xml_dir in metrics_xml_dirs:
5329 if any(file.startswith(xml_dir) for file in xml_diff_files):
5330 yield xml_dir
5331
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005332
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005333@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005334@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005335def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005336 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005337 _, args = parser.parse_args(args)
5338
5339 if len(args) != 1:
5340 parser.print_help()
5341 return 1
5342
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005343 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005344 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005345 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005346
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005347 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005348
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005349 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005350 output = RunGit(['config', '--local', '--get-regexp',
5351 r'branch\..*\.%s' % issueprefix],
5352 error_ok=True)
5353 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005354 if issue == target_issue:
5355 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005356
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005357 branches = []
5358 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005359 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005360 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005361 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005362 return 1
5363 if len(branches) == 1:
5364 RunGit(['checkout', branches[0]])
5365 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005366 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005367 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005368 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005369 which = raw_input('Choose by index: ')
5370 try:
5371 RunGit(['checkout', branches[int(which)]])
5372 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005373 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005374 return 1
5375
5376 return 0
5377
5378
maruel@chromium.org29404b52014-09-08 22:58:00 +00005379def CMDlol(parser, args):
5380 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005381 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005382 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5383 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5384 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005385 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005386 return 0
5387
5388
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005389class OptionParser(optparse.OptionParser):
5390 """Creates the option parse and add --verbose support."""
5391 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005392 optparse.OptionParser.__init__(
5393 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005394 self.add_option(
5395 '-v', '--verbose', action='count', default=0,
5396 help='Use 2 times for more debugging info')
5397
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005398 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005399 try:
5400 return self._parse_args(args)
5401 finally:
5402 # Regardless of success or failure of args parsing, we want to report
5403 # metrics, but only after logging has been initialized (if parsing
5404 # succeeded).
5405 global settings
5406 settings = Settings()
5407
5408 if not metrics.DISABLE_METRICS_COLLECTION:
5409 # GetViewVCUrl ultimately calls logging method.
5410 project_url = settings.GetViewVCUrl().strip('/+')
5411 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5412 metrics.collector.add('project_urls', [project_url])
5413
5414 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005415 # Create an optparse.Values object that will store only the actual passed
5416 # options, without the defaults.
5417 actual_options = optparse.Values()
5418 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5419 # Create an optparse.Values object with the default options.
5420 options = optparse.Values(self.get_default_values().__dict__)
5421 # Update it with the options passed by the user.
5422 options._update_careful(actual_options.__dict__)
5423 # Store the options passed by the user in an _actual_options attribute.
5424 # We store only the keys, and not the values, since the values can contain
5425 # arbitrary information, which might be PII.
5426 metrics.collector.add('arguments', actual_options.__dict__.keys())
5427
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005428 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005429 logging.basicConfig(
5430 level=levels[min(options.verbose, len(levels) - 1)],
5431 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5432 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005433
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005434 return options, args
5435
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005436
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005437def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005438 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005439 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005440 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005441 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005442
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005443 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005444 dispatcher = subcommand.CommandDispatcher(__name__)
5445 try:
5446 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005447 except auth.AuthenticationError as e:
5448 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005449 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005450 if e.code != 500:
5451 raise
5452 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005453 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005454 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005455 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005456
5457
5458if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005459 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5460 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005461 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005462 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005463 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005464 sys.exit(main(sys.argv[1:]))