blob: 4d9ec1abe943c4b5c11da3a3bbe5b13bd3dac75c [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
Brian Sheedy59b06a82019-10-14 17:03:29 +000017import glob
Edward Lemur202c5592019-10-21 22:44:52 +000018import httplib2
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 uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000033import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000034import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000035
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000036from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000037import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000038import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000039import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000040import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000041import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000042import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000043import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000044import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemura834f392019-10-22 22:23:00 +000057if sys.version_info.major == 2:
58 import httplib
59 import urllib2 as urllib_request
60 import urllib2 as urllib_error
61 import urlparse
62else:
63 import http.client as httplib
64 import urllib.request as urllib_request
65 import urllib.error as urllib_error
66 import urllib.parse as urlparse
67
tandrii7400cf02016-06-21 08:48:07 -070068__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000069
Edward Lemur0f58ae42019-04-30 17:24:12 +000070# Traces for git push will be stored in a traces directory inside the
71# depot_tools checkout.
72DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
73TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
74
75# When collecting traces, Git hashes will be reduced to 6 characters to reduce
76# the size after compression.
77GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
78# Used to redact the cookies from the gitcookies file.
79GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
80
Edward Lemurd4d1ba42019-09-20 21:46:37 +000081MAX_ATTEMPTS = 3
82
Edward Lemur1b52d872019-05-09 21:12:12 +000083# The maximum number of traces we will keep. Multiplied by 3 since we store
84# 3 files per trace.
85MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000086# Message to be displayed to the user to inform where to find the traces for a
87# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000088TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000089'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000091' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000092'Copies of your gitcookies file and git config have been recorded at:\n'
93' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000094# Format of the message to be stored as part of the traces to give developers a
95# better context when they go through traces.
96TRACES_README_FORMAT = (
97'Date: %(now)s\n'
98'\n'
99'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
100'Title: %(title)s\n'
101'\n'
102'%(description)s\n'
103'\n'
104'Execution time: %(execution_time)s\n'
105'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000106
tandrii9d2c7a32016-06-22 03:42:45 -0700107COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800108POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000109DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000110REFS_THAT_ALIAS_TO_OTHER_REFS = {
111 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
112 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
113}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000114
thestig@chromium.org44202a22014-03-11 19:22:18 +0000115# Valid extensions for files we want to lint.
116DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
117DEFAULT_LINT_IGNORE_REGEX = r"$^"
118
Aiden Bennerc08566e2018-10-03 17:52:42 +0000119# File name for yapf style config files.
120YAPF_CONFIG_FILENAME = '.style.yapf'
121
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000122# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000123Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000124
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000125# Initialized in main()
126settings = None
127
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100128# Used by tests/git_cl_test.py to add extra logging.
129# Inside the weirdly failing test, add this:
130# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700131# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100132_IS_BEING_TESTED = False
133
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000134
Christopher Lamf732cd52017-01-24 12:40:11 +1100135def DieWithError(message, change_desc=None):
136 if change_desc:
137 SaveDescriptionBackup(change_desc)
138
vapiera7fbd5a2016-06-16 09:17:49 -0700139 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000140 sys.exit(1)
141
142
Christopher Lamf732cd52017-01-24 12:40:11 +1100143def SaveDescriptionBackup(change_desc):
144 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000145 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100146 backup_file = open(backup_path, 'w')
147 backup_file.write(change_desc.description)
148 backup_file.close()
149
150
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000151def GetNoGitPagerEnv():
152 env = os.environ.copy()
153 # 'cat' is a magical git string that disables pagers on all platforms.
154 env['GIT_PAGER'] = 'cat'
155 return env
156
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000157
bsep@chromium.org627d9002016-04-29 00:00:52 +0000158def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000159 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000160 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000161 except subprocess2.CalledProcessError as e:
162 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000164 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000165 'Command "%s" failed.\n%s' % (
166 ' '.join(args), error_message or e.stdout or ''))
167 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000168
169
170def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000171 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000172 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000173
174
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000175def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000176 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700177 if suppress_stderr:
178 stderr = subprocess2.VOID
179 else:
180 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000181 try:
tandrii5d48c322016-08-18 16:19:37 -0700182 (out, _), code = subprocess2.communicate(['git'] + args,
183 env=GetNoGitPagerEnv(),
184 stdout=subprocess2.PIPE,
185 stderr=stderr)
186 return code, out
187 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900188 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700189 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000190
191
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000192def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000193 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000194 return RunGitWithCode(args, suppress_stderr=True)[1]
195
196
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000197def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000198 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000200 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000201 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000202
203
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000204def BranchExists(branch):
205 """Return True if specified branch exists."""
206 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
207 suppress_stderr=True)
208 return not code
209
210
tandrii2a16b952016-10-19 07:09:44 -0700211def time_sleep(seconds):
212 # Use this so that it can be mocked in tests without interfering with python
213 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700214 return time.sleep(seconds)
215
216
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000217def time_time():
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
220 return time.time()
221
222
Edward Lemur1b52d872019-05-09 21:12:12 +0000223def datetime_now():
224 # Use this so that it can be mocked in tests without interfering with python
225 # system machinery.
226 return datetime.datetime.now()
227
228
maruel@chromium.org90541732011-04-01 17:54:18 +0000229def ask_for_data(prompt):
230 try:
231 return raw_input(prompt)
232 except KeyboardInterrupt:
233 # Hide the exception.
234 sys.exit(1)
235
236
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100237def confirm_or_exit(prefix='', action='confirm'):
238 """Asks user to press enter to continue or press Ctrl+C to abort."""
239 if not prefix or prefix.endswith('\n'):
240 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100241 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100242 mid = ' Press'
243 elif prefix.endswith(' '):
244 mid = 'press'
245 else:
246 mid = ' press'
247 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
248
249
250def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000251 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
253 while True:
254 if 'yes'.startswith(result):
255 return True
256 if 'no'.startswith(result):
257 return False
258 result = ask_for_data('Please, type yes or no: ').lower()
259
260
tandrii5d48c322016-08-18 16:19:37 -0700261def _git_branch_config_key(branch, key):
262 """Helper method to return Git config key for a branch."""
263 assert branch, 'branch name is required to set git config for it'
264 return 'branch.%s.%s' % (branch, key)
265
266
267def _git_get_branch_config_value(key, default=None, value_type=str,
268 branch=False):
269 """Returns git config value of given or current branch if any.
270
271 Returns default in all other cases.
272 """
273 assert value_type in (int, str, bool)
274 if branch is False: # Distinguishing default arg value from None.
275 branch = GetCurrentBranch()
276
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000277 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700278 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000279
tandrii5d48c322016-08-18 16:19:37 -0700280 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700281 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700282 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000283 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700284 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700285 args.append(_git_branch_config_key(branch, key))
286 code, out = RunGitWithCode(args)
287 if code == 0:
288 value = out.strip()
289 if value_type == int:
290 return int(value)
291 if value_type == bool:
292 return bool(value.lower() == 'true')
293 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000294 return default
295
296
tandrii5d48c322016-08-18 16:19:37 -0700297def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000298 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700299
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000300 If value is None, the key will be unset, otherwise it will be set.
301 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700302 """
303 if not branch:
304 branch = GetCurrentBranch()
305 assert branch, 'a branch name OR currently checked out branch is required'
306 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700307 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700308 if value is None:
309 args.append('--unset')
310 elif isinstance(value, bool):
311 args.append('--bool')
312 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700313 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000314 # `git config` also has --int, but apparently git config suffers from
315 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700316 value = str(value)
317 args.append(_git_branch_config_key(branch, key))
318 if value is not None:
319 args.append(value)
320 RunGit(args, **kwargs)
321
322
machenbach@chromium.org45453142015-09-15 08:45:22 +0000323def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000324 prop_list = getattr(options, 'properties', [])
325 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000326 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000327 try:
328 properties[key] = json.loads(val)
329 except ValueError:
330 pass # If a value couldn't be evaluated, treat it as a string.
331 return properties
332
333
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334# TODO(crbug.com/976104): Remove this function once git-cl try-results has
335# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000336def _buildbucket_retry(operation_name, http, *args, **kwargs):
337 """Retries requests to buildbucket service and returns parsed json content."""
338 try_count = 0
339 while True:
340 response, content = http.request(*args, **kwargs)
341 try:
342 content_json = json.loads(content)
343 except ValueError:
344 content_json = None
345
346 # Buildbucket could return an error even if status==200.
347 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000348 error = content_json.get('error')
349 if error.get('code') == 403:
350 raise BuildbucketResponseException(
351 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000352 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000353 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000354 raise BuildbucketResponseException(msg)
355
356 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700357 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000358 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000359 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700360 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000361 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 content)
363 return content_json
364 if response.status < 500 or try_count >= 2:
365 raise httplib2.HttpLib2Error(content)
366
367 # status >= 500 means transient failures.
368 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000369 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370 try_count += 1
371 assert False, 'unreachable'
372
373
Edward Lemur4c707a22019-09-24 21:13:43 +0000374def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000375 """Calls a buildbucket v2 method and returns the parsed json response."""
376 headers = {
377 'Accept': 'application/json',
378 'Content-Type': 'application/json',
379 }
380 request = json.dumps(request)
381 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
382
383 logging.info('POST %s with %s' % (url, request))
384
385 attempts = 1
386 time_to_sleep = 1
387 while True:
388 response, content = http.request(url, 'POST', body=request, headers=headers)
389 if response.status == 200:
390 return json.loads(content[4:])
391 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
392 msg = '%s error when calling POST %s with %s: %s' % (
393 response.status, url, request, content)
394 raise BuildbucketResponseException(msg)
395 logging.debug(
396 '%s error when calling POST %s with %s. '
397 'Sleeping for %d seconds and retrying...' % (
398 response.status, url, request, time_to_sleep))
399 time.sleep(time_to_sleep)
400 time_to_sleep *= 2
401 attempts += 1
402
403 assert False, 'unreachable'
404
405
qyearsley1fdfcb62016-10-24 13:22:03 -0700406def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700407 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000408 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 """
qyearsleydd49f942016-10-28 11:57:22 -0700410 # If no bots are listed, we try to get a set of builders and tests based
411 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700412 if not options.bot:
413 change = changelist.GetChange(
414 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700415 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700416 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700417 change=change,
418 changed_files=change.LocalPaths(),
419 repository_root=settings.GetRoot(),
420 default_presubmit=None,
421 project=None,
422 verbose=options.verbose,
423 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700424 if masters is None:
425 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000426 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700427
qyearsley1fdfcb62016-10-24 13:22:03 -0700428 if options.bucket:
429 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000430 option_parser.error(
431 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700432
433
Edward Lemur6215c792019-10-03 21:59:05 +0000434def _parse_bucket(raw_bucket):
435 legacy = True
436 project = bucket = None
437 if '/' in raw_bucket:
438 legacy = False
439 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000440 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000441 elif raw_bucket.startswith('luci.'):
442 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000443 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000444 elif '.' in raw_bucket:
445 project = raw_bucket.split('.')[0]
446 bucket = raw_bucket
447 # Legacy buckets.
448 if legacy:
449 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
450 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000451
452
Edward Lemur5b929a42019-10-21 17:57:39 +0000453def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000454 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700455
456 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000457 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700458 buckets: A nested dict mapping bucket names to builders to tests.
459 options: Command-line options.
460 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000462 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000463 print('Bucket:', bucket)
464 print('\n'.join(
465 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000466 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000467 print('To see results here, run: git cl try-results')
468 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700469
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000470 requests = _make_try_job_schedule_requests(
471 changelist, buckets, options, patchset)
472 if not requests:
473 return
474
Edward Lemur5b929a42019-10-21 17:57:39 +0000475 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000476 http.force_exception_to_status_code = True
477
478 batch_request = {'requests': requests}
479 batch_response = _call_buildbucket(
480 http, options.buildbucket_host, 'Batch', batch_request)
481
482 errors = [
483 ' ' + response['error']['message']
484 for response in batch_response.get('responses', [])
485 if 'error' in response
486 ]
487 if errors:
488 raise BuildbucketResponseException(
489 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
490
491
492def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000493 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000494 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000495 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000496 shared_properties['clobber'] = True
497 shared_properties.update(_get_properties_from_options(options) or {})
498
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000499 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
500 if options.retry_failed:
501 shared_tags.append({'key': 'retry_failed',
502 'value': '1'})
503
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000504 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000505 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000506 project, bucket = _parse_bucket(raw_bucket)
507 if not project or not bucket:
508 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
509 continue
510
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000511 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000512 properties = shared_properties.copy()
513 if 'presubmit' in builder.lower():
514 properties['dry_run'] = 'true'
515 if tests:
516 properties['testfilter'] = tests
517
518 requests.append({
519 'scheduleBuild': {
520 'requestId': str(uuid.uuid4()),
521 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000522 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000523 'bucket': bucket,
524 'builder': builder,
525 },
526 'gerritChanges': gerrit_changes,
527 'properties': properties,
528 'tags': [
529 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000530 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000531 }
532 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000533 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000534
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000535
Edward Lemur5b929a42019-10-21 17:57:39 +0000536def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000537 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000541 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 request = {
543 'predicate': {
544 'gerritChanges': [changelist.GetGerritChange(patchset)],
545 },
546 'fields': ','.join('builds.*.' + field for field in fields),
547 }
tandrii221ab252016-10-06 08:12:04 -0700548
Edward Lemur5b929a42019-10-21 17:57:39 +0000549 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 if authenticator.has_cached_credentials():
551 http = authenticator.authorize(httplib2.Http())
552 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700553 print('Warning: Some results might be missing because %s' %
554 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000555 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 http.force_exception_to_status_code = True
558
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000559 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
560 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561
Edward Lemur5b929a42019-10-21 17:57:39 +0000562def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000563 """Fetches builds from the latest patchset that has builds (within
564 the last few patchsets).
565
566 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567 changelist (Changelist): The CL to fetch builds for
568 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000569 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
570 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000571 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000572 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
573 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000574 """
575 assert buildbucket_host
576 assert changelist.GetIssue(), 'CL must be uploaded first'
577 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000578 if latest_patchset is None:
579 assert changelist.GetMostRecentPatchset()
580 ps = changelist.GetMostRecentPatchset()
581 else:
582 assert latest_patchset > 0, latest_patchset
583 ps = latest_patchset
584
Quinten Yearsley983111f2019-09-26 17:18:48 +0000585 min_ps = max(1, ps - 5)
586 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000587 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000588 if len(builds):
589 return builds, ps
590 ps -= 1
591 return [], 0
592
593
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000594def _filter_failed_for_retry(all_builds):
595 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000596
597 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000598 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000599 i.e. a list of buildbucket.v2.Builds which includes status and builder
600 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000601
602 Returns:
603 A dict of bucket to builder to tests (empty list). This is the same format
604 accepted by _trigger_try_jobs and returned by _get_bucket_map.
605 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000606
607 def _builder_of(build):
608 builder = build['builder']
609 return (builder['project'], builder['bucket'], builder['builder'])
610
611 res = collections.defaultdict(dict)
612 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
613 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
614 # If builder had several builds, retry only if the last one failed.
615 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
616 # build, but in case of retrying failed jobs retrying a flaky one makes
617 # sense.
618 builds = list(builds)
619 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
620 continue
621 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
622 for t in builds[-1]['tags']):
623 # Don't retry experimental build previously triggered by CQ.
624 continue
625 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
626 # Don't retry if any are running.
627 continue
628 res[proj + '/' + buck][bldr] = []
629 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000630
631
qyearsleyeab3c042016-08-24 09:18:28 -0700632def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633 """Prints nicely result of fetch_try_jobs."""
634 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000635 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 return
637
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000638 longest_builder = max(len(b['builder']['builder']) for b in builds)
639 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000640 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000641 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
642 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000643
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000644 builds_by_status = {}
645 for b in builds:
646 builds_by_status.setdefault(b['status'], []).append({
647 'id': b['id'],
648 'name': name_fmt.format(
649 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
650 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000651
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000652 sort_key = lambda b: (b['name'], b['id'])
653
654 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000655 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000656 if not builds:
657 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000658
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000659 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000660 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000661 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000662 else:
663 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
664
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000665 print(colorize(title))
666 for b in sorted(builds, key=sort_key):
667 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668
669 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000670 print_builds(
671 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
672 print_builds(
673 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
674 color=Fore.MAGENTA)
675 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
676 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
677 color=Fore.MAGENTA)
678 print_builds('Started:', builds_by_status.pop('STARTED', []))
679 print_builds(
680 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000681 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000682 print_builds(
683 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000684 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000685
686
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687def _ComputeDiffLineRanges(files, upstream_commit):
688 """Gets the changed line ranges for each file since upstream_commit.
689
690 Parses a git diff on provided files and returns a dict that maps a file name
691 to an ordered list of range tuples in the form (start_line, count).
692 Ranges are in the same format as a git diff.
693 """
694 # If files is empty then diff_output will be a full diff.
695 if len(files) == 0:
696 return {}
697
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000698 # Take the git diff and find the line ranges where there are changes.
Jamie Madill812ac222019-10-16 16:43:08 +0000699 lines = '-U%s' % settings.GetDiffLinesOfContext()
700 diff_cmd = BuildGitDiffCmd(lines, upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000701 diff_output = RunGit(diff_cmd)
702
703 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
704 # 2 capture groups
705 # 0 == fname of diff file
706 # 1 == 'diff_start,diff_count' or 'diff_start'
707 # will match each of
708 # diff --git a/foo.foo b/foo.py
709 # @@ -12,2 +14,3 @@
710 # @@ -12,2 +17 @@
711 # running re.findall on the above string with pattern will give
712 # [('foo.py', ''), ('', '14,3'), ('', '17')]
713
714 curr_file = None
715 line_diffs = {}
716 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
717 if match[0] != '':
718 # Will match the second filename in diff --git a/a.py b/b.py.
719 curr_file = match[0]
720 line_diffs[curr_file] = []
721 else:
722 # Matches +14,3
723 if ',' in match[1]:
724 diff_start, diff_count = match[1].split(',')
725 else:
726 # Single line changes are of the form +12 instead of +12,1.
727 diff_start = match[1]
728 diff_count = 1
729
730 diff_start = int(diff_start)
731 diff_count = int(diff_count)
732
733 # If diff_count == 0 this is a removal we can ignore.
734 line_diffs[curr_file].append((diff_start, diff_count))
735
736 return line_diffs
737
738
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000740 """Checks if a yapf file is in any parent directory of fpath until top_dir.
741
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000742 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000743 is found returns None. Uses yapf_config_cache as a cache for previously found
744 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000745 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000746 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000747 # Return result if we've already computed it.
748 if fpath in yapf_config_cache:
749 return yapf_config_cache[fpath]
750
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000751 parent_dir = os.path.dirname(fpath)
752 if os.path.isfile(fpath):
753 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000754 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000755 # Otherwise fpath is a directory
756 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
757 if os.path.isfile(yapf_file):
758 ret = yapf_file
759 elif fpath == top_dir or parent_dir == fpath:
760 # If we're at the top level directory, or if we're at root
761 # there is no provided style.
762 ret = None
763 else:
764 # Otherwise recurse on the current directory.
765 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000766 yapf_config_cache[fpath] = ret
767 return ret
768
769
Brian Sheedy59b06a82019-10-14 17:03:29 +0000770def _GetYapfIgnoreFilepaths(top_dir):
771 """Returns all filepaths that match the ignored files in the .yapfignore file.
772
773 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
774 but this functionality appears to break when explicitly passing files to
775 yapf for formatting. According to
776 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
777 the .yapfignore file should be in the directory that yapf is invoked from,
778 which we assume to be the top level directory in this case.
779
780 Args:
781 top_dir: The top level directory for the repository being formatted.
782
783 Returns:
784 A set of all filepaths that should be ignored by yapf.
785 """
786 yapfignore_file = os.path.join(top_dir, '.yapfignore')
787 ignore_filepaths = set()
788 if not os.path.exists(yapfignore_file):
789 return ignore_filepaths
790
791 # glob works relative to the current working directory, so we need to ensure
792 # that we're at the top level directory.
793 old_cwd = os.getcwd()
794 try:
795 os.chdir(top_dir)
796 with open(yapfignore_file) as f:
797 for line in f.readlines():
798 stripped_line = line.strip()
799 # Comments and blank lines should be ignored.
800 if stripped_line.startswith('#') or stripped_line == '':
801 continue
802 ignore_filepaths |= set(glob.glob(stripped_line))
803 return ignore_filepaths
804 finally:
805 os.chdir(old_cwd)
806
807
Aaron Gable13101a62018-02-09 13:20:41 -0800808def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000809 """Prints statistics about the change to the user."""
810 # --no-ext-diff is broken in some versions of Git, so try to work around
811 # this by overriding the environment (but there is still a problem if the
812 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000813 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000814 if 'GIT_EXTERNAL_DIFF' in env:
815 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000816
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000817 try:
818 stdout = sys.stdout.fileno()
819 except AttributeError:
820 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000821 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800822 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000823 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000824
825
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000826class BuildbucketResponseException(Exception):
827 pass
828
829
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000830class Settings(object):
831 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000833 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 self.tree_status_url = None
835 self.viewvc_url = None
836 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000839 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000840 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000841
842 def LazyUpdateIfNeeded(self):
843 """Updates the settings from a codereview.settings file, if available."""
844 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000845 # The only value that actually changes the behavior is
846 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000847 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000848 error_ok=True
849 ).strip().lower()
850
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000851 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000852 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000853 LoadCodereviewSettingsFromFile(cr_settings_file)
854 self.updated = True
855
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000856 @staticmethod
857 def GetRelativeRoot():
858 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000859
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000860 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000861 if self.root is None:
862 self.root = os.path.abspath(self.GetRelativeRoot())
863 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000864
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000865 def GetTreeStatusUrl(self, error_ok=False):
866 if not self.tree_status_url:
867 error_message = ('You must configure your tree status URL by running '
868 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000869 self.tree_status_url = self._GetConfig(
870 'rietveld.tree-status-url', error_ok=error_ok,
871 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000872 return self.tree_status_url
873
874 def GetViewVCUrl(self):
875 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000876 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000877 return self.viewvc_url
878
rmistry@google.com90752582014-01-14 21:04:50 +0000879 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000881
rmistry@google.com5626a922015-02-26 14:03:30 +0000882 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000883 run_post_upload_hook = self._GetConfig(
884 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000885 return run_post_upload_hook == "True"
886
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000887 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000888 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000889
ukai@chromium.orge8077812012-02-03 03:41:46 +0000890 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000891 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000892 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700893 self.is_gerrit = (
894 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000895 return self.is_gerrit
896
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000897 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000898 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000899 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700900 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
901 if self.squash_gerrit_uploads is None:
902 # Default is squash now (http://crbug.com/611892#c23).
903 self.squash_gerrit_uploads = not (
904 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
905 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000906 return self.squash_gerrit_uploads
907
tandriia60502f2016-06-20 02:01:53 -0700908 def GetSquashGerritUploadsOverride(self):
909 """Return True or False if codereview.settings should be overridden.
910
911 Returns None if no override has been defined.
912 """
913 # See also http://crbug.com/611892#c23
914 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
915 error_ok=True).strip()
916 if result == 'true':
917 return True
918 if result == 'false':
919 return False
920 return None
921
tandrii@chromium.org28253532016-04-14 13:46:56 +0000922 def GetGerritSkipEnsureAuthenticated(self):
923 """Return True if EnsureAuthenticated should not be done for Gerrit
924 uploads."""
925 if self.gerrit_skip_ensure_authenticated is None:
926 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000927 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000928 error_ok=True).strip() == 'true')
929 return self.gerrit_skip_ensure_authenticated
930
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000931 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000932 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000933 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000934 # Git requires single quotes for paths with spaces. We need to replace
935 # them with double quotes for Windows to treat such paths as a single
936 # path.
937 self.git_editor = self._GetConfig(
938 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000939 return self.git_editor or None
940
thestig@chromium.org44202a22014-03-11 19:22:18 +0000941 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000942 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000943 DEFAULT_LINT_REGEX)
944
945 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000946 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000947 DEFAULT_LINT_IGNORE_REGEX)
948
Jamie Madill812ac222019-10-16 16:43:08 +0000949 def GetDiffLinesOfContext(self):
950 return (self._GetConfig('rietveld.diff-lines-of-context', error_ok=True) or
951 "0")
952
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000953 def _GetConfig(self, param, **kwargs):
954 self.LazyUpdateIfNeeded()
955 return RunGit(['config', param], **kwargs).strip()
956
957
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000958def ShortBranchName(branch):
959 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000960 return branch.replace('refs/heads/', '', 1)
961
962
963def GetCurrentBranchRef():
964 """Returns branch ref (e.g., refs/heads/master) or None."""
965 return RunGit(['symbolic-ref', 'HEAD'],
966 stderr=subprocess2.VOID, error_ok=True).strip() or None
967
968
969def GetCurrentBranch():
970 """Returns current branch or None.
971
972 For refs/heads/* branches, returns just last part. For others, full ref.
973 """
974 branchref = GetCurrentBranchRef()
975 if branchref:
976 return ShortBranchName(branchref)
977 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000978
979
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000980class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000981 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000982 NONE = 'none'
983 DRY_RUN = 'dry_run'
984 COMMIT = 'commit'
985
986 ALL_STATES = [NONE, DRY_RUN, COMMIT]
987
988
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000989class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000990 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000991 self.issue = issue
992 self.patchset = patchset
993 self.hostname = hostname
994
995 @property
996 def valid(self):
997 return self.issue is not None
998
999
Edward Lemurf38bc172019-09-03 21:02:13 +00001000def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001001 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1002 fail_result = _ParsedIssueNumberArgument()
1003
Edward Lemur678a6842019-10-03 22:25:05 +00001004 if isinstance(arg, int):
1005 return _ParsedIssueNumberArgument(issue=arg)
1006 if not isinstance(arg, basestring):
1007 return fail_result
1008
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001009 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001010 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001011 if not arg.startswith('http'):
1012 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001013
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001014 url = gclient_utils.UpgradeToHttps(arg)
1015 try:
1016 parsed_url = urlparse.urlparse(url)
1017 except ValueError:
1018 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001019
Edward Lemur678a6842019-10-03 22:25:05 +00001020 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1021 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1022 # Short urls like https://domain/<issue_number> can be used, but don't allow
1023 # specifying the patchset (you'd 404), but we allow that here.
1024 if parsed_url.path == '/':
1025 part = parsed_url.fragment
1026 else:
1027 part = parsed_url.path
1028
1029 match = re.match(
1030 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1031 if not match:
1032 return fail_result
1033
1034 issue = int(match.group('issue'))
1035 patchset = match.group('patchset')
1036 return _ParsedIssueNumberArgument(
1037 issue=issue,
1038 patchset=int(patchset) if patchset else None,
1039 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040
1041
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001042def _create_description_from_log(args):
1043 """Pulls out the commit log to use as a base for the CL description."""
1044 log_args = []
1045 if len(args) == 1 and not args[0].endswith('.'):
1046 log_args = [args[0] + '..']
1047 elif len(args) == 1 and args[0].endswith('...'):
1048 log_args = [args[0][:-1]]
1049 elif len(args) == 2:
1050 log_args = [args[0] + '..' + args[1]]
1051 else:
1052 log_args = args[:] # Hope for the best!
1053 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1054
1055
Aaron Gablea45ee112016-11-22 15:14:38 -08001056class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001057 def __init__(self, issue, url):
1058 self.issue = issue
1059 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001060 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001061
1062 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001063 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001064 self.issue, self.url)
1065
1066
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001067_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001068 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001069 # TODO(tandrii): these two aren't known in Gerrit.
1070 'approval', 'disapproval'])
1071
1072
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001073class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001074 """Changelist works with one changelist in local branch.
1075
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001076 Notes:
1077 * Not safe for concurrent multi-{thread,process} use.
1078 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001079 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001080 """
1081
Edward Lemur125d60a2019-09-13 18:25:41 +00001082 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001083 """Create a new ChangeList instance.
1084
Edward Lemurf38bc172019-09-03 21:02:13 +00001085 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001086 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001087 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001088 global settings
1089 if not settings:
1090 # Happens when git_cl.py is used as a utility library.
1091 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001092
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093 self.branchref = branchref
1094 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001095 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096 self.branch = ShortBranchName(self.branchref)
1097 else:
1098 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001100 self.lookedup_issue = False
1101 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 self.has_description = False
1103 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001104 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001106 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001107 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001108 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001109 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001110
Edward Lemur125d60a2019-09-13 18:25:41 +00001111 # Lazily cached values.
1112 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1113 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1114 # Map from change number (issue) to its detail cache.
1115 self._detail_cache = {}
1116
1117 if codereview_host is not None:
1118 assert not codereview_host.startswith('https://'), codereview_host
1119 self._gerrit_host = codereview_host
1120 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121
1122 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001123 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001124
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001125 The return value is a string suitable for passing to git cl with the --cc
1126 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001127 """
1128 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001129 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001130 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001131 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1132 return self.cc
1133
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001134 def GetCCListWithoutDefault(self):
1135 """Return the users cc'd on this CL excluding default ones."""
1136 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001137 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001138 return self.cc
1139
Daniel Cheng7227d212017-11-17 08:12:37 -08001140 def ExtendCC(self, more_cc):
1141 """Extends the list of users to cc on this CL based on the changed files."""
1142 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143
1144 def GetBranch(self):
1145 """Returns the short branch name, e.g. 'master'."""
1146 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001147 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001148 if not branchref:
1149 return None
1150 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001151 self.branch = ShortBranchName(self.branchref)
1152 return self.branch
1153
1154 def GetBranchRef(self):
1155 """Returns the full branch name, e.g. 'refs/heads/master'."""
1156 self.GetBranch() # Poke the lazy loader.
1157 return self.branchref
1158
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001159 def ClearBranch(self):
1160 """Clears cached branch data of this object."""
1161 self.branch = self.branchref = None
1162
tandrii5d48c322016-08-18 16:19:37 -07001163 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1164 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1165 kwargs['branch'] = self.GetBranch()
1166 return _git_get_branch_config_value(key, default, **kwargs)
1167
1168 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1169 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1170 assert self.GetBranch(), (
1171 'this CL must have an associated branch to %sset %s%s' %
1172 ('un' if value is None else '',
1173 key,
1174 '' if value is None else ' to %r' % value))
1175 kwargs['branch'] = self.GetBranch()
1176 return _git_set_branch_config_value(key, value, **kwargs)
1177
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 @staticmethod
1179 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001180 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181 e.g. 'origin', 'refs/heads/master'
1182 """
1183 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001184 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1185
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001186 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001187 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001188 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001189 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1190 error_ok=True).strip()
1191 if upstream_branch:
1192 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001194 # Else, try to guess the origin remote.
1195 remote_branches = RunGit(['branch', '-r']).split()
1196 if 'origin/master' in remote_branches:
1197 # Fall back on origin/master if it exits.
1198 remote = 'origin'
1199 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001200 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001201 DieWithError(
1202 'Unable to determine default branch to diff against.\n'
1203 'Either pass complete "git diff"-style arguments, like\n'
1204 ' git cl upload origin/master\n'
1205 'or verify this branch is set up to track another \n'
1206 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207
1208 return remote, upstream_branch
1209
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001210 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001211 upstream_branch = self.GetUpstreamBranch()
1212 if not BranchExists(upstream_branch):
1213 DieWithError('The upstream for the current branch (%s) does not exist '
1214 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001215 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001216 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001217
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218 def GetUpstreamBranch(self):
1219 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001220 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001221 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001222 upstream_branch = upstream_branch.replace('refs/heads/',
1223 'refs/remotes/%s/' % remote)
1224 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1225 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001226 self.upstream_branch = upstream_branch
1227 return self.upstream_branch
1228
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001229 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001230 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001231 remote, branch = None, self.GetBranch()
1232 seen_branches = set()
1233 while branch not in seen_branches:
1234 seen_branches.add(branch)
1235 remote, branch = self.FetchUpstreamTuple(branch)
1236 branch = ShortBranchName(branch)
1237 if remote != '.' or branch.startswith('refs/remotes'):
1238 break
1239 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001240 remotes = RunGit(['remote'], error_ok=True).split()
1241 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001242 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001243 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001245 logging.warn('Could not determine which remote this change is '
1246 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001247 else:
1248 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001249 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001250 branch = 'HEAD'
1251 if branch.startswith('refs/remotes'):
1252 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001253 elif branch.startswith('refs/branch-heads/'):
1254 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001255 else:
1256 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001257 return self._remote
1258
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001259 def GitSanityChecks(self, upstream_git_obj):
1260 """Checks git repo status and ensures diff is from local commits."""
1261
sbc@chromium.org79706062015-01-14 21:18:12 +00001262 if upstream_git_obj is None:
1263 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001264 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001265 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001266 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001267 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001268 return False
1269
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 # Verify the commit we're diffing against is in our current branch.
1271 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1272 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1273 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001274 print('ERROR: %s is not in the current branch. You may need to rebase '
1275 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001276 return False
1277
1278 # List the commits inside the diff, and verify they are all local.
1279 commits_in_diff = RunGit(
1280 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1281 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1282 remote_branch = remote_branch.strip()
1283 if code != 0:
1284 _, remote_branch = self.GetRemoteBranch()
1285
1286 commits_in_remote = RunGit(
1287 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1288
1289 common_commits = set(commits_in_diff) & set(commits_in_remote)
1290 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001291 print('ERROR: Your diff contains %d commits already in %s.\n'
1292 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1293 'the diff. If you are using a custom git flow, you can override'
1294 ' the reference used for this check with "git config '
1295 'gitcl.remotebranch <git-ref>".' % (
1296 len(common_commits), remote_branch, upstream_git_obj),
1297 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001298 return False
1299 return True
1300
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001301 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001302 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001303
1304 Returns None if it is not set.
1305 """
tandrii5d48c322016-08-18 16:19:37 -07001306 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001307
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308 def GetRemoteUrl(self):
1309 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1310
1311 Returns None if there is no remote.
1312 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001313 is_cached, value = self._cached_remote_url
1314 if is_cached:
1315 return value
1316
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001318 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1319
Edward Lemur298f2cf2019-02-22 21:40:39 +00001320 # Check if the remote url can be parsed as an URL.
1321 host = urlparse.urlparse(url).netloc
1322 if host:
1323 self._cached_remote_url = (True, url)
1324 return url
1325
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001326 # If it cannot be parsed as an url, assume it is a local directory,
1327 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001328 logging.warning('"%s" doesn\'t appear to point to a git host. '
1329 'Interpreting it as a local directory.', url)
1330 if not os.path.isdir(url):
1331 logging.error(
1332 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001333 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001334 return None
1335
1336 cache_path = url
1337 url = RunGit(['config', 'remote.%s.url' % remote],
1338 error_ok=True,
1339 cwd=url).strip()
1340
1341 host = urlparse.urlparse(url).netloc
1342 if not host:
1343 logging.error(
1344 'Remote "%(remote)s" for branch "%(branch)s" points to '
1345 '"%(cache_path)s", but it is misconfigured.\n'
1346 '"%(cache_path)s" must be a git repo and must have a remote named '
1347 '"%(remote)s" pointing to the git host.', {
1348 'remote': remote,
1349 'cache_path': cache_path,
1350 'branch': self.GetBranch()})
1351 return None
1352
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001353 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001354 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001356 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001357 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001358 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001359 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001360 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001361 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 return self.issue
1363
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001364 def GetIssueURL(self):
1365 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366 issue = self.GetIssue()
1367 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001368 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001369 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001371 def GetDescription(self, pretty=False, force=False):
1372 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001373 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001374 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375 self.has_description = True
1376 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001377 # Set width to 72 columns + 2 space indent.
1378 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001380 lines = self.description.splitlines()
1381 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001382 return self.description
1383
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001384 def GetDescriptionFooters(self):
1385 """Returns (non_footer_lines, footers) for the commit message.
1386
1387 Returns:
1388 non_footer_lines (list(str)) - Simple list of description lines without
1389 any footer. The lines do not contain newlines, nor does the list contain
1390 the empty line between the message and the footers.
1391 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1392 [("Change-Id", "Ideadbeef...."), ...]
1393 """
1394 raw_description = self.GetDescription()
1395 msg_lines, _, footers = git_footers.split_footers(raw_description)
1396 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001397 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001398 return msg_lines, footers
1399
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001401 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001402 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001403 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001404 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001405 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 return self.patchset
1407
1408 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001409 """Set this branch's patchset. If patchset=0, clears the patchset."""
1410 assert self.GetBranch()
1411 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001413 else:
1414 self.patchset = int(patchset)
1415 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001416 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001418 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001419 """Set this branch's issue. If issue isn't given, clears the issue."""
1420 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001422 issue = int(issue)
1423 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001424 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001425 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001426 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001427 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001428 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001429 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001430 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 else:
tandrii5d48c322016-08-18 16:19:37 -07001432 # Reset all of these just to be clean.
1433 reset_suffixes = [
1434 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001435 self.IssueConfigKey(),
1436 self.PatchsetConfigKey(),
1437 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001438 ] + self._PostUnsetIssueProperties()
1439 for prop in reset_suffixes:
1440 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001441 msg = RunGit(['log', '-1', '--format=%B']).strip()
1442 if msg and git_footers.get_footer_change_id(msg):
1443 print('WARNING: The change patched into this branch has a Change-Id. '
1444 'Removing it.')
1445 RunGit(['commit', '--amend', '-m',
1446 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001447 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001448 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001449 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001450
dnjba1b0f32016-09-02 12:37:42 -07001451 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001452 if not self.GitSanityChecks(upstream_branch):
1453 DieWithError('\nGit sanity check failure')
1454
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001455 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001456 if not root:
1457 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001458 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001459
1460 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001461 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001462 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001463 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001464 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001465 except subprocess2.CalledProcessError:
1466 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001467 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001468 'This branch probably doesn\'t exist anymore. To reset the\n'
1469 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001470 ' git branch --set-upstream-to origin/master %s\n'
1471 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001472 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001473
maruel@chromium.org52424302012-08-29 15:14:30 +00001474 issue = self.GetIssue()
1475 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001476 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001477 description = self.GetDescription()
1478 else:
1479 # If the change was never uploaded, use the log messages of all commits
1480 # up to the branch point, as git cl upload will prefill the description
1481 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001482 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1483 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001484
1485 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001486 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001487 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001488 name,
1489 description,
1490 absroot,
1491 files,
1492 issue,
1493 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001494 author,
1495 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001496
dsansomee2d6fd92016-09-08 00:10:47 -07001497 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001498 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001499 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001500 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001501
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001502 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1503 """Sets the description for this CL remotely.
1504
1505 You can get description_lines and footers with GetDescriptionFooters.
1506
1507 Args:
1508 description_lines (list(str)) - List of CL description lines without
1509 newline characters.
1510 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1511 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1512 `List-Of-Tokens`). It will be case-normalized so that each token is
1513 title-cased.
1514 """
1515 new_description = '\n'.join(description_lines)
1516 if footers:
1517 new_description += '\n'
1518 for k, v in footers:
1519 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1520 if not git_footers.FOOTER_PATTERN.match(foot):
1521 raise ValueError('Invalid footer %r' % foot)
1522 new_description += foot + '\n'
1523 self.UpdateDescription(new_description, force)
1524
Edward Lesmes8e282792018-04-03 18:50:29 -04001525 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001526 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1527 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001528 start = time_time()
1529 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001530 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1531 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001532 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001533 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001534 metrics.collector.add_repeated('sub_commands', {
1535 'command': 'presubmit',
1536 'execution_time': time_time() - start,
1537 'exit_code': 0 if result.should_continue() else 1,
1538 })
1539 return result
vapierfd77ac72016-06-16 08:33:57 -07001540 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001541 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001542
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 def CMDUpload(self, options, git_diff_args, orig_args):
1544 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001545 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001547 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001548 else:
1549 if self.GetBranch() is None:
1550 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1551
1552 # Default to diffing against common ancestor of upstream branch
1553 base_branch = self.GetCommonAncestorWithUpstream()
1554 git_diff_args = [base_branch, 'HEAD']
1555
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001556 # Fast best-effort checks to abort before running potentially expensive
1557 # hooks if uploading is likely to fail anyway. Passing these checks does
1558 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001559 self.EnsureAuthenticated(force=options.force)
1560 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561
1562 # Apply watchlists on upload.
1563 change = self.GetChange(base_branch, None)
1564 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1565 files = [f.LocalPath() for f in change.AffectedFiles()]
1566 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001567 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568
1569 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001570 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001571 # Set the reviewer list now so that presubmit checks can access it.
1572 change_description = ChangeDescription(change.FullDescriptionText())
1573 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001574 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001575 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 change)
1577 change.SetDescriptionText(change_description.description)
1578 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001579 may_prompt=not options.force,
1580 verbose=options.verbose,
1581 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001582 if not hook_results.should_continue():
1583 return 1
1584 if not options.reviewers and hook_results.reviewers:
1585 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001586 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587
Aaron Gable13101a62018-02-09 13:20:41 -08001588 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001589 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001591 _git_set_branch_config_value('last-upload-hash',
1592 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001593 # Run post upload hooks, if specified.
1594 if settings.GetRunPostUploadHook():
1595 presubmit_support.DoPostUploadExecuter(
1596 change,
1597 self,
1598 settings.GetRoot(),
1599 options.verbose,
1600 sys.stdout)
1601
1602 # Upload all dependencies if specified.
1603 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001604 print()
1605 print('--dependencies has been specified.')
1606 print('All dependent local branches will be re-uploaded.')
1607 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001608 # Remove the dependencies flag from args so that we do not end up in a
1609 # loop.
1610 orig_args.remove('--dependencies')
1611 ret = upload_branch_deps(self, orig_args)
1612 return ret
1613
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001614 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001615 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001616
1617 Issue must have been already uploaded and known.
1618 """
1619 assert new_state in _CQState.ALL_STATES
1620 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001621 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001622 vote_map = {
1623 _CQState.NONE: 0,
1624 _CQState.DRY_RUN: 1,
1625 _CQState.COMMIT: 2,
1626 }
1627 labels = {'Commit-Queue': vote_map[new_state]}
1628 notify = False if new_state == _CQState.DRY_RUN else None
1629 gerrit_util.SetReview(
1630 self._GetGerritHost(), self._GerritChangeIdentifier(),
1631 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001632 return 0
1633 except KeyboardInterrupt:
1634 raise
1635 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001636 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001637 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001638 ' * Your project has no CQ,\n'
1639 ' * You don\'t have permission to change the CQ state,\n'
1640 ' * There\'s a bug in this code (see stack trace below).\n'
1641 'Consider specifying which bots to trigger manually or asking your '
1642 'project owners for permissions or contacting Chrome Infra at:\n'
1643 'https://www.chromium.org/infra\n\n' %
1644 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001645 # Still raise exception so that stack trace is printed.
1646 raise
1647
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001648 def _GetGerritHost(self):
1649 # Lazy load of configs.
1650 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001651 if self._gerrit_host and '.' not in self._gerrit_host:
1652 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1653 # This happens for internal stuff http://crbug.com/614312.
1654 parsed = urlparse.urlparse(self.GetRemoteUrl())
1655 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001656 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001657 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001658 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1659 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001660 return self._gerrit_host
1661
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001662 def _GetGitHost(self):
1663 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001664 remote_url = self.GetRemoteUrl()
1665 if not remote_url:
1666 return None
1667 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001668
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001669 def GetCodereviewServer(self):
1670 if not self._gerrit_server:
1671 # If we're on a branch then get the server potentially associated
1672 # with that branch.
1673 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001674 self._gerrit_server = self._GitGetBranchConfigValue(
1675 self.CodereviewServerConfigKey())
1676 if self._gerrit_server:
1677 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001678 if not self._gerrit_server:
1679 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1680 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001681 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001682 parts[0] = parts[0] + '-review'
1683 self._gerrit_host = '.'.join(parts)
1684 self._gerrit_server = 'https://%s' % self._gerrit_host
1685 return self._gerrit_server
1686
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001687 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001688 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001689 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001690 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001691 logging.warn('can\'t detect Gerrit project.')
1692 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001693 project = urlparse.urlparse(remote_url).path.strip('/')
1694 if project.endswith('.git'):
1695 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001696 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1697 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1698 # gitiles/git-over-https protocol. E.g.,
1699 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1700 # as
1701 # https://chromium.googlesource.com/v8/v8
1702 if project.startswith('a/'):
1703 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001704 return project
1705
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001706 def _GerritChangeIdentifier(self):
1707 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1708
1709 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001710 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001711 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001712 project = self._GetGerritProject()
1713 if project:
1714 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1715 # Fall back on still unique, but less efficient change number.
1716 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001717
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001718 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001719 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001720 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001721
tandrii5d48c322016-08-18 16:19:37 -07001722 @classmethod
1723 def PatchsetConfigKey(cls):
1724 return 'gerritpatchset'
1725
1726 @classmethod
1727 def CodereviewServerConfigKey(cls):
1728 return 'gerritserver'
1729
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001730 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001731 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001732 if settings.GetGerritSkipEnsureAuthenticated():
1733 # For projects with unusual authentication schemes.
1734 # See http://crbug.com/603378.
1735 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001736
1737 # Check presence of cookies only if using cookies-based auth method.
1738 cookie_auth = gerrit_util.Authenticator.get()
1739 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001740 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001741
Daniel Chengcf6269b2019-05-18 01:02:12 +00001742 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1743 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001744 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001745 return
1746
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001747 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001748 self.GetCodereviewServer()
1749 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001750 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001751
1752 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1753 git_auth = cookie_auth.get_auth_header(git_host)
1754 if gerrit_auth and git_auth:
1755 if gerrit_auth == git_auth:
1756 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001757 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001758 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001759 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001760 ' %s\n'
1761 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001762 ' Consider running the following command:\n'
1763 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001764 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001765 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001766 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001767 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001768 cookie_auth.get_new_password_message(git_host)))
1769 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001770 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001771 return
1772 else:
1773 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001774 ([] if gerrit_auth else [self._gerrit_host]) +
1775 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001776 DieWithError('Credentials for the following hosts are required:\n'
1777 ' %s\n'
1778 'These are read from %s (or legacy %s)\n'
1779 '%s' % (
1780 '\n '.join(missing),
1781 cookie_auth.get_gitcookies_path(),
1782 cookie_auth.get_netrc_path(),
1783 cookie_auth.get_new_password_message(git_host)))
1784
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001785 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001786 if not self.GetIssue():
1787 return
1788
1789 # Warm change details cache now to avoid RPCs later, reducing latency for
1790 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001791 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001792 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001793
1794 status = self._GetChangeDetail()['status']
1795 if status in ('MERGED', 'ABANDONED'):
1796 DieWithError('Change %s has been %s, new uploads are not allowed' %
1797 (self.GetIssueURL(),
1798 'submitted' if status == 'MERGED' else 'abandoned'))
1799
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001800 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1801 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1802 # Apparently this check is not very important? Otherwise get_auth_email
1803 # could have been added to other implementations of Authenticator.
1804 cookies_auth = gerrit_util.Authenticator.get()
1805 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001807
1808 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001809 if self.GetIssueOwner() == cookies_user:
1810 return
1811 logging.debug('change %s owner is %s, cookies user is %s',
1812 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001813 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001814 # so ask what Gerrit thinks of this user.
1815 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1816 if details['email'] == self.GetIssueOwner():
1817 return
1818 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001819 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001820 'as %s.\n'
1821 'Uploading may fail due to lack of permissions.' %
1822 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1823 confirm_or_exit(action='upload')
1824
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001825 def _PostUnsetIssueProperties(self):
1826 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001827 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001828
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001829 def GetGerritObjForPresubmit(self):
1830 return presubmit_support.GerritAccessor(self._GetGerritHost())
1831
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001832 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001833 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001834 or CQ status, assuming adherence to a common workflow.
1835
1836 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001837 * 'error' - error from review tool (including deleted issues)
1838 * 'unsent' - no reviewers added
1839 * 'waiting' - waiting for review
1840 * 'reply' - waiting for uploader to reply to review
1841 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001842 * 'dry-run' - dry-running in the CQ
1843 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001844 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001845 """
1846 if not self.GetIssue():
1847 return None
1848
1849 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001850 data = self._GetChangeDetail([
1851 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001852 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001853 return 'error'
1854
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001855 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001856 return 'closed'
1857
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001858 cq_label = data['labels'].get('Commit-Queue', {})
1859 max_cq_vote = 0
1860 for vote in cq_label.get('all', []):
1861 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1862 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001863 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001864 if max_cq_vote == 1:
1865 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001866
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 if data['labels'].get('Code-Review', {}).get('approved'):
1868 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001869
1870 if not data.get('reviewers', {}).get('REVIEWER', []):
1871 return 'unsent'
1872
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001873 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001874 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1875 last_message_author = messages.pop().get('author', {})
1876 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001877 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1878 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001879 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001880 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001881 if last_message_author.get('_account_id') == owner:
1882 # Most recent message was by owner.
1883 return 'waiting'
1884 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001885 # Some reply from non-owner.
1886 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001887
1888 # Somehow there are no messages even though there are reviewers.
1889 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001890
1891 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001892 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001893 patchset = data['revisions'][data['current_revision']]['_number']
1894 self.SetPatchset(patchset)
1895 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001896
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001897 def FetchDescription(self, force=False):
1898 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1899 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001900 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001901 return data['revisions'][current_rev]['commit']['message'].encode(
1902 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
dsansomee2d6fd92016-09-08 00:10:47 -07001904 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001905 if gerrit_util.HasPendingChangeEdit(
1906 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001907 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001908 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001909 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001910 'unpublished edit. Either publish the edit in the Gerrit web UI '
1911 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001912
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001913 gerrit_util.DeletePendingChangeEdit(
1914 self._GetGerritHost(), self._GerritChangeIdentifier())
1915 gerrit_util.SetCommitMessage(
1916 self._GetGerritHost(), self._GerritChangeIdentifier(),
1917 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918
Aaron Gable636b13f2017-07-14 10:42:48 -07001919 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001920 gerrit_util.SetReview(
1921 self._GetGerritHost(), self._GerritChangeIdentifier(),
1922 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001923
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001924 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001925 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001926 # CURRENT_REVISION is included to get the latest patchset so that
1927 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001928 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001929 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1930 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001931 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001932 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001933 robot_file_comments = gerrit_util.GetChangeRobotComments(
1934 self._GetGerritHost(), self._GerritChangeIdentifier())
1935
1936 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001937 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001938 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001939 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001940 line_comments = file_comments.setdefault(path, [])
1941 line_comments.extend(
1942 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001943
1944 # Build dictionary of file comments for easy access and sorting later.
1945 # {author+date: {path: {patchset: {line: url+message}}}}
1946 comments = collections.defaultdict(
1947 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001948 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001950 tag = comment.get('tag', '')
1951 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001952 continue
1953 key = (comment['author']['email'], comment['updated'])
1954 if comment.get('side', 'REVISION') == 'PARENT':
1955 patchset = 'Base'
1956 else:
1957 patchset = 'PS%d' % comment['patch_set']
1958 line = comment.get('line', 0)
1959 url = ('https://%s/c/%s/%s/%s#%s%s' %
1960 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1961 'b' if comment.get('side') == 'PARENT' else '',
1962 str(line) if line else ''))
1963 comments[key][path][patchset][line] = (url, comment['message'])
1964
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001965 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001966 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001967 summary = self._BuildCommentSummary(msg, comments, readable)
1968 if summary:
1969 summaries.append(summary)
1970 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001971
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001972 @staticmethod
1973 def _BuildCommentSummary(msg, comments, readable):
1974 key = (msg['author']['email'], msg['date'])
1975 # Don't bother showing autogenerated messages that don't have associated
1976 # file or line comments. this will filter out most autogenerated
1977 # messages, but will keep robot comments like those from Tricium.
1978 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1979 if is_autogenerated and not comments.get(key):
1980 return None
1981 message = msg['message']
1982 # Gerrit spits out nanoseconds.
1983 assert len(msg['date'].split('.')[-1]) == 9
1984 date = datetime.datetime.strptime(msg['date'][:-3],
1985 '%Y-%m-%d %H:%M:%S.%f')
1986 if key in comments:
1987 message += '\n'
1988 for path, patchsets in sorted(comments.get(key, {}).items()):
1989 if readable:
1990 message += '\n%s' % path
1991 for patchset, lines in sorted(patchsets.items()):
1992 for line, (url, content) in sorted(lines.items()):
1993 if line:
1994 line_str = 'Line %d' % line
1995 path_str = '%s:%d:' % (path, line)
1996 else:
1997 line_str = 'File comment'
1998 path_str = '%s:0:' % path
1999 if readable:
2000 message += '\n %s, %s: %s' % (patchset, line_str, url)
2001 message += '\n %s\n' % content
2002 else:
2003 message += '\n%s ' % path_str
2004 message += '\n%s\n' % content
2005
2006 return _CommentSummary(
2007 date=date,
2008 message=message,
2009 sender=msg['author']['email'],
2010 autogenerated=is_autogenerated,
2011 # These could be inferred from the text messages and correlated with
2012 # Code-Review label maximum, however this is not reliable.
2013 # Leaving as is until the need arises.
2014 approval=False,
2015 disapproval=False,
2016 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002017
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002019 gerrit_util.AbandonChange(
2020 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002021
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002022 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002023 gerrit_util.SubmitChange(
2024 self._GetGerritHost(), self._GerritChangeIdentifier(),
2025 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002026
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002027 def _GetChangeDetail(self, options=None, no_cache=False):
2028 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002029
2030 If fresh data is needed, set no_cache=True which will clear cache and
2031 thus new data will be fetched from Gerrit.
2032 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002033 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002034 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002035
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002036 # Optimization to avoid multiple RPCs:
2037 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2038 'CURRENT_COMMIT' not in options):
2039 options.append('CURRENT_COMMIT')
2040
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002041 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002042 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002043 options = [o.upper() for o in options]
2044
2045 # Check in cache first unless no_cache is True.
2046 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002047 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002048 else:
2049 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002050 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002051 # Assumption: data fetched before with extra options is suitable
2052 # for return for a smaller set of options.
2053 # For example, if we cached data for
2054 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2055 # and request is for options=[CURRENT_REVISION],
2056 # THEN we can return prior cached data.
2057 if options_set.issubset(cached_options_set):
2058 return data
2059
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002060 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002061 data = gerrit_util.GetChangeDetail(
2062 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002063 except gerrit_util.GerritError as e:
2064 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002065 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002066 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002067
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002068 self._detail_cache.setdefault(cache_key, []).append(
2069 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002070 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002071
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002072 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002073 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002074 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002075 data = gerrit_util.GetChangeCommit(
2076 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002077 except gerrit_util.GerritError as e:
2078 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002079 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002080 raise
agable32978d92016-11-01 12:55:02 -07002081 return data
2082
Karen Qian40c19422019-03-13 21:28:29 +00002083 def _IsCqConfigured(self):
2084 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002085 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002086 return False
2087 # TODO(crbug/753213): Remove temporary hack
2088 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002089 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002090 detail['branch'].startswith('refs/branch-heads/')):
2091 return False
2092 return True
2093
Olivier Robin75ee7252018-04-13 10:02:56 +02002094 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002095 if git_common.is_dirty_git_tree('land'):
2096 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002097
tandriid60367b2016-06-22 05:25:12 -07002098 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002099 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002100 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002101 'which can test and land changes for you. '
2102 'Are you sure you wish to bypass it?\n',
2103 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002104 differs = True
tandriic4344b52016-08-29 06:04:54 -07002105 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 # Note: git diff outputs nothing if there is no diff.
2107 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002108 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002109 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002110 if detail['current_revision'] == last_upload:
2111 differs = False
2112 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002113 print('WARNING: Local branch contents differ from latest uploaded '
2114 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002115 if differs:
2116 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002117 confirm_or_exit(
2118 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2119 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002120 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002121 elif not bypass_hooks:
2122 hook_results = self.RunHook(
2123 committing=True,
2124 may_prompt=not force,
2125 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002126 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2127 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002128 if not hook_results.should_continue():
2129 return 1
2130
2131 self.SubmitIssue(wait_for_merge=True)
2132 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002133 links = self._GetChangeCommit().get('web_links', [])
2134 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002135 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002136 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002137 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002138 return 0
2139
Edward Lemurf38bc172019-09-03 21:02:13 +00002140 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 assert parsed_issue_arg.valid
2142
Edward Lemur125d60a2019-09-13 18:25:41 +00002143 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144
2145 if parsed_issue_arg.hostname:
2146 self._gerrit_host = parsed_issue_arg.hostname
2147 self._gerrit_server = 'https://%s' % self._gerrit_host
2148
tandriic2405f52016-10-10 08:13:15 -07002149 try:
2150 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002151 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002152 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002153
2154 if not parsed_issue_arg.patchset:
2155 # Use current revision by default.
2156 revision_info = detail['revisions'][detail['current_revision']]
2157 patchset = int(revision_info['_number'])
2158 else:
2159 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002160 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2162 break
2163 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002164 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 (parsed_issue_arg.patchset, self.GetIssue()))
2166
Edward Lemur125d60a2019-09-13 18:25:41 +00002167 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002168 if remote_url.endswith('.git'):
2169 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002170 remote_url = remote_url.rstrip('/')
2171
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002173 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002174
2175 if remote_url != fetch_info['url']:
2176 DieWithError('Trying to patch a change from %s but this repo appears '
2177 'to be %s.' % (fetch_info['url'], remote_url))
2178
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002180
Aaron Gable62619a32017-06-16 08:22:09 -07002181 if force:
2182 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2183 print('Checked out commit for change %i patchset %i locally' %
2184 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002185 elif nocommit:
2186 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2187 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002188 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002189 RunGit(['cherry-pick', 'FETCH_HEAD'])
2190 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002191 (parsed_issue_arg.issue, patchset))
2192 print('Note: this created a local commit which does not have '
2193 'the same hash as the one uploaded for review. This will make '
2194 'uploading changes based on top of this branch difficult.\n'
2195 'If you want to do that, use "git cl patch --force" instead.')
2196
Stefan Zagerd08043c2017-10-12 12:07:02 -07002197 if self.GetBranch():
2198 self.SetIssue(parsed_issue_arg.issue)
2199 self.SetPatchset(patchset)
2200 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2201 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2202 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2203 else:
2204 print('WARNING: You are in detached HEAD state.\n'
2205 'The patch has been applied to your checkout, but you will not be '
2206 'able to upload a new patch set to the gerrit issue.\n'
2207 'Try using the \'-b\' option if you would like to work on a '
2208 'branch and/or upload a new patch set.')
2209
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002210 return 0
2211
tandrii16e0b4e2016-06-07 10:34:28 -07002212 def _GerritCommitMsgHookCheck(self, offer_removal):
2213 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2214 if not os.path.exists(hook):
2215 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002216 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2217 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002218 data = gclient_utils.FileRead(hook)
2219 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2220 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002221 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002222 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002223 'and may interfere with it in subtle ways.\n'
2224 'We recommend you remove the commit-msg hook.')
2225 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002226 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002227 gclient_utils.rm_file_or_tree(hook)
2228 print('Gerrit commit-msg hook removed.')
2229 else:
2230 print('OK, will keep Gerrit commit-msg hook in place.')
2231
Edward Lemur1b52d872019-05-09 21:12:12 +00002232 def _CleanUpOldTraces(self):
2233 """Keep only the last |MAX_TRACES| traces."""
2234 try:
2235 traces = sorted([
2236 os.path.join(TRACES_DIR, f)
2237 for f in os.listdir(TRACES_DIR)
2238 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2239 and not f.startswith('tmp'))
2240 ])
2241 traces_to_delete = traces[:-MAX_TRACES]
2242 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002243 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002244 except OSError:
2245 print('WARNING: Failed to remove old git traces from\n'
2246 ' %s'
2247 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002248
Edward Lemur5737f022019-05-17 01:24:00 +00002249 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002250 """Zip and write the git push traces stored in traces_dir."""
2251 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002252 traces_zip = trace_name + '-traces'
2253 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002254 # Create a temporary dir to store git config and gitcookies in. It will be
2255 # compressed and stored next to the traces.
2256 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002257 git_info_zip = trace_name + '-git-info'
2258
Edward Lemur5737f022019-05-17 01:24:00 +00002259 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002260 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002261 git_push_metadata['now'] = git_push_metadata['now'].decode(
2262 sys.stdin.encoding)
2263
Edward Lemur1b52d872019-05-09 21:12:12 +00002264 git_push_metadata['trace_name'] = trace_name
2265 gclient_utils.FileWrite(
2266 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2267
2268 # Keep only the first 6 characters of the git hashes on the packet
2269 # trace. This greatly decreases size after compression.
2270 packet_traces = os.path.join(traces_dir, 'trace-packet')
2271 if os.path.isfile(packet_traces):
2272 contents = gclient_utils.FileRead(packet_traces)
2273 gclient_utils.FileWrite(
2274 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2275 shutil.make_archive(traces_zip, 'zip', traces_dir)
2276
2277 # Collect and compress the git config and gitcookies.
2278 git_config = RunGit(['config', '-l'])
2279 gclient_utils.FileWrite(
2280 os.path.join(git_info_dir, 'git-config'),
2281 git_config)
2282
2283 cookie_auth = gerrit_util.Authenticator.get()
2284 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2285 gitcookies_path = cookie_auth.get_gitcookies_path()
2286 if os.path.isfile(gitcookies_path):
2287 gitcookies = gclient_utils.FileRead(gitcookies_path)
2288 gclient_utils.FileWrite(
2289 os.path.join(git_info_dir, 'gitcookies'),
2290 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2291 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2292
Edward Lemur1b52d872019-05-09 21:12:12 +00002293 gclient_utils.rmtree(git_info_dir)
2294
2295 def _RunGitPushWithTraces(
2296 self, change_desc, refspec, refspec_opts, git_push_metadata):
2297 """Run git push and collect the traces resulting from the execution."""
2298 # Create a temporary directory to store traces in. Traces will be compressed
2299 # and stored in a 'traces' dir inside depot_tools.
2300 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002301 trace_name = os.path.join(
2302 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002303
2304 env = os.environ.copy()
2305 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2306 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002307 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002308 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2309 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2310 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2311
2312 try:
2313 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002314 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002315 before_push = time_time()
2316 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002317 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002318 env=env,
2319 print_stdout=True,
2320 # Flush after every line: useful for seeing progress when running as
2321 # recipe.
2322 filter_fn=lambda _: sys.stdout.flush())
2323 except subprocess2.CalledProcessError as e:
2324 push_returncode = e.returncode
2325 DieWithError('Failed to create a change. Please examine output above '
2326 'for the reason of the failure.\n'
2327 'Hint: run command below to diagnose common Git/Gerrit '
2328 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002329 ' git cl creds-check\n'
2330 '\n'
2331 'If git-cl is not working correctly, file a bug under the '
2332 'Infra>SDK component including the files below.\n'
2333 'Review the files before upload, since they might contain '
2334 'sensitive information.\n'
2335 'Set the Restrict-View-Google label so that they are not '
2336 'publicly accessible.\n'
2337 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002338 change_desc)
2339 finally:
2340 execution_time = time_time() - before_push
2341 metrics.collector.add_repeated('sub_commands', {
2342 'command': 'git push',
2343 'execution_time': execution_time,
2344 'exit_code': push_returncode,
2345 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2346 })
2347
Edward Lemur1b52d872019-05-09 21:12:12 +00002348 git_push_metadata['execution_time'] = execution_time
2349 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002350 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002351
Edward Lemur1b52d872019-05-09 21:12:12 +00002352 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002353 gclient_utils.rmtree(traces_dir)
2354
2355 return push_stdout
2356
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002357 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002358 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002359 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002360 # Load default for user, repo, squash=true, in this order.
2361 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002362
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002364 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002365 # This may be None; default fallback value is determined in logic below.
2366 title = options.title
2367
Dominic Battre7d1c4842017-10-27 09:17:28 +02002368 # Extract bug number from branch name.
2369 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002370 fixed = options.fixed
2371 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2372 self.GetBranch())
2373 if not bug and not fixed and match:
2374 if match.group('type') == 'bug':
2375 bug = match.group('bugnum')
2376 else:
2377 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002378
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002380 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002381 if self.GetIssue():
2382 # Try to get the message from a previous upload.
2383 message = self.GetDescription()
2384 if not message:
2385 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002386 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002388 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002389 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002390 # When uploading a subsequent patchset, -m|--message is taken
2391 # as the patchset title if --title was not provided.
2392 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002393 else:
2394 default_title = RunGit(
2395 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002396 if options.force:
2397 title = default_title
2398 else:
2399 title = ask_for_data(
2400 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002401 change_id = self._GetChangeDetail()['change_id']
2402 while True:
2403 footer_change_ids = git_footers.get_footer_change_id(message)
2404 if footer_change_ids == [change_id]:
2405 break
2406 if not footer_change_ids:
2407 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002408 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 continue
2410 # There is already a valid footer but with different or several ids.
2411 # Doing this automatically is non-trivial as we don't want to lose
2412 # existing other footers, yet we want to append just 1 desired
2413 # Change-Id. Thus, just create a new footer, but let user verify the
2414 # new description.
2415 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002416 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002417 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002418 print(
2419 'WARNING: change %s has Change-Id footer(s):\n'
2420 ' %s\n'
2421 'but change has Change-Id %s, according to Gerrit.\n'
2422 'Please, check the proposed correction to the description, '
2423 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2424 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2425 change_id))
2426 confirm_or_exit(action='edit')
2427 change_desc.prompt()
2428
2429 message = change_desc.description
2430 if not message:
2431 DieWithError("Description is empty. Aborting...")
2432
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 # Continue the while loop.
2434 # Sanity check of this code - we should end up with proper message
2435 # footer.
2436 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002437 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002438 else: # if not self.GetIssue()
2439 if options.message:
2440 message = options.message
2441 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002442 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002443 if options.title:
2444 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002445 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002446 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002447 change_desc.prompt()
2448
Aaron Gableb56ad332017-01-06 15:24:31 -08002449 # On first upload, patchset title is always this string, while
2450 # --title flag gets converted to first line of message.
2451 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002452 if not change_desc.description:
2453 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002454 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002455 if len(change_ids) > 1:
2456 DieWithError('too many Change-Id footers, at most 1 allowed.')
2457 if not change_ids:
2458 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002459 change_desc.set_description(git_footers.add_footer_change_id(
2460 change_desc.description,
2461 GenerateGerritChangeId(change_desc.description)))
2462 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463 assert len(change_ids) == 1
2464 change_id = change_ids[0]
2465
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002466 if options.reviewers or options.tbrs or options.add_owners_to:
2467 change_desc.update_reviewers(options.reviewers, options.tbrs,
2468 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002469 if options.preserve_tryjobs:
2470 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002471
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002472 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002473 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2474 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002475 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002476 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2477 desc_tempfile.write(change_desc.description)
2478 desc_tempfile.close()
2479 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2480 '-F', desc_tempfile.name]).strip()
2481 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002482 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002483 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002484 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002485 if not change_desc.description:
2486 DieWithError("Description is empty. Aborting...")
2487
2488 if not git_footers.get_footer_change_id(change_desc.description):
2489 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002490 change_desc.set_description(
2491 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002492 if options.reviewers or options.tbrs or options.add_owners_to:
2493 change_desc.update_reviewers(options.reviewers, options.tbrs,
2494 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002495 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002496 # For no-squash mode, we assume the remote called "origin" is the one we
2497 # want. It is not worthwhile to support different workflows for
2498 # no-squash mode.
2499 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002500 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2501
2502 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002503 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002504 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2505 ref_to_push)]).splitlines()
2506 if len(commits) > 1:
2507 print('WARNING: This will upload %d commits. Run the following command '
2508 'to see which commits will be uploaded: ' % len(commits))
2509 print('git log %s..%s' % (parent, ref_to_push))
2510 print('You can also use `git squash-branch` to squash these into a '
2511 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002512 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002513
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002514 if options.reviewers or options.tbrs or options.add_owners_to:
2515 change_desc.update_reviewers(options.reviewers, options.tbrs,
2516 options.add_owners_to, change)
2517
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002518 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002519 cc = []
2520 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2521 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2522 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002523 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002524 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002525 if options.cc:
2526 cc.extend(options.cc)
2527 cc = filter(None, [email.strip() for email in cc])
2528 if change_desc.get_cced():
2529 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002530 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2531 valid_accounts = set(reviewers + cc)
2532 # TODO(crbug/877717): relax this for all hosts.
2533 else:
2534 valid_accounts = gerrit_util.ValidAccounts(
2535 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002536 logging.info('accounts %s are recognized, %s invalid',
2537 sorted(valid_accounts),
2538 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002539
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002540 # Extra options that can be specified at push time. Doc:
2541 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002542 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002543
Aaron Gable844cf292017-06-28 11:32:59 -07002544 # By default, new changes are started in WIP mode, and subsequent patchsets
2545 # don't send email. At any time, passing --send-mail will mark the change
2546 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002547 if options.send_mail:
2548 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002549 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002550 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002551 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002552 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002553 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002554
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002555 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002556 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002557
Aaron Gable9b713dd2016-12-14 16:04:21 -08002558 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002559 # Punctuation and whitespace in |title| must be percent-encoded.
2560 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002561
agablec6787972016-09-09 16:13:34 -07002562 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002563 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002564
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002565 for r in sorted(reviewers):
2566 if r in valid_accounts:
2567 refspec_opts.append('r=%s' % r)
2568 reviewers.remove(r)
2569 else:
2570 # TODO(tandrii): this should probably be a hard failure.
2571 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2572 % r)
2573 for c in sorted(cc):
2574 # refspec option will be rejected if cc doesn't correspond to an
2575 # account, even though REST call to add such arbitrary cc may succeed.
2576 if c in valid_accounts:
2577 refspec_opts.append('cc=%s' % c)
2578 cc.remove(c)
2579
rmistry9eadede2016-09-19 11:22:43 -07002580 if options.topic:
2581 # Documentation on Gerrit topics is here:
2582 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002583 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002584
Edward Lemur687ca902018-12-05 02:30:30 +00002585 if options.enable_auto_submit:
2586 refspec_opts.append('l=Auto-Submit+1')
2587 if options.use_commit_queue:
2588 refspec_opts.append('l=Commit-Queue+2')
2589 elif options.cq_dry_run:
2590 refspec_opts.append('l=Commit-Queue+1')
2591
2592 if change_desc.get_reviewers(tbr_only=True):
2593 score = gerrit_util.GetCodeReviewTbrScore(
2594 self._GetGerritHost(),
2595 self._GetGerritProject())
2596 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002597
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002598 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002599 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002600 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002601 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002602 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2603
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002604 refspec_suffix = ''
2605 if refspec_opts:
2606 refspec_suffix = '%' + ','.join(refspec_opts)
2607 assert ' ' not in refspec_suffix, (
2608 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2609 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2610
Edward Lemur1b52d872019-05-09 21:12:12 +00002611 git_push_metadata = {
2612 'gerrit_host': self._GetGerritHost(),
2613 'title': title or '<untitled>',
2614 'change_id': change_id,
2615 'description': change_desc.description,
2616 }
2617 push_stdout = self._RunGitPushWithTraces(
2618 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619
2620 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002621 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002622 change_numbers = [m.group(1)
2623 for m in map(regex.match, push_stdout.splitlines())
2624 if m]
2625 if len(change_numbers) != 1:
2626 DieWithError(
2627 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002628 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002629 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002630 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002631
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002632 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002633 # GetIssue() is not set in case of non-squash uploads according to tests.
2634 # TODO(agable): non-squash uploads in git cl should be removed.
2635 gerrit_util.AddReviewers(
2636 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002637 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002638 reviewers, cc,
2639 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002640
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002641 return 0
2642
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002643 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2644 change_desc):
2645 """Computes parent of the generated commit to be uploaded to Gerrit.
2646
2647 Returns revision or a ref name.
2648 """
2649 if custom_cl_base:
2650 # Try to avoid creating additional unintended CLs when uploading, unless
2651 # user wants to take this risk.
2652 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2653 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2654 local_ref_of_target_remote])
2655 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002656 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002657 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2658 'If you proceed with upload, more than 1 CL may be created by '
2659 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2660 'If you are certain that specified base `%s` has already been '
2661 'uploaded to Gerrit as another CL, you may proceed.\n' %
2662 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2663 if not force:
2664 confirm_or_exit(
2665 'Do you take responsibility for cleaning up potential mess '
2666 'resulting from proceeding with upload?',
2667 action='upload')
2668 return custom_cl_base
2669
Aaron Gablef97e33d2017-03-30 15:44:27 -07002670 if remote != '.':
2671 return self.GetCommonAncestorWithUpstream()
2672
2673 # If our upstream branch is local, we base our squashed commit on its
2674 # squashed version.
2675 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2676
Aaron Gablef97e33d2017-03-30 15:44:27 -07002677 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002678 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002679
2680 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002681 # TODO(tandrii): consider checking parent change in Gerrit and using its
2682 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2683 # the tree hash of the parent branch. The upside is less likely bogus
2684 # requests to reupload parent change just because it's uploadhash is
2685 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002686 parent = RunGit(['config',
2687 'branch.%s.gerritsquashhash' % upstream_branch_name],
2688 error_ok=True).strip()
2689 # Verify that the upstream branch has been uploaded too, otherwise
2690 # Gerrit will create additional CLs when uploading.
2691 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2692 RunGitSilent(['rev-parse', parent + ':'])):
2693 DieWithError(
2694 '\nUpload upstream branch %s first.\n'
2695 'It is likely that this branch has been rebased since its last '
2696 'upload, so you just need to upload it again.\n'
2697 '(If you uploaded it with --no-squash, then branch dependencies '
2698 'are not supported, and you should reupload with --squash.)'
2699 % upstream_branch_name,
2700 change_desc)
2701 return parent
2702
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002703 def _AddChangeIdToCommitMessage(self, options, args):
2704 """Re-commits using the current message, assumes the commit hook is in
2705 place.
2706 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002707 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002708 git_command = ['commit', '--amend', '-m', log_desc]
2709 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002710 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002711 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002712 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002713 return new_log_desc
2714 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002715 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002716
tandriie113dfd2016-10-11 10:20:12 -07002717 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002718 try:
2719 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002720 except GerritChangeNotExists:
2721 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002722
2723 if data['status'] in ('ABANDONED', 'MERGED'):
2724 return 'CL %s is closed' % self.GetIssue()
2725
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002726 def GetGerritChange(self, patchset=None):
2727 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2728 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2729 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002730 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002731 data = self._GetChangeDetail(['ALL_REVISIONS'])
2732
2733 assert host and issue and patchset, 'CL must be uploaded first'
2734
2735 has_patchset = any(
2736 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002737 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002738 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002739 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002740 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002741
tandrii8c5a3532016-11-04 07:52:02 -07002742 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002743 'host': host,
2744 'change': issue,
2745 'project': data['project'],
2746 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002747 }
tandriie113dfd2016-10-11 10:20:12 -07002748
tandriide281ae2016-10-12 06:02:30 -07002749 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002750 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002751
Edward Lemur707d70b2018-02-07 00:50:14 +01002752 def GetReviewers(self):
2753 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002754 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002755
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002756
2757_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002758 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002759}
2760
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002761
iannuccie53c9352016-08-17 14:40:40 -07002762def _add_codereview_issue_select_options(parser, extra=""):
2763 _add_codereview_select_options(parser)
2764
2765 text = ('Operate on this issue number instead of the current branch\'s '
2766 'implicit issue.')
2767 if extra:
2768 text += ' '+extra
2769 parser.add_option('-i', '--issue', type=int, help=text)
2770
2771
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002772def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002773 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002774 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002775 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002776 parser.add_option_group(parser.codereview_group)
2777 parser.codereview_group.add_option(
2778 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002779 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002780
2781
tandriif9aefb72016-07-01 09:06:51 -07002782def _get_bug_line_values(default_project, bugs):
2783 """Given default_project and comma separated list of bugs, yields bug line
2784 values.
2785
2786 Each bug can be either:
2787 * a number, which is combined with default_project
2788 * string, which is left as is.
2789
2790 This function may produce more than one line, because bugdroid expects one
2791 project per line.
2792
2793 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2794 ['v8:123', 'chromium:789']
2795 """
2796 default_bugs = []
2797 others = []
2798 for bug in bugs.split(','):
2799 bug = bug.strip()
2800 if bug:
2801 try:
2802 default_bugs.append(int(bug))
2803 except ValueError:
2804 others.append(bug)
2805
2806 if default_bugs:
2807 default_bugs = ','.join(map(str, default_bugs))
2808 if default_project:
2809 yield '%s:%s' % (default_project, default_bugs)
2810 else:
2811 yield default_bugs
2812 for other in sorted(others):
2813 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2814 yield other
2815
2816
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002817class ChangeDescription(object):
2818 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002819 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002820 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002821 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002822 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002823 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002824 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2825 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2826 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2827 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002828
Dan Beamd8b04ca2019-10-10 21:23:26 +00002829 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002830 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002831 if bug:
2832 regexp = re.compile(self.BUG_LINE)
2833 prefix = settings.GetBugPrefix()
2834 if not any((regexp.match(line) for line in self._description_lines)):
2835 values = list(_get_bug_line_values(prefix, bug))
2836 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002837 if fixed:
2838 regexp = re.compile(self.FIXED_LINE)
2839 prefix = settings.GetBugPrefix()
2840 if not any((regexp.match(line) for line in self._description_lines)):
2841 values = list(_get_bug_line_values(prefix, fixed))
2842 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002843
agable@chromium.org42c20792013-09-12 17:34:49 +00002844 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002845 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 return '\n'.join(self._description_lines)
2847
2848 def set_description(self, desc):
2849 if isinstance(desc, basestring):
2850 lines = desc.splitlines()
2851 else:
2852 lines = [line.rstrip() for line in desc]
2853 while lines and not lines[0]:
2854 lines.pop(0)
2855 while lines and not lines[-1]:
2856 lines.pop(-1)
2857 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002858
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002859 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2860 """Rewrites the R=/TBR= line(s) as a single line each.
2861
2862 Args:
2863 reviewers (list(str)) - list of additional emails to use for reviewers.
2864 tbrs (list(str)) - list of additional emails to use for TBRs.
2865 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2866 the change that are missing OWNER coverage. If this is not None, you
2867 must also pass a value for `change`.
2868 change (Change) - The Change that should be used for OWNERS lookups.
2869 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002870 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871 assert isinstance(tbrs, list), tbrs
2872
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002873 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002874 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002875
2876 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002878
2879 reviewers = set(reviewers)
2880 tbrs = set(tbrs)
2881 LOOKUP = {
2882 'TBR': tbrs,
2883 'R': reviewers,
2884 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002886 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002887 regexp = re.compile(self.R_LINE)
2888 matches = [regexp.match(line) for line in self._description_lines]
2889 new_desc = [l for i, l in enumerate(self._description_lines)
2890 if not matches[i]]
2891 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002894
2895 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002896 for match in matches:
2897 if not match:
2898 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002899 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2900
2901 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002902 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002903 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002904 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002905 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002906 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002907 LOOKUP[add_owners_to].update(
2908 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002909
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002910 # If any folks ended up in both groups, remove them from tbrs.
2911 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002912
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002913 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2914 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002915
2916 # Put the new lines in the description where the old first R= line was.
2917 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2918 if 0 <= line_loc < len(self._description_lines):
2919 if new_tbr_line:
2920 self._description_lines.insert(line_loc, new_tbr_line)
2921 if new_r_line:
2922 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002923 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002924 if new_r_line:
2925 self.append_footer(new_r_line)
2926 if new_tbr_line:
2927 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002929 def set_preserve_tryjobs(self):
2930 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2931 footers = git_footers.parse_footers(self.description)
2932 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2933 if v.lower() == 'true':
2934 return
2935 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2936
Anthony Polito8b955342019-09-24 19:01:36 +00002937 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002938 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002939 self.set_description([
2940 '# Enter a description of the change.',
2941 '# This will be displayed on the codereview site.',
2942 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002943 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002944 '--------------------',
2945 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002946 bug_regexp = re.compile(self.BUG_LINE)
2947 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002948 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002949 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2950 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002951 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002952
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002954 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002955 if not content:
2956 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002957 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002958
Bruce Dawson2377b012018-01-11 16:46:49 -08002959 # Strip off comments and default inserted "Bug:" line.
2960 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002961 (line.startswith('#') or
2962 line.rstrip() == "Bug:" or
2963 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002964 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002965 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002966 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002967
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002968 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002969 """Adds a footer line to the description.
2970
2971 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2972 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2973 that Gerrit footers are always at the end.
2974 """
2975 parsed_footer_line = git_footers.parse_footer(line)
2976 if parsed_footer_line:
2977 # Line is a gerrit footer in the form: Footer-Key: any value.
2978 # Thus, must be appended observing Gerrit footer rules.
2979 self.set_description(
2980 git_footers.add_footer(self.description,
2981 key=parsed_footer_line[0],
2982 value=parsed_footer_line[1]))
2983 return
2984
2985 if not self._description_lines:
2986 self._description_lines.append(line)
2987 return
2988
2989 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2990 if gerrit_footers:
2991 # git_footers.split_footers ensures that there is an empty line before
2992 # actual (gerrit) footers, if any. We have to keep it that way.
2993 assert top_lines and top_lines[-1] == ''
2994 top_lines, separator = top_lines[:-1], top_lines[-1:]
2995 else:
2996 separator = [] # No need for separator if there are no gerrit_footers.
2997
2998 prev_line = top_lines[-1] if top_lines else ''
2999 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3000 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3001 top_lines.append('')
3002 top_lines.append(line)
3003 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003004
tandrii99a72f22016-08-17 14:33:24 -07003005 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003006 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003007 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003008 reviewers = [match.group(2).strip()
3009 for match in matches
3010 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003011 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003012
bradnelsond975b302016-10-23 12:20:23 -07003013 def get_cced(self):
3014 """Retrieves the list of reviewers."""
3015 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3016 cced = [match.group(2).strip() for match in matches if match]
3017 return cleanup_list(cced)
3018
Nodir Turakulov23b82142017-11-16 11:04:25 -08003019 def get_hash_tags(self):
3020 """Extracts and sanitizes a list of Gerrit hashtags."""
3021 subject = (self._description_lines or ('',))[0]
3022 subject = re.sub(
3023 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3024
3025 tags = []
3026 start = 0
3027 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3028 while True:
3029 m = bracket_exp.match(subject, start)
3030 if not m:
3031 break
3032 tags.append(self.sanitize_hash_tag(m.group(1)))
3033 start = m.end()
3034
3035 if not tags:
3036 # Try "Tag: " prefix.
3037 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3038 if m:
3039 tags.append(self.sanitize_hash_tag(m.group(1)))
3040 return tags
3041
3042 @classmethod
3043 def sanitize_hash_tag(cls, tag):
3044 """Returns a sanitized Gerrit hash tag.
3045
3046 A sanitized hashtag can be used as a git push refspec parameter value.
3047 """
3048 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3049
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003050 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3051 """Updates this commit description given the parent.
3052
3053 This is essentially what Gnumbd used to do.
3054 Consult https://goo.gl/WMmpDe for more details.
3055 """
3056 assert parent_msg # No, orphan branch creation isn't supported.
3057 assert parent_hash
3058 assert dest_ref
3059 parent_footer_map = git_footers.parse_footers(parent_msg)
3060 # This will also happily parse svn-position, which GnumbD is no longer
3061 # supporting. While we'd generate correct footers, the verifier plugin
3062 # installed in Gerrit will block such commit (ie git push below will fail).
3063 parent_position = git_footers.get_position(parent_footer_map)
3064
3065 # Cherry-picks may have last line obscuring their prior footers,
3066 # from git_footers perspective. This is also what Gnumbd did.
3067 cp_line = None
3068 if (self._description_lines and
3069 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3070 cp_line = self._description_lines.pop()
3071
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003072 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003073
3074 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3075 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003076 for i, line in enumerate(footer_lines):
3077 k, v = git_footers.parse_footer(line) or (None, None)
3078 if k and k.startswith('Cr-'):
3079 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003080
3081 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003082 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003083 if parent_position[0] == dest_ref:
3084 # Same branch as parent.
3085 number = int(parent_position[1]) + 1
3086 else:
3087 number = 1 # New branch, and extra lineage.
3088 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3089 int(parent_position[1])))
3090
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003091 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3092 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003093
3094 self._description_lines = top_lines
3095 if cp_line:
3096 self._description_lines.append(cp_line)
3097 if self._description_lines[-1] != '':
3098 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003099 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003100
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003101
Aaron Gablea1bab272017-04-11 16:38:18 -07003102def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003103 """Retrieves the reviewers that approved a CL from the issue properties with
3104 messages.
3105
3106 Note that the list may contain reviewers that are not committer, thus are not
3107 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003108
3109 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003110 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003111 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003112 return sorted(
3113 set(
3114 message['sender']
3115 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003116 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003117 )
3118 )
3119
3120
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003121def FindCodereviewSettingsFile(filename='codereview.settings'):
3122 """Finds the given file starting in the cwd and going up.
3123
3124 Only looks up to the top of the repository unless an
3125 'inherit-review-settings-ok' file exists in the root of the repository.
3126 """
3127 inherit_ok_file = 'inherit-review-settings-ok'
3128 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003129 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003130 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3131 root = '/'
3132 while True:
3133 if filename in os.listdir(cwd):
3134 if os.path.isfile(os.path.join(cwd, filename)):
3135 return open(os.path.join(cwd, filename))
3136 if cwd == root:
3137 break
3138 cwd = os.path.dirname(cwd)
3139
3140
3141def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003142 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003143 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003144
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003145 def SetProperty(name, setting, unset_error_ok=False):
3146 fullname = 'rietveld.' + name
3147 if setting in keyvals:
3148 RunGit(['config', fullname, keyvals[setting]])
3149 else:
3150 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3151
tandrii48df5812016-10-17 03:55:37 -07003152 if not keyvals.get('GERRIT_HOST', False):
3153 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003154 # Only server setting is required. Other settings can be absent.
3155 # In that case, we ignore errors raised during option deletion attempt.
3156 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3157 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3158 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003159 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003160 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3161 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003162 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3163 unset_error_ok=True)
Jamie Madill812ac222019-10-16 16:43:08 +00003164 SetProperty(
3165 'diff-lines-of-context', 'DIFF_LINES_OF_CONTEXT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003166
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003167 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003168 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003169
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003170 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003171 RunGit(['config', 'gerrit.squash-uploads',
3172 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003173
tandrii@chromium.org28253532016-04-14 13:46:56 +00003174 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003175 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003176 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3177
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003178 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003179 # should be of the form
3180 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3181 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003182 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3183 keyvals['ORIGIN_URL_CONFIG']])
3184
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003185
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003186def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003187 """Downloads a network object to a local file, like urllib.urlretrieve.
3188
3189 This is necessary because urllib is broken for SSL connections via a proxy.
3190 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003191 with open(destination, 'w') as f:
Edward Lemura834f392019-10-22 22:23:00 +00003192 f.write(urllib_request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003193
3194
ukai@chromium.org712d6102013-11-27 00:52:58 +00003195def hasSheBang(fname):
3196 """Checks fname is a #! script."""
3197 with open(fname) as f:
3198 return f.read(2).startswith('#!')
3199
3200
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003201# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3202def DownloadHooks(*args, **kwargs):
3203 pass
3204
3205
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003206def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003207 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003208
3209 Args:
3210 force: True to update hooks. False to install hooks if not present.
3211 """
3212 if not settings.GetIsGerrit():
3213 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003214 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003215 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3216 if not os.access(dst, os.X_OK):
3217 if os.path.exists(dst):
3218 if not force:
3219 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003220 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003221 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003222 if not hasSheBang(dst):
3223 DieWithError('Not a script: %s\n'
3224 'You need to download from\n%s\n'
3225 'into .git/hooks/commit-msg and '
3226 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003227 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3228 except Exception:
3229 if os.path.exists(dst):
3230 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003231 DieWithError('\nFailed to download hooks.\n'
3232 'You need to download from\n%s\n'
3233 'into .git/hooks/commit-msg and '
3234 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003235
3236
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003237class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003238 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003239
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003240 _GOOGLESOURCE = 'googlesource.com'
3241
3242 def __init__(self):
3243 # Cached list of [host, identity, source], where source is either
3244 # .gitcookies or .netrc.
3245 self._all_hosts = None
3246
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003247 def ensure_configured_gitcookies(self):
3248 """Runs checks and suggests fixes to make git use .gitcookies from default
3249 path."""
3250 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3251 configured_path = RunGitSilent(
3252 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003253 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003254 if configured_path:
3255 self._ensure_default_gitcookies_path(configured_path, default)
3256 else:
3257 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003258
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003259 @staticmethod
3260 def _ensure_default_gitcookies_path(configured_path, default_path):
3261 assert configured_path
3262 if configured_path == default_path:
3263 print('git is already configured to use your .gitcookies from %s' %
3264 configured_path)
3265 return
3266
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003267 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003268 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3269 (configured_path, default_path))
3270
3271 if not os.path.exists(configured_path):
3272 print('However, your configured .gitcookies file is missing.')
3273 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3274 action='reconfigure')
3275 RunGit(['config', '--global', 'http.cookiefile', default_path])
3276 return
3277
3278 if os.path.exists(default_path):
3279 print('WARNING: default .gitcookies file already exists %s' %
3280 default_path)
3281 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3282 default_path)
3283
3284 confirm_or_exit('Move existing .gitcookies to default location?',
3285 action='move')
3286 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003287 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003288 print('Moved and reconfigured git to use .gitcookies from %s' %
3289 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003290
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003291 @staticmethod
3292 def _configure_gitcookies_path(default_path):
3293 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3294 if os.path.exists(netrc_path):
3295 print('You seem to be using outdated .netrc for git credentials: %s' %
3296 netrc_path)
3297 print('This tool will guide you through setting up recommended '
3298 '.gitcookies store for git credentials.\n'
3299 '\n'
3300 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3301 ' git config --global --unset http.cookiefile\n'
3302 ' mv %s %s.backup\n\n' % (default_path, default_path))
3303 confirm_or_exit(action='setup .gitcookies')
3304 RunGit(['config', '--global', 'http.cookiefile', default_path])
3305 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003306
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003307 def get_hosts_with_creds(self, include_netrc=False):
3308 if self._all_hosts is None:
3309 a = gerrit_util.CookiesAuthenticator()
3310 self._all_hosts = [
3311 (h, u, s)
3312 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003313 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3314 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003315 )
3316 if h.endswith(self._GOOGLESOURCE)
3317 ]
3318
3319 if include_netrc:
3320 return self._all_hosts
3321 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3322
3323 def print_current_creds(self, include_netrc=False):
3324 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3325 if not hosts:
3326 print('No Git/Gerrit credentials found')
3327 return
3328 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3329 header = [('Host', 'User', 'Which file'),
3330 ['=' * l for l in lengths]]
3331 for row in (header + hosts):
3332 print('\t'.join((('%%+%ds' % l) % s)
3333 for l, s in zip(lengths, row)))
3334
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003335 @staticmethod
3336 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003337 """Parses identity "git-<username>.domain" into <username> and domain."""
3338 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003339 # distinguishable from sub-domains. But we do know typical domains:
3340 if identity.endswith('.chromium.org'):
3341 domain = 'chromium.org'
3342 username = identity[:-len('.chromium.org')]
3343 else:
3344 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003345 if username.startswith('git-'):
3346 username = username[len('git-'):]
3347 return username, domain
3348
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003349 def _canonical_git_googlesource_host(self, host):
3350 """Normalizes Gerrit hosts (with '-review') to Git host."""
3351 assert host.endswith(self._GOOGLESOURCE)
3352 # Prefix doesn't include '.' at the end.
3353 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3354 if prefix.endswith('-review'):
3355 prefix = prefix[:-len('-review')]
3356 return prefix + '.' + self._GOOGLESOURCE
3357
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003358 def _canonical_gerrit_googlesource_host(self, host):
3359 git_host = self._canonical_git_googlesource_host(host)
3360 prefix = git_host.split('.', 1)[0]
3361 return prefix + '-review.' + self._GOOGLESOURCE
3362
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003363 def _get_counterpart_host(self, host):
3364 assert host.endswith(self._GOOGLESOURCE)
3365 git = self._canonical_git_googlesource_host(host)
3366 gerrit = self._canonical_gerrit_googlesource_host(git)
3367 return git if gerrit == host else gerrit
3368
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003369 def has_generic_host(self):
3370 """Returns whether generic .googlesource.com has been configured.
3371
3372 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3373 """
3374 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3375 if host == '.' + self._GOOGLESOURCE:
3376 return True
3377 return False
3378
3379 def _get_git_gerrit_identity_pairs(self):
3380 """Returns map from canonic host to pair of identities (Git, Gerrit).
3381
3382 One of identities might be None, meaning not configured.
3383 """
3384 host_to_identity_pairs = {}
3385 for host, identity, _ in self.get_hosts_with_creds():
3386 canonical = self._canonical_git_googlesource_host(host)
3387 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3388 idx = 0 if canonical == host else 1
3389 pair[idx] = identity
3390 return host_to_identity_pairs
3391
3392 def get_partially_configured_hosts(self):
3393 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003394 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003395 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003396 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003397
3398 def get_conflicting_hosts(self):
3399 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003400 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003401 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003402 if None not in (i1, i2) and i1 != i2)
3403
3404 def get_duplicated_hosts(self):
3405 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003406 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003407
3408 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3409 'chromium.googlesource.com': 'chromium.org',
3410 'chrome-internal.googlesource.com': 'google.com',
3411 }
3412
3413 def get_hosts_with_wrong_identities(self):
3414 """Finds hosts which **likely** reference wrong identities.
3415
3416 Note: skips hosts which have conflicting identities for Git and Gerrit.
3417 """
3418 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003419 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003420 pair = self._get_git_gerrit_identity_pairs().get(host)
3421 if pair and pair[0] == pair[1]:
3422 _, domain = self._parse_identity(pair[0])
3423 if domain != expected:
3424 hosts.add(host)
3425 return hosts
3426
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003428 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003429 hosts = sorted(hosts)
3430 assert hosts
3431 if extra_column_func is None:
3432 extras = [''] * len(hosts)
3433 else:
3434 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003435 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3436 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003437 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003438 lines.append(tmpl % he)
3439 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003440
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003442 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003443 yield ('.googlesource.com wildcard record detected',
3444 ['Chrome Infrastructure team recommends to list full host names '
3445 'explicitly.'],
3446 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003447
3448 dups = self.get_duplicated_hosts()
3449 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003450 yield ('The following hosts were defined twice',
3451 self._format_hosts(dups),
3452 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003453
3454 partial = self.get_partially_configured_hosts()
3455 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003456 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3457 'These hosts are missing',
3458 self._format_hosts(partial, lambda host: 'but %s defined' %
3459 self._get_counterpart_host(host)),
3460 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003461
3462 conflicting = self.get_conflicting_hosts()
3463 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003464 yield ('The following Git hosts have differing credentials from their '
3465 'Gerrit counterparts',
3466 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3467 tuple(self._get_git_gerrit_identity_pairs()[host])),
3468 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003469
3470 wrong = self.get_hosts_with_wrong_identities()
3471 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003472 yield ('These hosts likely use wrong identity',
3473 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3474 (self._get_git_gerrit_identity_pairs()[host][0],
3475 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3476 wrong)
3477
3478 def find_and_report_problems(self):
3479 """Returns True if there was at least one problem, else False."""
3480 found = False
3481 bad_hosts = set()
3482 for title, sublines, hosts in self._find_problems():
3483 if not found:
3484 found = True
3485 print('\n\n.gitcookies problem report:\n')
3486 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003487 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003488 if sublines:
3489 print()
3490 print(' %s' % '\n '.join(sublines))
3491 print()
3492
3493 if bad_hosts:
3494 assert found
3495 print(' You can manually remove corresponding lines in your %s file and '
3496 'visit the following URLs with correct account to generate '
3497 'correct credential lines:\n' %
3498 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3499 print(' %s' % '\n '.join(sorted(set(
3500 gerrit_util.CookiesAuthenticator().get_new_password_url(
3501 self._canonical_git_googlesource_host(host))
3502 for host in bad_hosts
3503 ))))
3504 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003505
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003507@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003508def CMDcreds_check(parser, args):
3509 """Checks credentials and suggests changes."""
3510 _, _ = parser.parse_args(args)
3511
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003512 # Code below checks .gitcookies. Abort if using something else.
3513 authn = gerrit_util.Authenticator.get()
3514 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3515 if isinstance(authn, gerrit_util.GceAuthenticator):
3516 DieWithError(
3517 'This command is not designed for GCE, are you on a bot?\n'
3518 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3519 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003520 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003521 'This command is not designed for bot environment. It checks '
3522 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 checker = _GitCookiesChecker()
3525 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003526
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003527 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003528 checker.print_current_creds(include_netrc=True)
3529
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003530 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003531 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003532 return 0
3533 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003534
3535
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003536@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003537def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003538 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003539 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3540 branch = ShortBranchName(branchref)
3541 _, args = parser.parse_args(args)
3542 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003544 return RunGit(['config', 'branch.%s.base-url' % branch],
3545 error_ok=False).strip()
3546 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003547 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003548 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3549 error_ok=False).strip()
3550
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003551
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003552def color_for_status(status):
3553 """Maps a Changelist status to color, for CMDstatus and other tools."""
3554 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003555 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003556 'waiting': Fore.BLUE,
3557 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003558 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003559 'lgtm': Fore.GREEN,
3560 'commit': Fore.MAGENTA,
3561 'closed': Fore.CYAN,
3562 'error': Fore.WHITE,
3563 }.get(status, Fore.WHITE)
3564
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003565
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003566def get_cl_statuses(changes, fine_grained, max_processes=None):
3567 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003568
3569 If fine_grained is true, this will fetch CL statuses from the server.
3570 Otherwise, simply indicate if there's a matching url for the given branches.
3571
3572 If max_processes is specified, it is used as the maximum number of processes
3573 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3574 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003575
3576 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003577 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003578 if not changes:
3579 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003580
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003581 if not fine_grained:
3582 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003583 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003584 for cl in changes:
3585 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003586 return
3587
3588 # First, sort out authentication issues.
3589 logging.debug('ensuring credentials exist')
3590 for cl in changes:
3591 cl.EnsureAuthenticated(force=False, refresh=True)
3592
3593 def fetch(cl):
3594 try:
3595 return (cl, cl.GetStatus())
3596 except:
3597 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003598 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003599 raise
3600
3601 threads_count = len(changes)
3602 if max_processes:
3603 threads_count = max(1, min(threads_count, max_processes))
3604 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3605
3606 pool = ThreadPool(threads_count)
3607 fetched_cls = set()
3608 try:
3609 it = pool.imap_unordered(fetch, changes).__iter__()
3610 while True:
3611 try:
3612 cl, status = it.next(timeout=5)
3613 except multiprocessing.TimeoutError:
3614 break
3615 fetched_cls.add(cl)
3616 yield cl, status
3617 finally:
3618 pool.close()
3619
3620 # Add any branches that failed to fetch.
3621 for cl in set(changes) - fetched_cls:
3622 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003623
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624
3625def upload_branch_deps(cl, args):
3626 """Uploads CLs of local branches that are dependents of the current branch.
3627
3628 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003629
3630 test1 -> test2.1 -> test3.1
3631 -> test3.2
3632 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003633
3634 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3635 run on the dependent branches in this order:
3636 test2.1, test3.1, test3.2, test2.2, test3.3
3637
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003638 Note: This function does not rebase your local dependent branches. Use it
3639 when you make a change to the parent branch that will not conflict
3640 with its dependent branches, and you would like their dependencies
3641 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642 """
3643 if git_common.is_dirty_git_tree('upload-branch-deps'):
3644 return 1
3645
3646 root_branch = cl.GetBranch()
3647 if root_branch is None:
3648 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3649 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003650 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003651 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3652 'patchset dependencies without an uploaded CL.')
3653
3654 branches = RunGit(['for-each-ref',
3655 '--format=%(refname:short) %(upstream:short)',
3656 'refs/heads'])
3657 if not branches:
3658 print('No local branches found.')
3659 return 0
3660
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003661 # Create a dictionary of all local branches to the branches that are
3662 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003663 tracked_to_dependents = collections.defaultdict(list)
3664 for b in branches.splitlines():
3665 tokens = b.split()
3666 if len(tokens) == 2:
3667 branch_name, tracked = tokens
3668 tracked_to_dependents[tracked].append(branch_name)
3669
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print()
3671 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003672 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003673
rmistry@google.com2dd99862015-06-22 12:22:18 +00003674 def traverse_dependents_preorder(branch, padding=''):
3675 dependents_to_process = tracked_to_dependents.get(branch, [])
3676 padding += ' '
3677 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003678 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003679 dependents.append(dependent)
3680 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003681
rmistry@google.com2dd99862015-06-22 12:22:18 +00003682 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003684
3685 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 return 0
3688
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003689 confirm_or_exit('This command will checkout all dependent branches and run '
3690 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003691
rmistry@google.com2dd99862015-06-22 12:22:18 +00003692 # Record all dependents that failed to upload.
3693 failures = {}
3694 # Go through all dependents, checkout the branch and upload.
3695 try:
3696 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print()
3698 print('--------------------------------------')
3699 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003702 try:
3703 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003704 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003706 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003707 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003708 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003709 finally:
3710 # Swap back to the original root branch.
3711 RunGit(['checkout', '-q', root_branch])
3712
vapiera7fbd5a2016-06-16 09:17:49 -07003713 print()
3714 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715 for dependent_branch in dependents:
3716 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003717 print(' %s : %s' % (dependent_branch, upload_status))
3718 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003719
3720 return 0
3721
3722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003723@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003724def CMDarchive(parser, args):
3725 """Archives and deletes branches associated with closed changelists."""
3726 parser.add_option(
3727 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003728 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003729 parser.add_option(
3730 '-f', '--force', action='store_true',
3731 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003732 parser.add_option(
3733 '-d', '--dry-run', action='store_true',
3734 help='Skip the branch tagging and removal steps.')
3735 parser.add_option(
3736 '-t', '--notags', action='store_true',
3737 help='Do not tag archived branches. '
3738 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003739
kmarshall3bff56b2016-06-06 18:31:47 -07003740 options, args = parser.parse_args(args)
3741 if args:
3742 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003743
3744 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3745 if not branches:
3746 return 0
3747
vapiera7fbd5a2016-06-16 09:17:49 -07003748 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003749 changes = [Changelist(branchref=b)
3750 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003751 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3752 statuses = get_cl_statuses(changes,
3753 fine_grained=True,
3754 max_processes=options.maxjobs)
3755 proposal = [(cl.GetBranch(),
3756 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3757 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003758 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003759 proposal.sort()
3760
3761 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003763 return 0
3764
3765 current_branch = GetCurrentBranch()
3766
vapiera7fbd5a2016-06-16 09:17:49 -07003767 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003768 if options.notags:
3769 for next_item in proposal:
3770 print(' ' + next_item[0])
3771 else:
3772 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3773 for next_item in proposal:
3774 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003775
kmarshall9249e012016-08-23 12:02:16 -07003776 # Quit now on precondition failure or if instructed by the user, either
3777 # via an interactive prompt or by command line flags.
3778 if options.dry_run:
3779 print('\nNo changes were made (dry run).\n')
3780 return 0
3781 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003782 print('You are currently on a branch \'%s\' which is associated with a '
3783 'closed codereview issue, so archive cannot proceed. Please '
3784 'checkout another branch and run this command again.' %
3785 current_branch)
3786 return 1
kmarshall9249e012016-08-23 12:02:16 -07003787 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003788 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3789 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003790 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003791 return 1
3792
3793 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003794 if not options.notags:
3795 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003796 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003797
vapiera7fbd5a2016-06-16 09:17:49 -07003798 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003799
3800 return 0
3801
3802
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003803@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003804def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003805 """Show status of changelists.
3806
3807 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003808 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003809 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003810 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003811 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003812 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003813 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003814 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003815
3816 Also see 'git cl comments'.
3817 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003818 parser.add_option(
3819 '--no-branch-color',
3820 action='store_true',
3821 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003822 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003823 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003824 parser.add_option('-f', '--fast', action='store_true',
3825 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003826 parser.add_option(
3827 '-j', '--maxjobs', action='store', type=int,
3828 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003829
iannuccie53c9352016-08-17 14:40:40 -07003830 _add_codereview_issue_select_options(
3831 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003832 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003833 if args:
3834 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835
iannuccie53c9352016-08-17 14:40:40 -07003836 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003837 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003838
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003839 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003840 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003841 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003842 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003843 elif options.field == 'id':
3844 issueid = cl.GetIssue()
3845 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003848 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003850 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003851 elif options.field == 'status':
3852 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003853 elif options.field == 'url':
3854 url = cl.GetIssueURL()
3855 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003856 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003857 return 0
3858
3859 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3860 if not branches:
3861 print('No local branch found.')
3862 return 0
3863
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003864 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003865 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003866 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003868 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003869 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003870 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003871
Daniel McArdlea23bf592019-02-12 00:25:12 +00003872 current_branch = GetCurrentBranch()
3873
3874 def FormatBranchName(branch, colorize=False):
3875 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3876 an asterisk when it is the current branch."""
3877
3878 asterisk = ""
3879 color = Fore.RESET
3880 if branch == current_branch:
3881 asterisk = "* "
3882 color = Fore.GREEN
3883 branch_name = ShortBranchName(branch)
3884
3885 if colorize:
3886 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003887 return asterisk + branch_name
3888
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003889 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003890
3891 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003892 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3893 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003894 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003895 c, status = output.next()
3896 branch_statuses[c.GetBranch()] = status
3897 status = branch_statuses.pop(branch)
3898 url = cl.GetIssueURL()
3899 if url and (not status or status == 'error'):
3900 # The issue probably doesn't exist anymore.
3901 url += ' (broken)'
3902
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003903 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003904 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003905 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003906 color = ''
3907 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003908 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003909
Alan Cuttera3be9a52019-03-04 18:50:33 +00003910 branch_display = FormatBranchName(branch)
3911 padding = ' ' * (alignment - len(branch_display))
3912 if not options.no_branch_color:
3913 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003914
Alan Cuttera3be9a52019-03-04 18:50:33 +00003915 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3916 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003917
vapiera7fbd5a2016-06-16 09:17:49 -07003918 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003919 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003920 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003921 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003922 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003923 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003924 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003925 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003926 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003927 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003928 print('Issue description:')
3929 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930 return 0
3931
3932
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003933def colorize_CMDstatus_doc():
3934 """To be called once in main() to add colors to git cl status help."""
3935 colors = [i for i in dir(Fore) if i[0].isupper()]
3936
3937 def colorize_line(line):
3938 for color in colors:
3939 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003940 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003941 indent = len(line) - len(line.lstrip(' ')) + 1
3942 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3943 return line
3944
3945 lines = CMDstatus.__doc__.splitlines()
3946 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3947
3948
phajdan.jre328cf92016-08-22 04:12:17 -07003949def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003950 if path == '-':
3951 json.dump(contents, sys.stdout)
3952 else:
3953 with open(path, 'w') as f:
3954 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003955
3956
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003957@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003958@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003959def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003960 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003961
3962 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003963 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003964 parser.add_option('-r', '--reverse', action='store_true',
3965 help='Lookup the branch(es) for the specified issues. If '
3966 'no issues are specified, all branches with mapped '
3967 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003968 parser.add_option('--json',
3969 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003970 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003971 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003972
dnj@chromium.org406c4402015-03-03 17:22:28 +00003973 if options.reverse:
3974 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003975 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003976 # Reverse issue lookup.
3977 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003978
3979 git_config = {}
3980 for config in RunGit(['config', '--get-regexp',
3981 r'branch\..*issue']).splitlines():
3982 name, _space, val = config.partition(' ')
3983 git_config[name] = val
3984
dnj@chromium.org406c4402015-03-03 17:22:28 +00003985 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003986 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3987 config_key = _git_branch_config_key(ShortBranchName(branch),
3988 cls.IssueConfigKey())
3989 issue = git_config.get(config_key)
3990 if issue:
3991 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003992 if not args:
3993 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003994 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003995 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003996 try:
3997 issue_num = int(issue)
3998 except ValueError:
3999 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004000 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004001 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004003 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004004 if options.json:
4005 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004006 return 0
4007
4008 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004009 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004010 if not issue.valid:
4011 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4012 'or no argument to list it.\n'
4013 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004014 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004015 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004016 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004017 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004018 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4019 if options.json:
4020 write_json(options.json, {
4021 'issue': cl.GetIssue(),
4022 'issue_url': cl.GetIssueURL(),
4023 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004024 return 0
4025
4026
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004027@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004028def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004029 """Shows or posts review comments for any changelist."""
4030 parser.add_option('-a', '--add-comment', dest='comment',
4031 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004032 parser.add_option('-p', '--publish', action='store_true',
4033 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004034 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004035 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004036 parser.add_option('-m', '--machine-readable', dest='readable',
4037 action='store_false', default=True,
4038 help='output comments in a format compatible with '
4039 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004040 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004041 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004042 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004043 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004044
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004045 issue = None
4046 if options.issue:
4047 try:
4048 issue = int(options.issue)
4049 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004050 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004051
Edward Lemur934836a2019-09-09 20:16:54 +00004052 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004053
4054 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004055 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004056 return 0
4057
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004058 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4059 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004060 for comment in summary:
4061 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004062 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004063 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004064 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004065 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004066 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004067 elif comment.autogenerated:
4068 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004069 else:
4070 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004071 print('\n%s%s %s%s\n%s' % (
4072 color,
4073 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4074 comment.sender,
4075 Fore.RESET,
4076 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4077
smut@google.comc85ac942015-09-15 16:34:43 +00004078 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004079 def pre_serialize(c):
4080 dct = c.__dict__.copy()
4081 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4082 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004083 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004084 return 0
4085
4086
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004087@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004088@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004089def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004090 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004091 parser.add_option('-d', '--display', action='store_true',
4092 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004093 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004094 help='New description to set for this issue (- for stdin, '
4095 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004096 parser.add_option('-f', '--force', action='store_true',
4097 help='Delete any unpublished Gerrit edits for this issue '
4098 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004099
4100 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004101 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004102
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004103 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004104 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004105 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004106 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004107 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004108
Edward Lemur934836a2019-09-09 20:16:54 +00004109 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004110 if target_issue_arg:
4111 kwargs['issue'] = target_issue_arg.issue
4112 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004113
4114 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004115 if not cl.GetIssue():
4116 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004117
Edward Lemur678a6842019-10-03 22:25:05 +00004118 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004119 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004120
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004121 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004122
smut@google.com34fb6b12015-07-13 20:03:26 +00004123 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004124 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004125 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004126
4127 if options.new_description:
4128 text = options.new_description
4129 if text == '-':
4130 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004131 elif text == '+':
4132 base_branch = cl.GetCommonAncestorWithUpstream()
4133 change = cl.GetChange(base_branch, None, local_description=True)
4134 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004135
4136 description.set_description(text)
4137 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004138 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004139 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004140 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004141 return 0
4142
4143
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004144@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004145def CMDlint(parser, args):
4146 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004147 parser.add_option('--filter', action='append', metavar='-x,+y',
4148 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004149 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004150
4151 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004152 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004153 try:
4154 import cpplint
4155 import cpplint_chromium
4156 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004157 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004158 return 1
4159
4160 # Change the current working directory before calling lint so that it
4161 # shows the correct base.
4162 previous_cwd = os.getcwd()
4163 os.chdir(settings.GetRoot())
4164 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004165 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004166 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4167 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004168 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004170 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004171
4172 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004173 command = args + files
4174 if options.filter:
4175 command = ['--filter=' + ','.join(options.filter)] + command
4176 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004177
4178 white_regex = re.compile(settings.GetLintRegex())
4179 black_regex = re.compile(settings.GetLintIgnoreRegex())
4180 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4181 for filename in filenames:
4182 if white_regex.match(filename):
4183 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004185 else:
4186 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4187 extra_check_functions)
4188 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190 finally:
4191 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004193 if cpplint._cpplint_state.error_count != 0:
4194 return 1
4195 return 0
4196
4197
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004198@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004200 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004201 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004202 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004203 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004204 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004205 parser.add_option('--all', action='store_true',
4206 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004207 parser.add_option('--parallel', action='store_true',
4208 help='Run all tests specified by input_api.RunTests in all '
4209 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004210 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004211
sbc@chromium.org71437c02015-04-09 19:29:40 +00004212 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004213 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214 return 1
4215
Edward Lemur934836a2019-09-09 20:16:54 +00004216 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004217 if args:
4218 base_branch = args[0]
4219 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004220 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004221 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004222
Aaron Gable8076c282017-11-29 14:39:41 -08004223 if options.all:
4224 base_change = cl.GetChange(base_branch, None)
4225 files = [('M', f) for f in base_change.AllFiles()]
4226 change = presubmit_support.GitChange(
4227 base_change.Name(),
4228 base_change.FullDescriptionText(),
4229 base_change.RepositoryRoot(),
4230 files,
4231 base_change.issue,
4232 base_change.patchset,
4233 base_change.author_email,
4234 base_change._upstream)
4235 else:
4236 change = cl.GetChange(base_branch, None)
4237
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004238 cl.RunHook(
4239 committing=not options.upload,
4240 may_prompt=False,
4241 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004242 change=change,
4243 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004244 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004245
4246
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004247def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004248 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004249
4250 Works the same way as
4251 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4252 but can be called on demand on all platforms.
4253
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004254 The basic idea is to generate git hash of a state of the tree, original
4255 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004256 """
4257 lines = []
4258 tree_hash = RunGitSilent(['write-tree'])
4259 lines.append('tree %s' % tree_hash.strip())
4260 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4261 if code == 0:
4262 lines.append('parent %s' % parent.strip())
4263 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4264 lines.append('author %s' % author.strip())
4265 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4266 lines.append('committer %s' % committer.strip())
4267 lines.append('')
4268 # Note: Gerrit's commit-hook actually cleans message of some lines and
4269 # whitespace. This code is not doing this, but it clearly won't decrease
4270 # entropy.
4271 lines.append(message)
4272 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004273 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004274 return 'I%s' % change_hash.strip()
4275
4276
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004277def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004278 """Computes the remote branch ref to use for the CL.
4279
4280 Args:
4281 remote (str): The git remote for the CL.
4282 remote_branch (str): The git remote branch for the CL.
4283 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004284 """
4285 if not (remote and remote_branch):
4286 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004287
wittman@chromium.org455dc922015-01-26 20:15:50 +00004288 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004289 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004290 # refs, which are then translated into the remote full symbolic refs
4291 # below.
4292 if '/' not in target_branch:
4293 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4294 else:
4295 prefix_replacements = (
4296 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4297 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4298 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4299 )
4300 match = None
4301 for regex, replacement in prefix_replacements:
4302 match = re.search(regex, target_branch)
4303 if match:
4304 remote_branch = target_branch.replace(match.group(0), replacement)
4305 break
4306 if not match:
4307 # This is a branch path but not one we recognize; use as-is.
4308 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004309 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4310 # Handle the refs that need to land in different refs.
4311 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004312
wittman@chromium.org455dc922015-01-26 20:15:50 +00004313 # Create the true path to the remote branch.
4314 # Does the following translation:
4315 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4316 # * refs/remotes/origin/master -> refs/heads/master
4317 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4318 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4319 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4320 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4321 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4322 'refs/heads/')
4323 elif remote_branch.startswith('refs/remotes/branch-heads'):
4324 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004325
wittman@chromium.org455dc922015-01-26 20:15:50 +00004326 return remote_branch
4327
4328
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004329def cleanup_list(l):
4330 """Fixes a list so that comma separated items are put as individual items.
4331
4332 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4333 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4334 """
4335 items = sum((i.split(',') for i in l), [])
4336 stripped_items = (i.strip() for i in items)
4337 return sorted(filter(None, stripped_items))
4338
4339
Aaron Gable4db38df2017-11-03 14:59:07 -07004340@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004341@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004342def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004343 """Uploads the current changelist to codereview.
4344
4345 Can skip dependency patchset uploads for a branch by running:
4346 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004347 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004348 git config --unset branch.branch_name.skip-deps-uploads
4349 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004350
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004351 If the name of the checked out branch starts with "bug-" or "fix-" followed
4352 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004353 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004354
4355 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004356 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004357 [git-cl] add support for hashtags
4358 Foo bar: implement foo
4359 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004360 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004361 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4362 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004363 parser.add_option('--bypass-watchlists', action='store_true',
4364 dest='bypass_watchlists',
4365 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004366 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004367 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004368 parser.add_option('--message', '-m', dest='message',
4369 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004370 parser.add_option('-b', '--bug',
4371 help='pre-populate the bug number(s) for this issue. '
4372 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004373 parser.add_option('--message-file', dest='message_file',
4374 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004375 parser.add_option('--title', '-t', dest='title',
4376 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004377 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004378 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004379 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004380 parser.add_option('--tbrs',
4381 action='append', default=[],
4382 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004383 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004384 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004385 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004386 parser.add_option('--hashtag', dest='hashtags',
4387 action='append', default=[],
4388 help=('Gerrit hashtag for new CL; '
4389 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004390 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004391 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004392 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004393 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004394 metavar='TARGET',
4395 help='Apply CL to remote ref TARGET. ' +
4396 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004397 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004398 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004399 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004400 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004401 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004402 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004403 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4404 const='TBR', help='add a set of OWNERS to TBR')
4405 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4406 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004407 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004408 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004409 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004410 'implies --send-mail')
4411 parser.add_option('-d', '--cq-dry-run',
4412 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004413 help='Send the patchset to do a CQ dry run right after '
4414 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004415 parser.add_option('--preserve-tryjobs', action='store_true',
4416 help='instruct the CQ to let tryjobs running even after '
4417 'new patchsets are uploaded instead of canceling '
4418 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004419 parser.add_option('--dependencies', action='store_true',
4420 help='Uploads CLs of all the local branches that depend on '
4421 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004422 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4423 help='Sends your change to the CQ after an approval. Only '
4424 'works on repos that have the Auto-Submit label '
4425 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004426 parser.add_option('--parallel', action='store_true',
4427 help='Run all tests specified by input_api.RunTests in all '
4428 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004429 parser.add_option('--no-autocc', action='store_true',
4430 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004431 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004432 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004433 parser.add_option('-R', '--retry-failed', action='store_true',
4434 help='Retry failed tryjobs from old patchset immediately '
4435 'after uploading new patchset. Cannot be used with '
4436 '--use-commit-queue or --cq-dry-run.')
4437 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4438 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004439 parser.add_option('--fixed', '-x',
4440 help='List of bugs that will be commented on and marked '
4441 'fixed (pre-populates "Fixed:" tag). Same format as '
4442 '-b option / "Bug:" tag. If fixing several issues, '
4443 'separate with commas.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004444
rmistry@google.com2dd99862015-06-22 12:22:18 +00004445 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004446 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004447 (options, args) = parser.parse_args(args)
4448
sbc@chromium.org71437c02015-04-09 19:29:40 +00004449 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004450 return 1
4451
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004452 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004453 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004454 options.cc = cleanup_list(options.cc)
4455
tandriib80458a2016-06-23 12:20:07 -07004456 if options.message_file:
4457 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004458 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004459 options.message = gclient_utils.FileRead(options.message_file)
4460 options.message_file = None
4461
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004462 if ([options.cq_dry_run,
4463 options.use_commit_queue,
4464 options.retry_failed].count(True) > 1):
4465 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4466 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004467
Aaron Gableedbc4132017-09-11 13:22:28 -07004468 if options.use_commit_queue:
4469 options.send_mail = True
4470
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004471 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4472 settings.GetIsGerrit()
4473
Edward Lemur934836a2019-09-09 20:16:54 +00004474 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004475 if options.retry_failed and not cl.GetIssue():
4476 print('No previous patchsets, so --retry-failed has no effect.')
4477 options.retry_failed = False
4478 # cl.GetMostRecentPatchset uses cached information, and can return the last
4479 # patchset before upload. Calling it here makes it clear that it's the
4480 # last patchset before upload. Note that GetMostRecentPatchset will fail
4481 # if no CL has been uploaded yet.
4482 if options.retry_failed:
4483 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004484
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004485 ret = cl.CMDUpload(options, args, orig_args)
4486
4487 if options.retry_failed:
4488 if ret != 0:
4489 print('Upload failed, so --retry-failed has no effect.')
4490 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004491 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004492 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004493 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004494 if len(buckets) == 0:
4495 print('No failed tryjobs, so --retry-failed has no effect.')
4496 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004497 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004498
4499 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004500
4501
Francois Dorayd42c6812017-05-30 15:10:20 -04004502@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004503@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004504def CMDsplit(parser, args):
4505 """Splits a branch into smaller branches and uploads CLs.
4506
4507 Creates a branch and uploads a CL for each group of files modified in the
4508 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004509 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004510 the shared OWNERS file.
4511 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004512 parser.add_option('-d', '--description', dest='description_file',
4513 help='A text file containing a CL description in which '
4514 '$directory will be replaced by each CL\'s directory.')
4515 parser.add_option('-c', '--comment', dest='comment_file',
4516 help='A text file containing a CL comment.')
4517 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004518 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004519 help='List the files and reviewers for each CL that would '
4520 'be created, but don\'t create branches or CLs.')
4521 parser.add_option('--cq-dry-run', action='store_true',
4522 help='If set, will do a cq dry run for each uploaded CL. '
4523 'Please be careful when doing this; more than ~10 CLs '
4524 'has the potential to overload our build '
4525 'infrastructure. Try to upload these not during high '
4526 'load times (usually 11-3 Mountain View time). Email '
4527 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004528 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4529 default=True,
4530 help='Sends your change to the CQ after an approval. Only '
4531 'works on repos that have the Auto-Submit label '
4532 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004533 options, _ = parser.parse_args(args)
4534
4535 if not options.description_file:
4536 parser.error('No --description flag specified.')
4537
4538 def WrappedCMDupload(args):
4539 return CMDupload(OptionParser(), args)
4540
4541 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004542 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004543 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004544
4545
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004546@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004547@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004549 """DEPRECATED: Used to commit the current changelist via git-svn."""
4550 message = ('git-cl no longer supports committing to SVN repositories via '
4551 'git-svn. You probably want to use `git cl land` instead.')
4552 print(message)
4553 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554
4555
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004556@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004557@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004558def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004559 """Commits the current changelist via git.
4560
4561 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4562 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004563 """
4564 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4565 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004566 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004567 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004568 parser.add_option('--parallel', action='store_true',
4569 help='Run all tests specified by input_api.RunTests in all '
4570 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004571 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004572
Edward Lemur934836a2019-09-09 20:16:54 +00004573 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004574
Robert Iannucci2e73d432018-03-14 01:10:47 -07004575 if not cl.GetIssue():
4576 DieWithError('You must upload the change first to Gerrit.\n'
4577 ' If you would rather have `git cl land` upload '
4578 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004579 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004580 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581
4582
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004583@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004584@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004586 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004587 parser.add_option('-b', dest='newbranch',
4588 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004589 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004590 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004592 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004593
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004594 group = optparse.OptionGroup(
4595 parser,
4596 'Options for continuing work on the current issue uploaded from a '
4597 'different clone (e.g. different machine). Must be used independently '
4598 'from the other options. No issue number should be specified, and the '
4599 'branch must have an issue number associated with it')
4600 group.add_option('--reapply', action='store_true', dest='reapply',
4601 help='Reset the branch and reapply the issue.\n'
4602 'CAUTION: This will undo any local changes in this '
4603 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004604
4605 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004606 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004607 parser.add_option_group(group)
4608
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004609 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004611
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004612 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004614 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004615 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004616 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004617
Edward Lemur934836a2019-09-09 20:16:54 +00004618 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004619 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004620 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004621
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004622 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004623 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004624 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004625
4626 RunGit(['reset', '--hard', upstream])
4627 if options.pull:
4628 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004629
Edward Lemur678a6842019-10-03 22:25:05 +00004630 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4631 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004632
4633 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004634 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004635
Edward Lemurf38bc172019-09-03 21:02:13 +00004636 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004637 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004638 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004639
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004640 # We don't want uncommitted changes mixed up with the patch.
4641 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004642 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004643
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004644 if options.newbranch:
4645 if options.force:
4646 RunGit(['branch', '-D', options.newbranch],
4647 stderr=subprocess2.PIPE, error_ok=True)
4648 RunGit(['new-branch', options.newbranch])
4649
Edward Lemur678a6842019-10-03 22:25:05 +00004650 cl = Changelist(
4651 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004652
Edward Lemur678a6842019-10-03 22:25:05 +00004653 if not args[0].isdigit():
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:
Edward Lemura834f392019-10-22 22:23:00 +00004665 status = urllib_request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004666 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')
Edward Lemura834f392019-10-22 22:23:00 +00004679 connection = urllib_request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004680 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)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004743 parser.add_option(
4744 '-R', '--retry-failed', action='store_true', default=False,
4745 help='Retry failed jobs from the latest set of tryjobs. '
4746 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004747 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004748 options, args = parser.parse_args(args)
4749
machenbach@chromium.org45453142015-09-15 08:45:22 +00004750 # Make sure that all properties are prop=value pairs.
4751 bad_params = [x for x in options.properties if '=' not in x]
4752 if bad_params:
4753 parser.error('Got properties with missing "=": %s' % bad_params)
4754
maruel@chromium.org15192402012-09-06 12:38:29 +00004755 if args:
4756 parser.error('Unknown arguments: %s' % args)
4757
Edward Lemur934836a2019-09-09 20:16:54 +00004758 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004759 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004760 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004761
Edward Lemurf38bc172019-09-03 21:02:13 +00004762 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004763 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004764
tandriie113dfd2016-10-11 10:20:12 -07004765 error_message = cl.CannotTriggerTryJobReason()
4766 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004767 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004768
Quinten Yearsley983111f2019-09-26 17:18:48 +00004769 if options.retry_failed:
4770 if options.bot or options.bucket:
4771 print('ERROR: The option --retry-failed is not compatible with '
4772 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4773 return 1
4774 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004775 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004776 if options.verbose:
4777 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004778 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004779 if not buckets:
4780 print('There are no failed jobs in the latest set of jobs '
4781 '(patchset #%d), doing nothing.' % patchset)
4782 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004783 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004784 if num_builders > 10:
4785 confirm_or_exit('There are %d builders with failed builds.'
4786 % num_builders, action='continue')
4787 else:
4788 buckets = _get_bucket_map(cl, options, parser)
4789 if buckets and any(b.startswith('master.') for b in buckets):
4790 print('ERROR: Buildbot masters are not supported.')
4791 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004792
qyearsleydd49f942016-10-28 11:57:22 -07004793 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4794 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004795 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004796 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004797 print('git cl try with no bots now defaults to CQ dry run.')
4798 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4799 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004800
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004801 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004802 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004803 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004804 'of bot requires an initial job from a parent (usually a builder). '
4805 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004806 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004807 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004808
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004809 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004810 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004811 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004812 except BuildbucketResponseException as ex:
4813 print('ERROR: %s' % ex)
4814 return 1
4815 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004816
4817
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004818@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004820 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004821 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004822 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004823 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004824 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004825 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004826 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004827 '--color', action='store_true', default=setup_color.IS_TTY,
4828 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004829 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004830 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4831 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004832 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004833 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004834 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004836 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004837 options, args = parser.parse_args(args)
4838 if args:
4839 parser.error('Unrecognized args: %s' % ' '.join(args))
4840
Edward Lemur934836a2019-09-09 20:16:54 +00004841 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004842 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004843 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004844
tandrii221ab252016-10-06 08:12:04 -07004845 patchset = options.patchset
4846 if not patchset:
4847 patchset = cl.GetMostRecentPatchset()
4848 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004849 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004850 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004851 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004852 cl.GetIssue())
4853
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004854 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004855 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004856 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004857 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004858 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004859 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004860 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004861 else:
4862 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004863 return 0
4864
4865
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004866@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004867@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004868def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004869 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004870 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004871 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004872 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004873
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004874 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004875 if args:
4876 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004877 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004878 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004879 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004880 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004881
4882 # Clear configured merge-base, if there is one.
4883 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004884 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004885 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004886 return 0
4887
4888
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004889@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004890def CMDweb(parser, args):
4891 """Opens the current CL in the web browser."""
4892 _, args = parser.parse_args(args)
4893 if args:
4894 parser.error('Unrecognized args: %s' % ' '.join(args))
4895
4896 issue_url = Changelist().GetIssueURL()
4897 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004898 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004899 return 1
4900
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004901 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004902 # allows us to hide the "Created new window in existing browser session."
4903 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004904 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004905 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004906 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004907 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004908 os.open(os.devnull, os.O_RDWR)
4909 try:
4910 webbrowser.open(issue_url)
4911 finally:
4912 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004913 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004914 return 0
4915
4916
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004917@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004918def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004919 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004920 parser.add_option('-d', '--dry-run', action='store_true',
4921 help='trigger in dry run mode')
4922 parser.add_option('-c', '--clear', action='store_true',
4923 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004924 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004925 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004926 if args:
4927 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004928 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004929 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004930
Edward Lemur934836a2019-09-09 20:16:54 +00004931 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004932 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004933 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004934 elif options.dry_run:
4935 state = _CQState.DRY_RUN
4936 else:
4937 state = _CQState.COMMIT
4938 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004939 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004940 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004941 return 0
4942
4943
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004944@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004945def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004946 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004947 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004948 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004949 if args:
4950 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004951 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004952 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004953 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004954 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004955 cl.CloseIssue()
4956 return 0
4957
4958
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004959@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004960def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004961 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004962 parser.add_option(
4963 '--stat',
4964 action='store_true',
4965 dest='stat',
4966 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004967 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004968 if args:
4969 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004970
Edward Lemur934836a2019-09-09 20:16:54 +00004971 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004972 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004973 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004974 if not issue:
4975 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004976
Aaron Gablea718c3e2017-08-28 17:47:28 -07004977 base = cl._GitGetBranchConfigValue('last-upload-hash')
4978 if not base:
4979 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4980 if not base:
4981 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4982 revision_info = detail['revisions'][detail['current_revision']]
4983 fetch_info = revision_info['fetch']['http']
4984 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4985 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004986
Aaron Gablea718c3e2017-08-28 17:47:28 -07004987 cmd = ['git', 'diff']
4988 if options.stat:
4989 cmd.append('--stat')
4990 cmd.append(base)
4991 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004992
4993 return 0
4994
4995
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004996@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004997def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004998 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004999 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005000 '--ignore-current',
5001 action='store_true',
5002 help='Ignore the CL\'s current reviewers and start from scratch.')
5003 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005004 '--ignore-self',
5005 action='store_true',
5006 help='Do not consider CL\'s author as an owners.')
5007 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005008 '--no-color',
5009 action='store_true',
5010 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005011 parser.add_option(
5012 '--batch',
5013 action='store_true',
5014 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005015 # TODO: Consider moving this to another command, since other
5016 # git-cl owners commands deal with owners for a given CL.
5017 parser.add_option(
5018 '--show-all',
5019 action='store_true',
5020 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005021 options, args = parser.parse_args(args)
5022
5023 author = RunGit(['config', 'user.email']).strip() or None
5024
Edward Lemur934836a2019-09-09 20:16:54 +00005025 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005026
Yang Guo6e269a02019-06-26 11:17:02 +00005027 if options.show_all:
5028 for arg in args:
5029 base_branch = cl.GetCommonAncestorWithUpstream()
5030 change = cl.GetChange(base_branch, None)
5031 database = owners.Database(change.RepositoryRoot(), file, os.path)
5032 database.load_data_needed_for([arg])
5033 print('Owners for %s:' % arg)
5034 for owner in sorted(database.all_possible_owners([arg], None)):
5035 print(' - %s' % owner)
5036 return 0
5037
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005038 if args:
5039 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005040 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005041 base_branch = args[0]
5042 else:
5043 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005044 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005045
5046 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005047 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5048
5049 if options.batch:
5050 db = owners.Database(change.RepositoryRoot(), file, os.path)
5051 print('\n'.join(db.reviewers_for(affected_files, author)))
5052 return 0
5053
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005054 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005055 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005056 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005057 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005058 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005059 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005060 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005061 override_files=change.OriginalOwnersFiles(),
5062 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005063
5064
Aiden Bennerc08566e2018-10-03 17:52:42 +00005065def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005066 """Generates a diff command."""
5067 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005068 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5069
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005070 if allow_prefix:
5071 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5072 # case that diff.noprefix is set in the user's git config.
5073 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5074 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005075 diff_cmd += ['--no-prefix']
5076
5077 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005078
5079 if args:
5080 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005081 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005082 diff_cmd.append(arg)
5083 else:
5084 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005085
5086 return diff_cmd
5087
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005088
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005089def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005090 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005091 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005092
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005093
enne@chromium.org555cfe42014-01-29 18:21:39 +00005094@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005095@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005096def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005097 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005098 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005099 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005100 parser.add_option('--full', action='store_true',
5101 help='Reformat the full content of all touched files')
5102 parser.add_option('--dry-run', action='store_true',
5103 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005104 parser.add_option(
5105 '--python',
5106 action='store_true',
5107 default=None,
5108 help='Enables python formatting on all python files.')
5109 parser.add_option(
5110 '--no-python',
5111 action='store_true',
5112 dest='python',
5113 help='Disables python formatting on all python files. '
5114 'Takes precedence over --python. '
5115 'If neither --python or --no-python are set, python '
5116 'files that have a .style.yapf file in an ancestor '
5117 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005118 parser.add_option('--js', action='store_true',
5119 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005120 parser.add_option('--diff', action='store_true',
5121 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005122 parser.add_option('--presubmit', action='store_true',
5123 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005124 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005125
Daniel Chengc55eecf2016-12-30 03:11:02 -08005126 # Normalize any remaining args against the current path, so paths relative to
5127 # the current directory are still resolved as expected.
5128 args = [os.path.join(os.getcwd(), arg) for arg in args]
5129
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005130 # git diff generates paths against the root of the repository. Change
5131 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005132 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005133 if rel_base_path:
5134 os.chdir(rel_base_path)
5135
digit@chromium.org29e47272013-05-17 17:01:46 +00005136 # Grab the merge-base commit, i.e. the upstream commit of the current
5137 # branch when it was created or the last time it was rebased. This is
5138 # to cover the case where the user may have called "git fetch origin",
5139 # moving the origin branch to a newer commit, but hasn't rebased yet.
5140 upstream_commit = None
5141 cl = Changelist()
5142 upstream_branch = cl.GetUpstreamBranch()
5143 if upstream_branch:
5144 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5145 upstream_commit = upstream_commit.strip()
5146
5147 if not upstream_commit:
5148 DieWithError('Could not find base commit for this branch. '
5149 'Are you in detached state?')
5150
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005151 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5152 diff_output = RunGit(changed_files_cmd)
5153 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005154 # Filter out files deleted by this CL
5155 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005156
Christopher Lamc5ba6922017-01-24 11:19:14 +11005157 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005158 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005159
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005160 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5161 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5162 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005163 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005164
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005165 top_dir = os.path.normpath(
5166 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5167
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005168 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5169 # formatted. This is used to block during the presubmit.
5170 return_value = 0
5171
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005172 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005173 # Locate the clang-format binary in the checkout
5174 try:
5175 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005176 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005177 DieWithError(e)
5178
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005179 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005180 cmd = [clang_format_tool]
5181 if not opts.dry_run and not opts.diff:
5182 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005183 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005184 if opts.diff:
5185 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005186 else:
5187 env = os.environ.copy()
5188 env['PATH'] = str(os.path.dirname(clang_format_tool))
5189 try:
5190 script = clang_format.FindClangFormatScriptInChromiumTree(
5191 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005192 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005193 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005194
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005195 cmd = [sys.executable, script, '-p0']
5196 if not opts.dry_run and not opts.diff:
5197 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005198
Jamie Madill812ac222019-10-16 16:43:08 +00005199 lines = '-U%s' % settings.GetDiffLinesOfContext()
5200 diff_cmd = BuildGitDiffCmd(lines, upstream_commit, clang_diff_files)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005201 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005202
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005203 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5204 if opts.diff:
5205 sys.stdout.write(stdout)
5206 if opts.dry_run and len(stdout) > 0:
5207 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005208
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005209 # Similar code to above, but using yapf on .py files rather than clang-format
5210 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005211 py_explicitly_disabled = opts.python is not None and not opts.python
5212 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005213 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5214 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5215 if sys.platform.startswith('win'):
5216 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005217
Aiden Bennerc08566e2018-10-03 17:52:42 +00005218 # If we couldn't find a yapf file we'll default to the chromium style
5219 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005220 chromium_default_yapf_style = os.path.join(depot_tools_path,
5221 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005222 # Used for caching.
5223 yapf_configs = {}
5224 for f in python_diff_files:
5225 # Find the yapf style config for the current file, defaults to depot
5226 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005227 _FindYapfConfigFile(f, yapf_configs, top_dir)
5228
5229 # Turn on python formatting by default if a yapf config is specified.
5230 # This breaks in the case of this repo though since the specified
5231 # style file is also the global default.
5232 if opts.python is None:
5233 filtered_py_files = []
5234 for f in python_diff_files:
5235 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5236 filtered_py_files.append(f)
5237 else:
5238 filtered_py_files = python_diff_files
5239
5240 # Note: yapf still seems to fix indentation of the entire file
5241 # even if line ranges are specified.
5242 # See https://github.com/google/yapf/issues/499
5243 if not opts.full and filtered_py_files:
5244 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5245
Brian Sheedy59b06a82019-10-14 17:03:29 +00005246 ignored_yapf_files = _GetYapfIgnoreFilepaths(top_dir)
5247
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005248 for f in filtered_py_files:
Brian Sheedy59b06a82019-10-14 17:03:29 +00005249 if f in ignored_yapf_files:
5250 continue
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005251 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5252 if yapf_config is None:
5253 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005254
5255 cmd = [yapf_tool, '--style', yapf_config, f]
5256
5257 has_formattable_lines = False
5258 if not opts.full:
5259 # Only run yapf over changed line ranges.
5260 for diff_start, diff_len in py_line_diffs[f]:
5261 diff_end = diff_start + diff_len - 1
5262 # Yapf errors out if diff_end < diff_start but this
5263 # is a valid line range diff for a removal.
5264 if diff_end >= diff_start:
5265 has_formattable_lines = True
5266 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5267 # If all line diffs were removals we have nothing to format.
5268 if not has_formattable_lines:
5269 continue
5270
5271 if opts.diff or opts.dry_run:
5272 cmd += ['--diff']
5273 # Will return non-zero exit code if non-empty diff.
5274 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5275 if opts.diff:
5276 sys.stdout.write(stdout)
5277 elif len(stdout) > 0:
5278 return_value = 2
5279 else:
5280 cmd += ['-i']
5281 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005282
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005283 # Dart's formatter does not have the nice property of only operating on
5284 # modified chunks, so hard code full.
5285 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005286 try:
5287 command = [dart_format.FindDartFmtToolInChromiumTree()]
5288 if not opts.dry_run and not opts.diff:
5289 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005290 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005291
ppi@chromium.org6593d932016-03-03 15:41:15 +00005292 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005293 if opts.dry_run and stdout:
5294 return_value = 2
5295 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005296 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5297 'found in this checkout. Files in other languages are still '
5298 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005299
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005300 # Format GN build files. Always run on full build files for canonical form.
5301 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005302 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005303 if opts.dry_run or opts.diff:
5304 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005305 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005306 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5307 shell=sys.platform == 'win32',
5308 cwd=top_dir)
5309 if opts.dry_run and gn_ret == 2:
5310 return_value = 2 # Not formatted.
5311 elif opts.diff and gn_ret == 2:
5312 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005313 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005314 elif gn_ret != 0:
5315 # For non-dry run cases (and non-2 return values for dry-run), a
5316 # nonzero error code indicates a failure, probably because the file
5317 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005318 DieWithError('gn format failed on ' + gn_diff_file +
5319 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005320
Ilya Shermane081cbe2017-08-15 17:51:04 -07005321 # Skip the metrics formatting from the global presubmit hook. These files have
5322 # a separate presubmit hook that issues an error if the files need formatting,
5323 # whereas the top-level presubmit script merely issues a warning. Formatting
5324 # these files is somewhat slow, so it's important not to duplicate the work.
5325 if not opts.presubmit:
5326 for xml_dir in GetDirtyMetricsDirs(diff_files):
5327 tool_dir = os.path.join(top_dir, xml_dir)
5328 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5329 if opts.dry_run or opts.diff:
5330 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005331 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005332 if opts.diff:
5333 sys.stdout.write(stdout)
5334 if opts.dry_run and stdout:
5335 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005336
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005337 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005338
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005339
Steven Holte2e664bf2017-04-21 13:10:47 -07005340def GetDirtyMetricsDirs(diff_files):
5341 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5342 metrics_xml_dirs = [
5343 os.path.join('tools', 'metrics', 'actions'),
5344 os.path.join('tools', 'metrics', 'histograms'),
5345 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005346 os.path.join('tools', 'metrics', 'ukm'),
5347 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005348 for xml_dir in metrics_xml_dirs:
5349 if any(file.startswith(xml_dir) for file in xml_diff_files):
5350 yield xml_dir
5351
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005352
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005353@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005354@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005355def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005356 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005357 _, args = parser.parse_args(args)
5358
5359 if len(args) != 1:
5360 parser.print_help()
5361 return 1
5362
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005363 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005364 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005365 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005366
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005367 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005368
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005369 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005370 output = RunGit(['config', '--local', '--get-regexp',
5371 r'branch\..*\.%s' % issueprefix],
5372 error_ok=True)
5373 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005374 if issue == target_issue:
5375 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005376
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005377 branches = []
5378 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005379 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005380 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005381 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005382 return 1
5383 if len(branches) == 1:
5384 RunGit(['checkout', branches[0]])
5385 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005386 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005387 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005388 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005389 which = raw_input('Choose by index: ')
5390 try:
5391 RunGit(['checkout', branches[int(which)]])
5392 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005393 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005394 return 1
5395
5396 return 0
5397
5398
maruel@chromium.org29404b52014-09-08 22:58:00 +00005399def CMDlol(parser, args):
5400 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005401 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005402 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5403 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5404 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005405 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005406 return 0
5407
5408
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005409class OptionParser(optparse.OptionParser):
5410 """Creates the option parse and add --verbose support."""
5411 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005412 optparse.OptionParser.__init__(
5413 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005414 self.add_option(
5415 '-v', '--verbose', action='count', default=0,
5416 help='Use 2 times for more debugging info')
5417
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005419 try:
5420 return self._parse_args(args)
5421 finally:
5422 # Regardless of success or failure of args parsing, we want to report
5423 # metrics, but only after logging has been initialized (if parsing
5424 # succeeded).
5425 global settings
5426 settings = Settings()
5427
5428 if not metrics.DISABLE_METRICS_COLLECTION:
5429 # GetViewVCUrl ultimately calls logging method.
5430 project_url = settings.GetViewVCUrl().strip('/+')
5431 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5432 metrics.collector.add('project_urls', [project_url])
5433
5434 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005435 # Create an optparse.Values object that will store only the actual passed
5436 # options, without the defaults.
5437 actual_options = optparse.Values()
5438 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5439 # Create an optparse.Values object with the default options.
5440 options = optparse.Values(self.get_default_values().__dict__)
5441 # Update it with the options passed by the user.
5442 options._update_careful(actual_options.__dict__)
5443 # Store the options passed by the user in an _actual_options attribute.
5444 # We store only the keys, and not the values, since the values can contain
5445 # arbitrary information, which might be PII.
5446 metrics.collector.add('arguments', actual_options.__dict__.keys())
5447
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005448 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005449 logging.basicConfig(
5450 level=levels[min(options.verbose, len(levels) - 1)],
5451 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5452 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005453
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005454 return options, args
5455
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005456
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005457def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005458 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005459 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005460 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005461 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005462
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005463 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005464 dispatcher = subcommand.CommandDispatcher(__name__)
5465 try:
5466 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005467 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005468 DieWithError(str(e))
Edward Lemura834f392019-10-22 22:23:00 +00005469 except urllib_error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005470 if e.code != 500:
5471 raise
5472 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005473 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005474 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005475 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005476
5477
5478if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005479 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5480 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005481 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005482 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005483 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005484 sys.exit(main(sys.argv[1:]))