blob: e7c2a2861bfa26955a29fff531e9b8bf3cee76c9 [file] [log] [blame]
Edward Lesmes98eda3f2019-08-12 21:09:53 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000018import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070029import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000031import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000039from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000040from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000041import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000042import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000043import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000044import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000045import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000046import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000048import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000049import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000050import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000051import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000053import presubmit_support
54import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000055import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040056import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000057import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000058import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import watchlists
60
tandrii7400cf02016-06-21 08:48:07 -070061__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062
Edward Lemur0f58ae42019-04-30 17:24:12 +000063# Traces for git push will be stored in a traces directory inside the
64# depot_tools checkout.
65DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
66TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
67
68# When collecting traces, Git hashes will be reduced to 6 characters to reduce
69# the size after compression.
70GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
71# Used to redact the cookies from the gitcookies file.
72GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
73
Edward Lemur1b52d872019-05-09 21:12:12 +000074# The maximum number of traces we will keep. Multiplied by 3 since we store
75# 3 files per trace.
76MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000077# Message to be displayed to the user to inform where to find the traces for a
78# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000079TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000080'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000081'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000082' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000083'Copies of your gitcookies file and git config have been recorded at:\n'
84' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000085# Format of the message to be stored as part of the traces to give developers a
86# better context when they go through traces.
87TRACES_README_FORMAT = (
88'Date: %(now)s\n'
89'\n'
90'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
91'Title: %(title)s\n'
92'\n'
93'%(description)s\n'
94'\n'
95'Execution time: %(execution_time)s\n'
96'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000097
tandrii9d2c7a32016-06-22 03:42:45 -070098COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080099POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000100DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000101REFS_THAT_ALIAS_TO_OTHER_REFS = {
102 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
103 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
104}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000105
thestig@chromium.org44202a22014-03-11 19:22:18 +0000106# Valid extensions for files we want to lint.
107DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
108DEFAULT_LINT_IGNORE_REGEX = r"$^"
109
Aiden Bennerc08566e2018-10-03 17:52:42 +0000110# File name for yapf style config files.
111YAPF_CONFIG_FILENAME = '.style.yapf'
112
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000113# Buildbucket master name prefix for Buildbot masters.
borenet6c0efe62016-10-19 08:13:29 -0700114MASTER_PREFIX = 'master.'
115
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000116# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000117Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000118
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000119# Initialized in main()
120settings = None
121
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100122# Used by tests/git_cl_test.py to add extra logging.
123# Inside the weirdly failing test, add this:
124# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700125# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100126_IS_BEING_TESTED = False
127
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000128
Christopher Lamf732cd52017-01-24 12:40:11 +1100129def DieWithError(message, change_desc=None):
130 if change_desc:
131 SaveDescriptionBackup(change_desc)
132
vapiera7fbd5a2016-06-16 09:17:49 -0700133 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000134 sys.exit(1)
135
136
Christopher Lamf732cd52017-01-24 12:40:11 +1100137def SaveDescriptionBackup(change_desc):
138 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000139 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100140 backup_file = open(backup_path, 'w')
141 backup_file.write(change_desc.description)
142 backup_file.close()
143
144
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000145def GetNoGitPagerEnv():
146 env = os.environ.copy()
147 # 'cat' is a magical git string that disables pagers on all platforms.
148 env['GIT_PAGER'] = 'cat'
149 return env
150
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000151
bsep@chromium.org627d9002016-04-29 00:00:52 +0000152def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000154 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000155 except subprocess2.CalledProcessError as e:
156 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000157 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000158 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000159 'Command "%s" failed.\n%s' % (
160 ' '.join(args), error_message or e.stdout or ''))
161 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162
163
164def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000165 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000166 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000167
168
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000169def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000170 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700171 if suppress_stderr:
172 stderr = subprocess2.VOID
173 else:
174 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000175 try:
tandrii5d48c322016-08-18 16:19:37 -0700176 (out, _), code = subprocess2.communicate(['git'] + args,
177 env=GetNoGitPagerEnv(),
178 stdout=subprocess2.PIPE,
179 stderr=stderr)
180 return code, out
181 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900182 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700183 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000184
185
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000186def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000187 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000188 return RunGitWithCode(args, suppress_stderr=True)[1]
189
190
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000191def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000192 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000193 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000194 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000195 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000196
197
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000198def BranchExists(branch):
199 """Return True if specified branch exists."""
200 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
201 suppress_stderr=True)
202 return not code
203
204
tandrii2a16b952016-10-19 07:09:44 -0700205def time_sleep(seconds):
206 # Use this so that it can be mocked in tests without interfering with python
207 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700208 return time.sleep(seconds)
209
210
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000211def time_time():
212 # Use this so that it can be mocked in tests without interfering with python
213 # system machinery.
214 return time.time()
215
216
Edward Lemur1b52d872019-05-09 21:12:12 +0000217def datetime_now():
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
220 return datetime.datetime.now()
221
222
maruel@chromium.org90541732011-04-01 17:54:18 +0000223def ask_for_data(prompt):
224 try:
225 return raw_input(prompt)
226 except KeyboardInterrupt:
227 # Hide the exception.
228 sys.exit(1)
229
230
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100231def confirm_or_exit(prefix='', action='confirm'):
232 """Asks user to press enter to continue or press Ctrl+C to abort."""
233 if not prefix or prefix.endswith('\n'):
234 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100235 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100236 mid = ' Press'
237 elif prefix.endswith(' '):
238 mid = 'press'
239 else:
240 mid = ' press'
241 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
242
243
244def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000245 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100246 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
247 while True:
248 if 'yes'.startswith(result):
249 return True
250 if 'no'.startswith(result):
251 return False
252 result = ask_for_data('Please, type yes or no: ').lower()
253
254
tandrii5d48c322016-08-18 16:19:37 -0700255def _git_branch_config_key(branch, key):
256 """Helper method to return Git config key for a branch."""
257 assert branch, 'branch name is required to set git config for it'
258 return 'branch.%s.%s' % (branch, key)
259
260
261def _git_get_branch_config_value(key, default=None, value_type=str,
262 branch=False):
263 """Returns git config value of given or current branch if any.
264
265 Returns default in all other cases.
266 """
267 assert value_type in (int, str, bool)
268 if branch is False: # Distinguishing default arg value from None.
269 branch = GetCurrentBranch()
270
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000271 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700272 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000273
tandrii5d48c322016-08-18 16:19:37 -0700274 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700275 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700276 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000277 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700278 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700279 args.append(_git_branch_config_key(branch, key))
280 code, out = RunGitWithCode(args)
281 if code == 0:
282 value = out.strip()
283 if value_type == int:
284 return int(value)
285 if value_type == bool:
286 return bool(value.lower() == 'true')
287 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000288 return default
289
290
tandrii5d48c322016-08-18 16:19:37 -0700291def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000292 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700293
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000294 If value is None, the key will be unset, otherwise it will be set.
295 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700296 """
297 if not branch:
298 branch = GetCurrentBranch()
299 assert branch, 'a branch name OR currently checked out branch is required'
300 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700301 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700302 if value is None:
303 args.append('--unset')
304 elif isinstance(value, bool):
305 args.append('--bool')
306 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700307 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000308 # `git config` also has --int, but apparently git config suffers from
309 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700310 value = str(value)
311 args.append(_git_branch_config_key(branch, key))
312 if value is not None:
313 args.append(value)
314 RunGit(args, **kwargs)
315
316
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100317def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700318 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100319
320 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
321 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000322 # Git also stores timezone offset, but it only affects visual display;
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100323 # actual point in time is defined by this timestamp only.
324 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
325
326
327def _git_amend_head(message, committer_timestamp):
328 """Amends commit with new message and desired committer_timestamp.
329
330 Sets committer timezone to UTC.
331 """
332 env = os.environ.copy()
333 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
334 return RunGit(['commit', '--amend', '-m', message], env=env)
335
336
machenbach@chromium.org45453142015-09-15 08:45:22 +0000337def _get_properties_from_options(options):
338 properties = dict(x.split('=', 1) for x in options.properties)
339 for key, val in properties.iteritems():
340 try:
341 properties[key] = json.loads(val)
342 except ValueError:
343 pass # If a value couldn't be evaluated, treat it as a string.
344 return properties
345
346
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000347def _prefix_master(master):
348 """Convert user-specified master name to full master name.
349
350 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
351 name, while the developers always use shortened master name
352 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
353 function does the conversion for buildbucket migration.
354 """
borenet6c0efe62016-10-19 08:13:29 -0700355 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000356 return master
borenet6c0efe62016-10-19 08:13:29 -0700357 return '%s%s' % (MASTER_PREFIX, master)
358
359
360def _unprefix_master(bucket):
361 """Convert bucket name to shortened master name.
362
363 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
364 name, while the developers always use shortened master name
365 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
366 function does the conversion for buildbucket migration.
367 """
368 if bucket.startswith(MASTER_PREFIX):
369 return bucket[len(MASTER_PREFIX):]
370 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000371
372
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000373def _buildbucket_retry(operation_name, http, *args, **kwargs):
374 """Retries requests to buildbucket service and returns parsed json content."""
375 try_count = 0
376 while True:
377 response, content = http.request(*args, **kwargs)
378 try:
379 content_json = json.loads(content)
380 except ValueError:
381 content_json = None
382
383 # Buildbucket could return an error even if status==200.
384 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000385 error = content_json.get('error')
386 if error.get('code') == 403:
387 raise BuildbucketResponseException(
388 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000389 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000390 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000391 raise BuildbucketResponseException(msg)
392
393 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700394 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000395 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000396 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700397 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000398 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000399 content)
400 return content_json
401 if response.status < 500 or try_count >= 2:
402 raise httplib2.HttpLib2Error(content)
403
404 # status >= 500 means transient failures.
405 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000406 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000407 try_count += 1
408 assert False, 'unreachable'
409
410
qyearsley1fdfcb62016-10-24 13:22:03 -0700411def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700412 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000413 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700414 """
qyearsleydd49f942016-10-28 11:57:22 -0700415 # If no bots are listed, we try to get a set of builders and tests based
416 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700417 if not options.bot:
418 change = changelist.GetChange(
419 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700420 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700421 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700422 change=change,
423 changed_files=change.LocalPaths(),
424 repository_root=settings.GetRoot(),
425 default_presubmit=None,
426 project=None,
427 verbose=options.verbose,
428 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700429 if masters is None:
430 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100431 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700432
qyearsley1fdfcb62016-10-24 13:22:03 -0700433 if options.bucket:
434 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000435 option_parser.error(
436 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700437
438
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800439def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000440 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700441
442 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700443 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000444 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700445 buckets: A nested dict mapping bucket names to builders to tests.
446 options: Command-line options.
447 """
tandriide281ae2016-10-12 06:02:30 -0700448 assert changelist.GetIssue(), 'CL must be uploaded first'
449 codereview_url = changelist.GetCodereviewServer()
450 assert codereview_url, 'CL must be uploaded first'
451 patchset = patchset or changelist.GetMostRecentPatchset()
452 assert patchset, 'CL must be uploaded first'
453
454 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700455 # Cache the buildbucket credentials under the codereview host key, so that
456 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700457 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000458 http = authenticator.authorize(httplib2.Http())
459 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700460
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000461 buildbucket_put_url = (
462 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000463 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000464 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700465 hostname=codereview_host,
466 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000467 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700468
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700469 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800470 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700471 if options.clobber:
472 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700473 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700474 if extra_properties:
475 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000476
477 batch_req_body = {'builds': []}
478 print_text = []
479 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700480 for bucket, builders_and_tests in sorted(buckets.iteritems()):
481 print_text.append('Bucket: %s' % bucket)
482 master = None
483 if bucket.startswith(MASTER_PREFIX):
484 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000485 for builder, tests in sorted(builders_and_tests.iteritems()):
486 print_text.append(' %s: %s' % (builder, tests))
487 parameters = {
488 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000489 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100490 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000491 'revision': options.revision,
492 }],
tandrii8c5a3532016-11-04 07:52:02 -0700493 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000494 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000495 if 'presubmit' in builder.lower():
496 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000497 if tests:
498 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700499
500 tags = [
501 'builder:%s' % builder,
502 'buildset:%s' % buildset,
503 'user_agent:git_cl_try',
504 ]
505 if master:
506 parameters['properties']['master'] = master
507 tags.append('master:%s' % master)
508
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509 batch_req_body['builds'].append(
510 {
511 'bucket': bucket,
512 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000513 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700514 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000515 }
516 )
517
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 _buildbucket_retry(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000519 'triggering tryjobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000520 http,
521 buildbucket_put_url,
522 'PUT',
523 body=json.dumps(batch_req_body),
524 headers={'Content-Type': 'application/json'}
525 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000526 print_text.append('To see results here, run: git cl try-results')
527 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700528 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000529
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000530
tandrii221ab252016-10-06 08:12:04 -0700531def fetch_try_jobs(auth_config, changelist, buildbucket_host,
532 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000533 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
qyearsley53f48a12016-09-01 10:45:13 -0700535 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536 """
tandrii221ab252016-10-06 08:12:04 -0700537 assert buildbucket_host
538 assert changelist.GetIssue(), 'CL must be uploaded first'
539 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
540 patchset = patchset or changelist.GetMostRecentPatchset()
541 assert patchset, 'CL must be uploaded first'
542
543 codereview_url = changelist.GetCodereviewServer()
544 codereview_host = urlparse.urlparse(codereview_url).hostname
545 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 if authenticator.has_cached_credentials():
547 http = authenticator.authorize(httplib2.Http())
548 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700549 print('Warning: Some results might be missing because %s' %
550 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700551 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 http = httplib2.Http()
553
554 http.force_exception_to_status_code = True
555
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000556 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700557 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700559 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 params = {'tag': 'buildset:%s' % buildset}
561
562 builds = {}
563 while True:
564 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700565 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000567 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 for build in content.get('builds', []):
569 builds[build['id']] = build
570 if 'next_cursor' in content:
571 params['start_cursor'] = content['next_cursor']
572 else:
573 break
574 return builds
575
576
qyearsleyeab3c042016-08-24 09:18:28 -0700577def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000578 """Prints nicely result of fetch_try_jobs."""
579 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000580 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 return
582
583 # Make a copy, because we'll be modifying builds dictionary.
584 builds = builds.copy()
585 builder_names_cache = {}
586
587 def get_builder(b):
588 try:
589 return builder_names_cache[b['id']]
590 except KeyError:
591 try:
592 parameters = json.loads(b['parameters_json'])
593 name = parameters['builder_name']
594 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700595 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700596 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597 name = None
598 builder_names_cache[b['id']] = name
599 return name
600
601 def get_bucket(b):
602 bucket = b['bucket']
603 if bucket.startswith('master.'):
604 return bucket[len('master.'):]
605 return bucket
606
607 if options.print_master:
608 name_fmt = '%%-%ds %%-%ds' % (
609 max(len(str(get_bucket(b))) for b in builds.itervalues()),
610 max(len(str(get_builder(b))) for b in builds.itervalues()))
611 def get_name(b):
612 return name_fmt % (get_bucket(b), get_builder(b))
613 else:
614 name_fmt = '%%-%ds' % (
615 max(len(str(get_builder(b))) for b in builds.itervalues()))
616 def get_name(b):
617 return name_fmt % get_builder(b)
618
619 def sort_key(b):
620 return b['status'], b.get('result'), get_name(b), b.get('url')
621
622 def pop(title, f, color=None, **kwargs):
623 """Pop matching builds from `builds` dict and print them."""
624
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000625 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000626 colorize = str
627 else:
628 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
629
630 result = []
631 for b in builds.values():
632 if all(b.get(k) == v for k, v in kwargs.iteritems()):
633 builds.pop(b['id'])
634 result.append(b)
635 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700636 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700638 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639
640 total = len(builds)
641 pop(status='COMPLETED', result='SUCCESS',
642 title='Successes:', color=Fore.GREEN,
643 f=lambda b: (get_name(b), b.get('url')))
644 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
645 title='Infra Failures:', color=Fore.MAGENTA,
646 f=lambda b: (get_name(b), b.get('url')))
647 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
648 title='Failures:', color=Fore.RED,
649 f=lambda b: (get_name(b), b.get('url')))
650 pop(status='COMPLETED', result='CANCELED',
651 title='Canceled:', color=Fore.MAGENTA,
652 f=lambda b: (get_name(b),))
653 pop(status='COMPLETED', result='FAILURE',
654 failure_reason='INVALID_BUILD_DEFINITION',
655 title='Wrong master/builder name:', color=Fore.MAGENTA,
656 f=lambda b: (get_name(b),))
657 pop(status='COMPLETED', result='FAILURE',
658 title='Other failures:',
659 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
660 pop(status='COMPLETED',
661 title='Other finished:',
662 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
663 pop(status='STARTED',
664 title='Started:', color=Fore.YELLOW,
665 f=lambda b: (get_name(b), b.get('url')))
666 pop(status='SCHEDULED',
667 title='Scheduled:',
668 f=lambda b: (get_name(b), 'id=%s' % b['id']))
669 # The last section is just in case buildbucket API changes OR there is a bug.
670 pop(title='Other:',
671 f=lambda b: (get_name(b), 'id=%s' % b['id']))
672 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000673 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676def _ComputeDiffLineRanges(files, upstream_commit):
677 """Gets the changed line ranges for each file since upstream_commit.
678
679 Parses a git diff on provided files and returns a dict that maps a file name
680 to an ordered list of range tuples in the form (start_line, count).
681 Ranges are in the same format as a git diff.
682 """
683 # If files is empty then diff_output will be a full diff.
684 if len(files) == 0:
685 return {}
686
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000687 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
689 diff_output = RunGit(diff_cmd)
690
691 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
692 # 2 capture groups
693 # 0 == fname of diff file
694 # 1 == 'diff_start,diff_count' or 'diff_start'
695 # will match each of
696 # diff --git a/foo.foo b/foo.py
697 # @@ -12,2 +14,3 @@
698 # @@ -12,2 +17 @@
699 # running re.findall on the above string with pattern will give
700 # [('foo.py', ''), ('', '14,3'), ('', '17')]
701
702 curr_file = None
703 line_diffs = {}
704 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
705 if match[0] != '':
706 # Will match the second filename in diff --git a/a.py b/b.py.
707 curr_file = match[0]
708 line_diffs[curr_file] = []
709 else:
710 # Matches +14,3
711 if ',' in match[1]:
712 diff_start, diff_count = match[1].split(',')
713 else:
714 # Single line changes are of the form +12 instead of +12,1.
715 diff_start = match[1]
716 diff_count = 1
717
718 diff_start = int(diff_start)
719 diff_count = int(diff_count)
720
721 # If diff_count == 0 this is a removal we can ignore.
722 line_diffs[curr_file].append((diff_start, diff_count))
723
724 return line_diffs
725
726
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000727def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000728 """Checks if a yapf file is in any parent directory of fpath until top_dir.
729
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000730 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000731 is found returns None. Uses yapf_config_cache as a cache for previously found
732 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000733 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000734 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000735 # Return result if we've already computed it.
736 if fpath in yapf_config_cache:
737 return yapf_config_cache[fpath]
738
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739 parent_dir = os.path.dirname(fpath)
740 if os.path.isfile(fpath):
741 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000742 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743 # Otherwise fpath is a directory
744 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
745 if os.path.isfile(yapf_file):
746 ret = yapf_file
747 elif fpath == top_dir or parent_dir == fpath:
748 # If we're at the top level directory, or if we're at root
749 # there is no provided style.
750 ret = None
751 else:
752 # Otherwise recurse on the current directory.
753 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000754 yapf_config_cache[fpath] = ret
755 return ret
756
757
qyearsley53f48a12016-09-01 10:45:13 -0700758def write_try_results_json(output_file, builds):
759 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
760
761 The input |builds| dict is assumed to be generated by Buildbucket.
762 Buildbucket documentation: http://goo.gl/G0s101
763 """
764
765 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800766 """Extracts some of the information from one build dict."""
767 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700768 return {
769 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700770 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800771 'builder_name': parameters.get('builder_name'),
772 'created_ts': build.get('created_ts'),
773 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700774 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800775 'result': build.get('result'),
776 'status': build.get('status'),
777 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700778 'url': build.get('url'),
779 }
780
781 converted = []
782 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000783 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700784 write_json(output_file, converted)
785
786
Aaron Gable13101a62018-02-09 13:20:41 -0800787def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000788 """Prints statistics about the change to the user."""
789 # --no-ext-diff is broken in some versions of Git, so try to work around
790 # this by overriding the environment (but there is still a problem if the
791 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000792 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000793 if 'GIT_EXTERNAL_DIFF' in env:
794 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000795
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000796 try:
797 stdout = sys.stdout.fileno()
798 except AttributeError:
799 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000800 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800801 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000802 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000803
804
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000805class BuildbucketResponseException(Exception):
806 pass
807
808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809class Settings(object):
810 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000812 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813 self.tree_status_url = None
814 self.viewvc_url = None
815 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000816 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000817 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000818 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000819 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000820
821 def LazyUpdateIfNeeded(self):
822 """Updates the settings from a codereview.settings file, if available."""
823 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000824 # The only value that actually changes the behavior is
825 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000826 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000827 error_ok=True
828 ).strip().lower()
829
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000830 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000831 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832 LoadCodereviewSettingsFromFile(cr_settings_file)
833 self.updated = True
834
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000835 @staticmethod
836 def GetRelativeRoot():
837 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000840 if self.root is None:
841 self.root = os.path.abspath(self.GetRelativeRoot())
842 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000843
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 def GetTreeStatusUrl(self, error_ok=False):
845 if not self.tree_status_url:
846 error_message = ('You must configure your tree status URL by running '
847 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000848 self.tree_status_url = self._GetConfig(
849 'rietveld.tree-status-url', error_ok=error_ok,
850 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000851 return self.tree_status_url
852
853 def GetViewVCUrl(self):
854 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000855 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 return self.viewvc_url
857
rmistry@google.com90752582014-01-14 21:04:50 +0000858 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000859 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000860
rmistry@google.com5626a922015-02-26 14:03:30 +0000861 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000862 run_post_upload_hook = self._GetConfig(
863 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000864 return run_post_upload_hook == "True"
865
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000866 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000867 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000868
ukai@chromium.orge8077812012-02-03 03:41:46 +0000869 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000870 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000871 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700872 self.is_gerrit = (
873 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000874 return self.is_gerrit
875
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000876 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000877 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000878 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700879 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
880 if self.squash_gerrit_uploads is None:
881 # Default is squash now (http://crbug.com/611892#c23).
882 self.squash_gerrit_uploads = not (
883 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
884 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000885 return self.squash_gerrit_uploads
886
tandriia60502f2016-06-20 02:01:53 -0700887 def GetSquashGerritUploadsOverride(self):
888 """Return True or False if codereview.settings should be overridden.
889
890 Returns None if no override has been defined.
891 """
892 # See also http://crbug.com/611892#c23
893 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
894 error_ok=True).strip()
895 if result == 'true':
896 return True
897 if result == 'false':
898 return False
899 return None
900
tandrii@chromium.org28253532016-04-14 13:46:56 +0000901 def GetGerritSkipEnsureAuthenticated(self):
902 """Return True if EnsureAuthenticated should not be done for Gerrit
903 uploads."""
904 if self.gerrit_skip_ensure_authenticated is None:
905 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000906 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000907 error_ok=True).strip() == 'true')
908 return self.gerrit_skip_ensure_authenticated
909
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000910 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000911 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000912 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000913 # Git requires single quotes for paths with spaces. We need to replace
914 # them with double quotes for Windows to treat such paths as a single
915 # path.
916 self.git_editor = self._GetConfig(
917 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000918 return self.git_editor or None
919
thestig@chromium.org44202a22014-03-11 19:22:18 +0000920 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000921 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000922 DEFAULT_LINT_REGEX)
923
924 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000925 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000926 DEFAULT_LINT_IGNORE_REGEX)
927
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000928 def _GetConfig(self, param, **kwargs):
929 self.LazyUpdateIfNeeded()
930 return RunGit(['config', param], **kwargs).strip()
931
932
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100933@contextlib.contextmanager
934def _get_gerrit_project_config_file(remote_url):
935 """Context manager to fetch and store Gerrit's project.config from
936 refs/meta/config branch and store it in temp file.
937
938 Provides a temporary filename or None if there was error.
939 """
940 error, _ = RunGitWithCode([
941 'fetch', remote_url,
942 '+refs/meta/config:refs/git_cl/meta/config'])
943 if error:
944 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700945 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100946 (remote_url, error))
947 yield None
948 return
949
950 error, project_config_data = RunGitWithCode(
951 ['show', 'refs/git_cl/meta/config:project.config'])
952 if error:
953 print('WARNING: project.config file not found')
954 yield None
955 return
956
957 with gclient_utils.temporary_directory() as tempdir:
958 project_config_file = os.path.join(tempdir, 'project.config')
959 gclient_utils.FileWrite(project_config_file, project_config_data)
960 yield project_config_file
961
962
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000963def ShortBranchName(branch):
964 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000965 return branch.replace('refs/heads/', '', 1)
966
967
968def GetCurrentBranchRef():
969 """Returns branch ref (e.g., refs/heads/master) or None."""
970 return RunGit(['symbolic-ref', 'HEAD'],
971 stderr=subprocess2.VOID, error_ok=True).strip() or None
972
973
974def GetCurrentBranch():
975 """Returns current branch or None.
976
977 For refs/heads/* branches, returns just last part. For others, full ref.
978 """
979 branchref = GetCurrentBranchRef()
980 if branchref:
981 return ShortBranchName(branchref)
982 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000983
984
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000985class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000986 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000987 NONE = 'none'
988 DRY_RUN = 'dry_run'
989 COMMIT = 'commit'
990
991 ALL_STATES = [NONE, DRY_RUN, COMMIT]
992
993
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000994class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000995 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000996 self.issue = issue
997 self.patchset = patchset
998 self.hostname = hostname
999
1000 @property
1001 def valid(self):
1002 return self.issue is not None
1003
1004
Edward Lemurf38bc172019-09-03 21:02:13 +00001005def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001006 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1007 fail_result = _ParsedIssueNumberArgument()
1008
1009 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
Andrii Shyshkalov0a264d82018-11-21 00:36:16 +00001020 return _GerritChangelistImpl.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001021
1022
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001023def _create_description_from_log(args):
1024 """Pulls out the commit log to use as a base for the CL description."""
1025 log_args = []
1026 if len(args) == 1 and not args[0].endswith('.'):
1027 log_args = [args[0] + '..']
1028 elif len(args) == 1 and args[0].endswith('...'):
1029 log_args = [args[0][:-1]]
1030 elif len(args) == 2:
1031 log_args = [args[0] + '..' + args[1]]
1032 else:
1033 log_args = args[:] # Hope for the best!
1034 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1035
1036
Aaron Gablea45ee112016-11-22 15:14:38 -08001037class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001038 def __init__(self, issue, url):
1039 self.issue = issue
1040 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001041 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001042
1043 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001044 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001045 self.issue, self.url)
1046
1047
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001048_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001049 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001050 # TODO(tandrii): these two aren't known in Gerrit.
1051 'approval', 'disapproval'])
1052
1053
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001054class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001055 """Changelist works with one changelist in local branch.
1056
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001057 Notes:
1058 * Not safe for concurrent multi-{thread,process} use.
1059 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001060 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001061 """
1062
Edward Lemurf38bc172019-09-03 21:02:13 +00001063 def __init__(self, branchref=None, issue=None, **kwargs):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001064 """Create a new ChangeList instance.
1065
Edward Lemurf38bc172019-09-03 21:02:13 +00001066 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001067 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001068 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001069 global settings
1070 if not settings:
1071 # Happens when git_cl.py is used as a utility library.
1072 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001073
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001074 self.branchref = branchref
1075 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001076 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001077 self.branch = ShortBranchName(self.branchref)
1078 else:
1079 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001081 self.lookedup_issue = False
1082 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001083 self.has_description = False
1084 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001085 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001086 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001087 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001088 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001089 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001090 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001091
Edward Lemurf38bc172019-09-03 21:02:13 +00001092 self._codereview_impl = _GerritChangelistImpl(self, **kwargs)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001093
1094 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001095 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001096
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001097 The return value is a string suitable for passing to git cl with the --cc
1098 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001099 """
1100 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001101 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001102 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001103 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1104 return self.cc
1105
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001106 def GetCCListWithoutDefault(self):
1107 """Return the users cc'd on this CL excluding default ones."""
1108 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001109 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001110 return self.cc
1111
Daniel Cheng7227d212017-11-17 08:12:37 -08001112 def ExtendCC(self, more_cc):
1113 """Extends the list of users to cc on this CL based on the changed files."""
1114 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115
1116 def GetBranch(self):
1117 """Returns the short branch name, e.g. 'master'."""
1118 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001119 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001120 if not branchref:
1121 return None
1122 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 self.branch = ShortBranchName(self.branchref)
1124 return self.branch
1125
1126 def GetBranchRef(self):
1127 """Returns the full branch name, e.g. 'refs/heads/master'."""
1128 self.GetBranch() # Poke the lazy loader.
1129 return self.branchref
1130
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001131 def ClearBranch(self):
1132 """Clears cached branch data of this object."""
1133 self.branch = self.branchref = None
1134
tandrii5d48c322016-08-18 16:19:37 -07001135 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1136 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1137 kwargs['branch'] = self.GetBranch()
1138 return _git_get_branch_config_value(key, default, **kwargs)
1139
1140 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1141 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1142 assert self.GetBranch(), (
1143 'this CL must have an associated branch to %sset %s%s' %
1144 ('un' if value is None else '',
1145 key,
1146 '' if value is None else ' to %r' % value))
1147 kwargs['branch'] = self.GetBranch()
1148 return _git_set_branch_config_value(key, value, **kwargs)
1149
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 @staticmethod
1151 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001152 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 e.g. 'origin', 'refs/heads/master'
1154 """
1155 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001156 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1157
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001159 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001161 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1162 error_ok=True).strip()
1163 if upstream_branch:
1164 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001165 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001166 # Else, try to guess the origin remote.
1167 remote_branches = RunGit(['branch', '-r']).split()
1168 if 'origin/master' in remote_branches:
1169 # Fall back on origin/master if it exits.
1170 remote = 'origin'
1171 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001173 DieWithError(
1174 'Unable to determine default branch to diff against.\n'
1175 'Either pass complete "git diff"-style arguments, like\n'
1176 ' git cl upload origin/master\n'
1177 'or verify this branch is set up to track another \n'
1178 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001179
1180 return remote, upstream_branch
1181
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001182 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001183 upstream_branch = self.GetUpstreamBranch()
1184 if not BranchExists(upstream_branch):
1185 DieWithError('The upstream for the current branch (%s) does not exist '
1186 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001187 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001188 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001189
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001190 def GetUpstreamBranch(self):
1191 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001192 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001193 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001194 upstream_branch = upstream_branch.replace('refs/heads/',
1195 'refs/remotes/%s/' % remote)
1196 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1197 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198 self.upstream_branch = upstream_branch
1199 return self.upstream_branch
1200
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001201 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001202 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001203 remote, branch = None, self.GetBranch()
1204 seen_branches = set()
1205 while branch not in seen_branches:
1206 seen_branches.add(branch)
1207 remote, branch = self.FetchUpstreamTuple(branch)
1208 branch = ShortBranchName(branch)
1209 if remote != '.' or branch.startswith('refs/remotes'):
1210 break
1211 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001212 remotes = RunGit(['remote'], error_ok=True).split()
1213 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001214 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001215 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001216 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001217 logging.warn('Could not determine which remote this change is '
1218 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001219 else:
1220 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001221 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001222 branch = 'HEAD'
1223 if branch.startswith('refs/remotes'):
1224 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001225 elif branch.startswith('refs/branch-heads/'):
1226 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001227 else:
1228 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001229 return self._remote
1230
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001231 def GitSanityChecks(self, upstream_git_obj):
1232 """Checks git repo status and ensures diff is from local commits."""
1233
sbc@chromium.org79706062015-01-14 21:18:12 +00001234 if upstream_git_obj is None:
1235 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001236 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001237 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001238 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001239 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001240 return False
1241
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001242 # Verify the commit we're diffing against is in our current branch.
1243 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1244 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1245 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001246 print('ERROR: %s is not in the current branch. You may need to rebase '
1247 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001248 return False
1249
1250 # List the commits inside the diff, and verify they are all local.
1251 commits_in_diff = RunGit(
1252 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1253 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1254 remote_branch = remote_branch.strip()
1255 if code != 0:
1256 _, remote_branch = self.GetRemoteBranch()
1257
1258 commits_in_remote = RunGit(
1259 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1260
1261 common_commits = set(commits_in_diff) & set(commits_in_remote)
1262 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001263 print('ERROR: Your diff contains %d commits already in %s.\n'
1264 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1265 'the diff. If you are using a custom git flow, you can override'
1266 ' the reference used for this check with "git config '
1267 'gitcl.remotebranch <git-ref>".' % (
1268 len(common_commits), remote_branch, upstream_git_obj),
1269 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 return False
1271 return True
1272
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001273 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001274 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001275
1276 Returns None if it is not set.
1277 """
tandrii5d48c322016-08-18 16:19:37 -07001278 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001279
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 def GetRemoteUrl(self):
1281 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1282
1283 Returns None if there is no remote.
1284 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001285 is_cached, value = self._cached_remote_url
1286 if is_cached:
1287 return value
1288
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001289 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001290 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1291
Edward Lemur298f2cf2019-02-22 21:40:39 +00001292 # Check if the remote url can be parsed as an URL.
1293 host = urlparse.urlparse(url).netloc
1294 if host:
1295 self._cached_remote_url = (True, url)
1296 return url
1297
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001298 # If it cannot be parsed as an url, assume it is a local directory,
1299 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001300 logging.warning('"%s" doesn\'t appear to point to a git host. '
1301 'Interpreting it as a local directory.', url)
1302 if not os.path.isdir(url):
1303 logging.error(
1304 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
1305 remote, url, self.GetBranch())
1306 return None
1307
1308 cache_path = url
1309 url = RunGit(['config', 'remote.%s.url' % remote],
1310 error_ok=True,
1311 cwd=url).strip()
1312
1313 host = urlparse.urlparse(url).netloc
1314 if not host:
1315 logging.error(
1316 'Remote "%(remote)s" for branch "%(branch)s" points to '
1317 '"%(cache_path)s", but it is misconfigured.\n'
1318 '"%(cache_path)s" must be a git repo and must have a remote named '
1319 '"%(remote)s" pointing to the git host.', {
1320 'remote': remote,
1321 'cache_path': cache_path,
1322 'branch': self.GetBranch()})
1323 return None
1324
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001325 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001326 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001327
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001328 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001329 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001330 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001331 self.issue = self._GitGetBranchConfigValue(
1332 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001333 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001334 return self.issue
1335
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001336 def GetIssueURL(self):
1337 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001338 issue = self.GetIssue()
1339 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001340 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001341 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001343 def GetDescription(self, pretty=False, force=False):
1344 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001346 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001347 self.has_description = True
1348 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001349 # Set width to 72 columns + 2 space indent.
1350 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001351 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001352 lines = self.description.splitlines()
1353 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001354 return self.description
1355
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001356 def GetDescriptionFooters(self):
1357 """Returns (non_footer_lines, footers) for the commit message.
1358
1359 Returns:
1360 non_footer_lines (list(str)) - Simple list of description lines without
1361 any footer. The lines do not contain newlines, nor does the list contain
1362 the empty line between the message and the footers.
1363 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1364 [("Change-Id", "Ideadbeef...."), ...]
1365 """
1366 raw_description = self.GetDescription()
1367 msg_lines, _, footers = git_footers.split_footers(raw_description)
1368 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001369 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001370 return msg_lines, footers
1371
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001372 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001373 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001374 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001375 self.patchset = self._GitGetBranchConfigValue(
1376 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001377 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001378 return self.patchset
1379
1380 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001381 """Set this branch's patchset. If patchset=0, clears the patchset."""
1382 assert self.GetBranch()
1383 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001384 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001385 else:
1386 self.patchset = int(patchset)
1387 self._GitSetBranchConfigValue(
1388 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001389
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001390 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001391 """Set this branch's issue. If issue isn't given, clears the issue."""
1392 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001394 issue = int(issue)
1395 self._GitSetBranchConfigValue(
1396 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001397 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001398 codereview_server = self._codereview_impl.GetCodereviewServer()
1399 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001400 self._GitSetBranchConfigValue(
1401 self._codereview_impl.CodereviewServerConfigKey(),
1402 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 else:
tandrii5d48c322016-08-18 16:19:37 -07001404 # Reset all of these just to be clean.
1405 reset_suffixes = [
1406 'last-upload-hash',
1407 self._codereview_impl.IssueConfigKey(),
1408 self._codereview_impl.PatchsetConfigKey(),
1409 self._codereview_impl.CodereviewServerConfigKey(),
1410 ] + self._PostUnsetIssueProperties()
1411 for prop in reset_suffixes:
1412 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001413 msg = RunGit(['log', '-1', '--format=%B']).strip()
1414 if msg and git_footers.get_footer_change_id(msg):
1415 print('WARNING: The change patched into this branch has a Change-Id. '
1416 'Removing it.')
1417 RunGit(['commit', '--amend', '-m',
1418 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001419 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001420 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001421 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422
dnjba1b0f32016-09-02 12:37:42 -07001423 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001424 if not self.GitSanityChecks(upstream_branch):
1425 DieWithError('\nGit sanity check failure')
1426
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001427 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001428 if not root:
1429 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001430 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001431
1432 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001433 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001434 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001435 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001436 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001437 except subprocess2.CalledProcessError:
1438 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001439 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001440 'This branch probably doesn\'t exist anymore. To reset the\n'
1441 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001442 ' git branch --set-upstream-to origin/master %s\n'
1443 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001444 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001445
maruel@chromium.org52424302012-08-29 15:14:30 +00001446 issue = self.GetIssue()
1447 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001448 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001449 description = self.GetDescription()
1450 else:
1451 # If the change was never uploaded, use the log messages of all commits
1452 # up to the branch point, as git cl upload will prefill the description
1453 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001454 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1455 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001456
1457 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001458 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001459 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001460 name,
1461 description,
1462 absroot,
1463 files,
1464 issue,
1465 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001466 author,
1467 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001468
dsansomee2d6fd92016-09-08 00:10:47 -07001469 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001470 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001471 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001472 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001473
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001474 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1475 """Sets the description for this CL remotely.
1476
1477 You can get description_lines and footers with GetDescriptionFooters.
1478
1479 Args:
1480 description_lines (list(str)) - List of CL description lines without
1481 newline characters.
1482 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1483 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1484 `List-Of-Tokens`). It will be case-normalized so that each token is
1485 title-cased.
1486 """
1487 new_description = '\n'.join(description_lines)
1488 if footers:
1489 new_description += '\n'
1490 for k, v in footers:
1491 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1492 if not git_footers.FOOTER_PATTERN.match(foot):
1493 raise ValueError('Invalid footer %r' % foot)
1494 new_description += foot + '\n'
1495 self.UpdateDescription(new_description, force)
1496
Edward Lesmes8e282792018-04-03 18:50:29 -04001497 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001498 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1499 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001500 start = time_time()
1501 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001502 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1503 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001504 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1505 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001506 metrics.collector.add_repeated('sub_commands', {
1507 'command': 'presubmit',
1508 'execution_time': time_time() - start,
1509 'exit_code': 0 if result.should_continue() else 1,
1510 })
1511 return result
vapierfd77ac72016-06-16 08:33:57 -07001512 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001513 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001514
Edward Lemurf38bc172019-09-03 21:02:13 +00001515 def CMDPatchIssue(self, issue_arg, nocommit):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001516 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001517 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1518 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001519 else:
1520 # Assume url.
1521 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1522 urlparse.urlparse(issue_arg))
1523 if not parsed_issue_arg or not parsed_issue_arg.valid:
1524 DieWithError('Failed to parse issue argument "%s". '
1525 'Must be an issue number or a valid URL.' % issue_arg)
1526 return self._codereview_impl.CMDPatchWithParsedIssue(
Edward Lemurf38bc172019-09-03 21:02:13 +00001527 parsed_issue_arg, nocommit, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001528
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529 def CMDUpload(self, options, git_diff_args, orig_args):
1530 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001531 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001533 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001534 else:
1535 if self.GetBranch() is None:
1536 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1537
1538 # Default to diffing against common ancestor of upstream branch
1539 base_branch = self.GetCommonAncestorWithUpstream()
1540 git_diff_args = [base_branch, 'HEAD']
1541
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001542 # Fast best-effort checks to abort before running potentially expensive
1543 # hooks if uploading is likely to fail anyway. Passing these checks does
1544 # not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001545 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001546 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547
1548 # Apply watchlists on upload.
1549 change = self.GetChange(base_branch, None)
1550 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1551 files = [f.LocalPath() for f in change.AffectedFiles()]
1552 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001553 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001554
1555 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001556 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 # Set the reviewer list now so that presubmit checks can access it.
1558 change_description = ChangeDescription(change.FullDescriptionText())
1559 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001560 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001561 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 change)
1563 change.SetDescriptionText(change_description.description)
1564 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001565 may_prompt=not options.force,
1566 verbose=options.verbose,
1567 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568 if not hook_results.should_continue():
1569 return 1
1570 if not options.reviewers and hook_results.reviewers:
1571 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001572 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573
Aaron Gable13101a62018-02-09 13:20:41 -08001574 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001575 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001577 _git_set_branch_config_value('last-upload-hash',
1578 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 # Run post upload hooks, if specified.
1580 if settings.GetRunPostUploadHook():
1581 presubmit_support.DoPostUploadExecuter(
1582 change,
1583 self,
1584 settings.GetRoot(),
1585 options.verbose,
1586 sys.stdout)
1587
1588 # Upload all dependencies if specified.
1589 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001590 print()
1591 print('--dependencies has been specified.')
1592 print('All dependent local branches will be re-uploaded.')
1593 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594 # Remove the dependencies flag from args so that we do not end up in a
1595 # loop.
1596 orig_args.remove('--dependencies')
1597 ret = upload_branch_deps(self, orig_args)
1598 return ret
1599
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001600 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001601 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001602
1603 Issue must have been already uploaded and known.
1604 """
1605 assert new_state in _CQState.ALL_STATES
1606 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001607 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001608 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001609 return 0
1610 except KeyboardInterrupt:
1611 raise
1612 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001613 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001614 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001615 ' * Your project has no CQ,\n'
1616 ' * You don\'t have permission to change the CQ state,\n'
1617 ' * There\'s a bug in this code (see stack trace below).\n'
1618 'Consider specifying which bots to trigger manually or asking your '
1619 'project owners for permissions or contacting Chrome Infra at:\n'
1620 'https://www.chromium.org/infra\n\n' %
1621 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001622 # Still raise exception so that stack trace is printed.
1623 raise
1624
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001625 # Forward methods to codereview specific implementation.
1626
Aaron Gable636b13f2017-07-14 10:42:48 -07001627 def AddComment(self, message, publish=None):
1628 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001629
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001630 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001631 """Returns list of _CommentSummary for each comment.
1632
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001633 args:
1634 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001635 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001636 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001637
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001638 def CloseIssue(self):
1639 return self._codereview_impl.CloseIssue()
1640
1641 def GetStatus(self):
1642 return self._codereview_impl.GetStatus()
1643
1644 def GetCodereviewServer(self):
1645 return self._codereview_impl.GetCodereviewServer()
1646
tandriide281ae2016-10-12 06:02:30 -07001647 def GetIssueOwner(self):
1648 """Get owner from codereview, which may differ from this checkout."""
1649 return self._codereview_impl.GetIssueOwner()
1650
Edward Lemur707d70b2018-02-07 00:50:14 +01001651 def GetReviewers(self):
1652 return self._codereview_impl.GetReviewers()
1653
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001654 def GetMostRecentPatchset(self):
1655 return self._codereview_impl.GetMostRecentPatchset()
1656
tandriide281ae2016-10-12 06:02:30 -07001657 def CannotTriggerTryJobReason(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001658 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001659 return self._codereview_impl.CannotTriggerTryJobReason()
1660
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001661 def GetTryJobProperties(self, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001662 """Returns dictionary of properties to launch tryjob."""
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001663 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001664
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001665 def __getattr__(self, attr):
1666 # This is because lots of untested code accesses Rietveld-specific stuff
1667 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001668 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001669 # Note that child method defines __getattr__ as well, and forwards it here,
1670 # because _RietveldChangelistImpl is not cleaned up yet, and given
1671 # deprecation of Rietveld, it should probably be just removed.
1672 # Until that time, avoid infinite recursion by bypassing __getattr__
1673 # of implementation class.
1674 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675
1676
1677class _ChangelistCodereviewBase(object):
1678 """Abstract base class encapsulating codereview specifics of a changelist."""
1679 def __init__(self, changelist):
1680 self._changelist = changelist # instance of Changelist
1681
1682 def __getattr__(self, attr):
1683 # Forward methods to changelist.
1684 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1685 # _RietveldChangelistImpl to avoid this hack?
1686 return getattr(self._changelist, attr)
1687
1688 def GetStatus(self):
1689 """Apply a rough heuristic to give a simple summary of an issue's review
1690 or CQ status, assuming adherence to a common workflow.
1691
1692 Returns None if no issue for this branch, or specific string keywords.
1693 """
1694 raise NotImplementedError()
1695
1696 def GetCodereviewServer(self):
1697 """Returns server URL without end slash, like "https://codereview.com"."""
1698 raise NotImplementedError()
1699
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001700 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001701 """Fetches and returns description from the codereview server."""
1702 raise NotImplementedError()
1703
tandrii5d48c322016-08-18 16:19:37 -07001704 @classmethod
1705 def IssueConfigKey(cls):
1706 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001707 raise NotImplementedError()
1708
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001709 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001710 def PatchsetConfigKey(cls):
1711 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001712 raise NotImplementedError()
1713
tandrii5d48c322016-08-18 16:19:37 -07001714 @classmethod
1715 def CodereviewServerConfigKey(cls):
1716 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001717 raise NotImplementedError()
1718
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001719 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001720 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001721 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001722
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001723 def GetGerritObjForPresubmit(self):
1724 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1725 return None
1726
dsansomee2d6fd92016-09-08 00:10:47 -07001727 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001728 """Update the description on codereview site."""
1729 raise NotImplementedError()
1730
Aaron Gable636b13f2017-07-14 10:42:48 -07001731 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001732 """Posts a comment to the codereview site."""
1733 raise NotImplementedError()
1734
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001735 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001736 raise NotImplementedError()
1737
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738 def CloseIssue(self):
1739 """Closes the issue."""
1740 raise NotImplementedError()
1741
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001742 def GetMostRecentPatchset(self):
1743 """Returns the most recent patchset number from the codereview site."""
1744 raise NotImplementedError()
1745
Edward Lemurf38bc172019-09-03 21:02:13 +00001746 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001747 """Fetches and applies the issue.
1748
1749 Arguments:
1750 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
Edward Lemurf38bc172019-09-03 21:02:13 +00001751 nocommit: do not commit the patch, thus leave the tree dirty.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001752 """
1753 raise NotImplementedError()
1754
1755 @staticmethod
1756 def ParseIssueURL(parsed_url):
1757 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1758 failed."""
1759 raise NotImplementedError()
1760
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001761 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001762 """Best effort check that user is authenticated with codereview server.
1763
1764 Arguments:
1765 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001766 refresh: whether to attempt to refresh credentials. Ignored if not
1767 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001768 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001769 raise NotImplementedError()
1770
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001771 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001772 """Best effort check that uploading isn't supposed to fail for predictable
1773 reasons.
1774
1775 This method should raise informative exception if uploading shouldn't
1776 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001777
1778 Arguments:
1779 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001780 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001781 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001782
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001783 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001784 """Uploads a change to codereview."""
1785 raise NotImplementedError()
1786
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001787 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001788 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001789
1790 Issue must have been already uploaded and known.
1791 """
1792 raise NotImplementedError()
1793
tandriie113dfd2016-10-11 10:20:12 -07001794 def CannotTriggerTryJobReason(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001795 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001796 raise NotImplementedError()
1797
tandriide281ae2016-10-12 06:02:30 -07001798 def GetIssueOwner(self):
1799 raise NotImplementedError()
1800
Edward Lemur707d70b2018-02-07 00:50:14 +01001801 def GetReviewers(self):
1802 raise NotImplementedError()
1803
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001804 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001805 raise NotImplementedError()
1806
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001808class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001809 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001810 # auth_config is Rietveld thing, kept here to preserve interface only.
1811 super(_GerritChangelistImpl, self).__init__(changelist)
1812 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001813 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001814 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001815 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001816 # Map from change number (issue) to its detail cache.
1817 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001818
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001819 if codereview_host is not None:
1820 assert not codereview_host.startswith('https://'), codereview_host
1821 self._gerrit_host = codereview_host
1822 self._gerrit_server = 'https://%s' % codereview_host
1823
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001824 def _GetGerritHost(self):
1825 # Lazy load of configs.
1826 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001827 if self._gerrit_host and '.' not in self._gerrit_host:
1828 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1829 # This happens for internal stuff http://crbug.com/614312.
1830 parsed = urlparse.urlparse(self.GetRemoteUrl())
1831 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001832 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001833 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001834 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1835 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 return self._gerrit_host
1837
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001838 def _GetGitHost(self):
1839 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001840 remote_url = self.GetRemoteUrl()
1841 if not remote_url:
1842 return None
1843 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001844
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001845 def GetCodereviewServer(self):
1846 if not self._gerrit_server:
1847 # If we're on a branch then get the server potentially associated
1848 # with that branch.
1849 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001850 self._gerrit_server = self._GitGetBranchConfigValue(
1851 self.CodereviewServerConfigKey())
1852 if self._gerrit_server:
1853 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001854 if not self._gerrit_server:
1855 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1856 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001857 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001858 parts[0] = parts[0] + '-review'
1859 self._gerrit_host = '.'.join(parts)
1860 self._gerrit_server = 'https://%s' % self._gerrit_host
1861 return self._gerrit_server
1862
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001863 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001864 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001865 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001866 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001867 logging.warn('can\'t detect Gerrit project.')
1868 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001869 project = urlparse.urlparse(remote_url).path.strip('/')
1870 if project.endswith('.git'):
1871 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001872 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1873 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1874 # gitiles/git-over-https protocol. E.g.,
1875 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1876 # as
1877 # https://chromium.googlesource.com/v8/v8
1878 if project.startswith('a/'):
1879 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001880 return project
1881
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001882 def _GerritChangeIdentifier(self):
1883 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1884
1885 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001886 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001887 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001888 project = self._GetGerritProject()
1889 if project:
1890 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1891 # Fall back on still unique, but less efficient change number.
1892 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001893
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001894 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001895 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001896 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897
tandrii5d48c322016-08-18 16:19:37 -07001898 @classmethod
1899 def PatchsetConfigKey(cls):
1900 return 'gerritpatchset'
1901
1902 @classmethod
1903 def CodereviewServerConfigKey(cls):
1904 return 'gerritserver'
1905
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001906 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001907 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001908 if settings.GetGerritSkipEnsureAuthenticated():
1909 # For projects with unusual authentication schemes.
1910 # See http://crbug.com/603378.
1911 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001912
1913 # Check presence of cookies only if using cookies-based auth method.
1914 cookie_auth = gerrit_util.Authenticator.get()
1915 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001916 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001917
Daniel Chengcf6269b2019-05-18 01:02:12 +00001918 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1919 print('WARNING: Ignoring branch %s with non-https remote %s' %
1920 (self._changelist.branch, self.GetRemoteUrl()))
1921 return
1922
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001923 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001924 self.GetCodereviewServer()
1925 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001926 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001927
1928 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1929 git_auth = cookie_auth.get_auth_header(git_host)
1930 if gerrit_auth and git_auth:
1931 if gerrit_auth == git_auth:
1932 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001933 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001934 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001935 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001936 ' %s\n'
1937 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001938 ' Consider running the following command:\n'
1939 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001940 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001941 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001942 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001943 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001944 cookie_auth.get_new_password_message(git_host)))
1945 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001946 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001947 return
1948 else:
1949 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001950 ([] if gerrit_auth else [self._gerrit_host]) +
1951 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001952 DieWithError('Credentials for the following hosts are required:\n'
1953 ' %s\n'
1954 'These are read from %s (or legacy %s)\n'
1955 '%s' % (
1956 '\n '.join(missing),
1957 cookie_auth.get_gitcookies_path(),
1958 cookie_auth.get_netrc_path(),
1959 cookie_auth.get_new_password_message(git_host)))
1960
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001961 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001962 if not self.GetIssue():
1963 return
1964
1965 # Warm change details cache now to avoid RPCs later, reducing latency for
1966 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001967 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001968 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001969
1970 status = self._GetChangeDetail()['status']
1971 if status in ('MERGED', 'ABANDONED'):
1972 DieWithError('Change %s has been %s, new uploads are not allowed' %
1973 (self.GetIssueURL(),
1974 'submitted' if status == 'MERGED' else 'abandoned'))
1975
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001976 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1977 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1978 # Apparently this check is not very important? Otherwise get_auth_email
1979 # could have been added to other implementations of Authenticator.
1980 cookies_auth = gerrit_util.Authenticator.get()
1981 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001982 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001983
1984 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001985 if self.GetIssueOwner() == cookies_user:
1986 return
1987 logging.debug('change %s owner is %s, cookies user is %s',
1988 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001989 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001990 # so ask what Gerrit thinks of this user.
1991 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1992 if details['email'] == self.GetIssueOwner():
1993 return
1994 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001995 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001996 'as %s.\n'
1997 'Uploading may fail due to lack of permissions.' %
1998 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1999 confirm_or_exit(action='upload')
2000
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002001 def _PostUnsetIssueProperties(self):
2002 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002003 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002004
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002005 def GetGerritObjForPresubmit(self):
2006 return presubmit_support.GerritAccessor(self._GetGerritHost())
2007
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002008 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002009 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002010 or CQ status, assuming adherence to a common workflow.
2011
2012 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002013 * 'error' - error from review tool (including deleted issues)
2014 * 'unsent' - no reviewers added
2015 * 'waiting' - waiting for review
2016 * 'reply' - waiting for uploader to reply to review
2017 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002018 * 'dry-run' - dry-running in the CQ
2019 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002020 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002021 """
2022 if not self.GetIssue():
2023 return None
2024
2025 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002026 data = self._GetChangeDetail([
2027 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002028 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002029 return 'error'
2030
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002031 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002032 return 'closed'
2033
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002034 cq_label = data['labels'].get('Commit-Queue', {})
2035 max_cq_vote = 0
2036 for vote in cq_label.get('all', []):
2037 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2038 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002039 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002040 if max_cq_vote == 1:
2041 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002042
Aaron Gable9ab38c62017-04-06 14:36:33 -07002043 if data['labels'].get('Code-Review', {}).get('approved'):
2044 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002045
2046 if not data.get('reviewers', {}).get('REVIEWER', []):
2047 return 'unsent'
2048
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002049 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002050 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2051 last_message_author = messages.pop().get('author', {})
2052 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002053 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2054 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002055 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002056 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002057 if last_message_author.get('_account_id') == owner:
2058 # Most recent message was by owner.
2059 return 'waiting'
2060 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002061 # Some reply from non-owner.
2062 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002063
2064 # Somehow there are no messages even though there are reviewers.
2065 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002066
2067 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002068 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002069 patchset = data['revisions'][data['current_revision']]['_number']
2070 self.SetPatchset(patchset)
2071 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002072
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002073 def FetchDescription(self, force=False):
2074 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2075 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002076 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00002077 return data['revisions'][current_rev]['commit']['message'].encode(
2078 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002079
dsansomee2d6fd92016-09-08 00:10:47 -07002080 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002081 if gerrit_util.HasPendingChangeEdit(
2082 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002083 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002084 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002085 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002086 'unpublished edit. Either publish the edit in the Gerrit web UI '
2087 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002088
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002089 gerrit_util.DeletePendingChangeEdit(
2090 self._GetGerritHost(), self._GerritChangeIdentifier())
2091 gerrit_util.SetCommitMessage(
2092 self._GetGerritHost(), self._GerritChangeIdentifier(),
2093 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002094
Aaron Gable636b13f2017-07-14 10:42:48 -07002095 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002096 gerrit_util.SetReview(
2097 self._GetGerritHost(), self._GerritChangeIdentifier(),
2098 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002099
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002100 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002101 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002102 # CURRENT_REVISION is included to get the latest patchset so that
2103 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002104 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002105 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2106 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002107 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002108 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002109 robot_file_comments = gerrit_util.GetChangeRobotComments(
2110 self._GetGerritHost(), self._GerritChangeIdentifier())
2111
2112 # Add the robot comments onto the list of comments, but only
2113 # keep those that are from the latest pachset.
2114 latest_patch_set = self.GetMostRecentPatchset()
2115 for path, robot_comments in robot_file_comments.iteritems():
2116 line_comments = file_comments.setdefault(path, [])
2117 line_comments.extend(
2118 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002119
2120 # Build dictionary of file comments for easy access and sorting later.
2121 # {author+date: {path: {patchset: {line: url+message}}}}
2122 comments = collections.defaultdict(
2123 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2124 for path, line_comments in file_comments.iteritems():
2125 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002126 tag = comment.get('tag', '')
2127 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002128 continue
2129 key = (comment['author']['email'], comment['updated'])
2130 if comment.get('side', 'REVISION') == 'PARENT':
2131 patchset = 'Base'
2132 else:
2133 patchset = 'PS%d' % comment['patch_set']
2134 line = comment.get('line', 0)
2135 url = ('https://%s/c/%s/%s/%s#%s%s' %
2136 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2137 'b' if comment.get('side') == 'PARENT' else '',
2138 str(line) if line else ''))
2139 comments[key][path][patchset][line] = (url, comment['message'])
2140
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002141 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002142 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002143 summary = self._BuildCommentSummary(msg, comments, readable)
2144 if summary:
2145 summaries.append(summary)
2146 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002147
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002148 @staticmethod
2149 def _BuildCommentSummary(msg, comments, readable):
2150 key = (msg['author']['email'], msg['date'])
2151 # Don't bother showing autogenerated messages that don't have associated
2152 # file or line comments. this will filter out most autogenerated
2153 # messages, but will keep robot comments like those from Tricium.
2154 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2155 if is_autogenerated and not comments.get(key):
2156 return None
2157 message = msg['message']
2158 # Gerrit spits out nanoseconds.
2159 assert len(msg['date'].split('.')[-1]) == 9
2160 date = datetime.datetime.strptime(msg['date'][:-3],
2161 '%Y-%m-%d %H:%M:%S.%f')
2162 if key in comments:
2163 message += '\n'
2164 for path, patchsets in sorted(comments.get(key, {}).items()):
2165 if readable:
2166 message += '\n%s' % path
2167 for patchset, lines in sorted(patchsets.items()):
2168 for line, (url, content) in sorted(lines.items()):
2169 if line:
2170 line_str = 'Line %d' % line
2171 path_str = '%s:%d:' % (path, line)
2172 else:
2173 line_str = 'File comment'
2174 path_str = '%s:0:' % path
2175 if readable:
2176 message += '\n %s, %s: %s' % (patchset, line_str, url)
2177 message += '\n %s\n' % content
2178 else:
2179 message += '\n%s ' % path_str
2180 message += '\n%s\n' % content
2181
2182 return _CommentSummary(
2183 date=date,
2184 message=message,
2185 sender=msg['author']['email'],
2186 autogenerated=is_autogenerated,
2187 # These could be inferred from the text messages and correlated with
2188 # Code-Review label maximum, however this is not reliable.
2189 # Leaving as is until the need arises.
2190 approval=False,
2191 disapproval=False,
2192 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002193
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002194 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002195 gerrit_util.AbandonChange(
2196 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002197
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002198 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002199 gerrit_util.SubmitChange(
2200 self._GetGerritHost(), self._GerritChangeIdentifier(),
2201 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002202
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002203 def _GetChangeDetail(self, options=None, no_cache=False):
2204 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002205
2206 If fresh data is needed, set no_cache=True which will clear cache and
2207 thus new data will be fetched from Gerrit.
2208 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002209 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002210 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002211
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002212 # Optimization to avoid multiple RPCs:
2213 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2214 'CURRENT_COMMIT' not in options):
2215 options.append('CURRENT_COMMIT')
2216
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002217 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002218 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002219 options = [o.upper() for o in options]
2220
2221 # Check in cache first unless no_cache is True.
2222 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002223 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002224 else:
2225 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002226 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002227 # Assumption: data fetched before with extra options is suitable
2228 # for return for a smaller set of options.
2229 # For example, if we cached data for
2230 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2231 # and request is for options=[CURRENT_REVISION],
2232 # THEN we can return prior cached data.
2233 if options_set.issubset(cached_options_set):
2234 return data
2235
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002236 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002237 data = gerrit_util.GetChangeDetail(
2238 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002239 except gerrit_util.GerritError as e:
2240 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002241 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002242 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002243
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002244 self._detail_cache.setdefault(cache_key, []).append(
2245 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002246 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002247
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002248 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002249 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002250 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002251 data = gerrit_util.GetChangeCommit(
2252 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002253 except gerrit_util.GerritError as e:
2254 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002255 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002256 raise
agable32978d92016-11-01 12:55:02 -07002257 return data
2258
Karen Qian40c19422019-03-13 21:28:29 +00002259 def _IsCqConfigured(self):
2260 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002261 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002262 return False
2263 # TODO(crbug/753213): Remove temporary hack
2264 if ('https://chromium.googlesource.com/chromium/src' ==
2265 self._changelist.GetRemoteUrl() and
2266 detail['branch'].startswith('refs/branch-heads/')):
2267 return False
2268 return True
2269
Olivier Robin75ee7252018-04-13 10:02:56 +02002270 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002271 if git_common.is_dirty_git_tree('land'):
2272 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002273
tandriid60367b2016-06-22 05:25:12 -07002274 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002275 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002276 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002277 'which can test and land changes for you. '
2278 'Are you sure you wish to bypass it?\n',
2279 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002280 differs = True
tandriic4344b52016-08-29 06:04:54 -07002281 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002282 # Note: git diff outputs nothing if there is no diff.
2283 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002284 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002285 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002286 if detail['current_revision'] == last_upload:
2287 differs = False
2288 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002289 print('WARNING: Local branch contents differ from latest uploaded '
2290 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002291 if differs:
2292 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002293 confirm_or_exit(
2294 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2295 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002296 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002297 elif not bypass_hooks:
2298 hook_results = self.RunHook(
2299 committing=True,
2300 may_prompt=not force,
2301 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002302 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2303 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002304 if not hook_results.should_continue():
2305 return 1
2306
2307 self.SubmitIssue(wait_for_merge=True)
2308 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002309 links = self._GetChangeCommit().get('web_links', [])
2310 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002311 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002312 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002313 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002314 return 0
2315
Edward Lemurf38bc172019-09-03 21:02:13 +00002316 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002317 assert parsed_issue_arg.valid
2318
2319 self._changelist.issue = parsed_issue_arg.issue
2320
2321 if parsed_issue_arg.hostname:
2322 self._gerrit_host = parsed_issue_arg.hostname
2323 self._gerrit_server = 'https://%s' % self._gerrit_host
2324
tandriic2405f52016-10-10 08:13:15 -07002325 try:
2326 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002327 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002328 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002329
2330 if not parsed_issue_arg.patchset:
2331 # Use current revision by default.
2332 revision_info = detail['revisions'][detail['current_revision']]
2333 patchset = int(revision_info['_number'])
2334 else:
2335 patchset = parsed_issue_arg.patchset
2336 for revision_info in detail['revisions'].itervalues():
2337 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2338 break
2339 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002340 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002341 (parsed_issue_arg.patchset, self.GetIssue()))
2342
Aaron Gable697a91b2018-01-19 15:20:15 -08002343 remote_url = self._changelist.GetRemoteUrl()
2344 if remote_url.endswith('.git'):
2345 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002346 remote_url = remote_url.rstrip('/')
2347
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002348 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002349 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002350
2351 if remote_url != fetch_info['url']:
2352 DieWithError('Trying to patch a change from %s but this repo appears '
2353 'to be %s.' % (fetch_info['url'], remote_url))
2354
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002355 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002356
Aaron Gable62619a32017-06-16 08:22:09 -07002357 if force:
2358 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2359 print('Checked out commit for change %i patchset %i locally' %
2360 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002361 elif nocommit:
2362 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2363 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002364 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002365 RunGit(['cherry-pick', 'FETCH_HEAD'])
2366 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002367 (parsed_issue_arg.issue, patchset))
2368 print('Note: this created a local commit which does not have '
2369 'the same hash as the one uploaded for review. This will make '
2370 'uploading changes based on top of this branch difficult.\n'
2371 'If you want to do that, use "git cl patch --force" instead.')
2372
Stefan Zagerd08043c2017-10-12 12:07:02 -07002373 if self.GetBranch():
2374 self.SetIssue(parsed_issue_arg.issue)
2375 self.SetPatchset(patchset)
2376 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2377 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2378 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2379 else:
2380 print('WARNING: You are in detached HEAD state.\n'
2381 'The patch has been applied to your checkout, but you will not be '
2382 'able to upload a new patch set to the gerrit issue.\n'
2383 'Try using the \'-b\' option if you would like to work on a '
2384 'branch and/or upload a new patch set.')
2385
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002386 return 0
2387
2388 @staticmethod
2389 def ParseIssueURL(parsed_url):
2390 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2391 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002392 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2393 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002394 # Short urls like https://domain/<issue_number> can be used, but don't allow
2395 # specifying the patchset (you'd 404), but we allow that here.
2396 if parsed_url.path == '/':
2397 part = parsed_url.fragment
2398 else:
2399 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002400 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002401 if match:
2402 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002403 issue=int(match.group(3)),
2404 patchset=int(match.group(5)) if match.group(5) else None,
Edward Lemurf38bc172019-09-03 21:02:13 +00002405 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002406 return None
2407
tandrii16e0b4e2016-06-07 10:34:28 -07002408 def _GerritCommitMsgHookCheck(self, offer_removal):
2409 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2410 if not os.path.exists(hook):
2411 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002412 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2413 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002414 data = gclient_utils.FileRead(hook)
2415 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2416 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002417 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002418 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002419 'and may interfere with it in subtle ways.\n'
2420 'We recommend you remove the commit-msg hook.')
2421 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002422 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002423 gclient_utils.rm_file_or_tree(hook)
2424 print('Gerrit commit-msg hook removed.')
2425 else:
2426 print('OK, will keep Gerrit commit-msg hook in place.')
2427
Edward Lemur1b52d872019-05-09 21:12:12 +00002428 def _CleanUpOldTraces(self):
2429 """Keep only the last |MAX_TRACES| traces."""
2430 try:
2431 traces = sorted([
2432 os.path.join(TRACES_DIR, f)
2433 for f in os.listdir(TRACES_DIR)
2434 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2435 and not f.startswith('tmp'))
2436 ])
2437 traces_to_delete = traces[:-MAX_TRACES]
2438 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002439 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002440 except OSError:
2441 print('WARNING: Failed to remove old git traces from\n'
2442 ' %s'
2443 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002444
Edward Lemur5737f022019-05-17 01:24:00 +00002445 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002446 """Zip and write the git push traces stored in traces_dir."""
2447 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002448 traces_zip = trace_name + '-traces'
2449 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002450 # Create a temporary dir to store git config and gitcookies in. It will be
2451 # compressed and stored next to the traces.
2452 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002453 git_info_zip = trace_name + '-git-info'
2454
Edward Lemur5737f022019-05-17 01:24:00 +00002455 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002456 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002457 git_push_metadata['now'] = git_push_metadata['now'].decode(
2458 sys.stdin.encoding)
2459
Edward Lemur1b52d872019-05-09 21:12:12 +00002460 git_push_metadata['trace_name'] = trace_name
2461 gclient_utils.FileWrite(
2462 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2463
2464 # Keep only the first 6 characters of the git hashes on the packet
2465 # trace. This greatly decreases size after compression.
2466 packet_traces = os.path.join(traces_dir, 'trace-packet')
2467 if os.path.isfile(packet_traces):
2468 contents = gclient_utils.FileRead(packet_traces)
2469 gclient_utils.FileWrite(
2470 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2471 shutil.make_archive(traces_zip, 'zip', traces_dir)
2472
2473 # Collect and compress the git config and gitcookies.
2474 git_config = RunGit(['config', '-l'])
2475 gclient_utils.FileWrite(
2476 os.path.join(git_info_dir, 'git-config'),
2477 git_config)
2478
2479 cookie_auth = gerrit_util.Authenticator.get()
2480 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2481 gitcookies_path = cookie_auth.get_gitcookies_path()
2482 if os.path.isfile(gitcookies_path):
2483 gitcookies = gclient_utils.FileRead(gitcookies_path)
2484 gclient_utils.FileWrite(
2485 os.path.join(git_info_dir, 'gitcookies'),
2486 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2487 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2488
Edward Lemur1b52d872019-05-09 21:12:12 +00002489 gclient_utils.rmtree(git_info_dir)
2490
2491 def _RunGitPushWithTraces(
2492 self, change_desc, refspec, refspec_opts, git_push_metadata):
2493 """Run git push and collect the traces resulting from the execution."""
2494 # Create a temporary directory to store traces in. Traces will be compressed
2495 # and stored in a 'traces' dir inside depot_tools.
2496 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002497 trace_name = os.path.join(
2498 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002499
2500 env = os.environ.copy()
2501 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2502 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002503 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002504 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2505 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2506 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2507
2508 try:
2509 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002510 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002511 before_push = time_time()
2512 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002513 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002514 env=env,
2515 print_stdout=True,
2516 # Flush after every line: useful for seeing progress when running as
2517 # recipe.
2518 filter_fn=lambda _: sys.stdout.flush())
2519 except subprocess2.CalledProcessError as e:
2520 push_returncode = e.returncode
2521 DieWithError('Failed to create a change. Please examine output above '
2522 'for the reason of the failure.\n'
2523 'Hint: run command below to diagnose common Git/Gerrit '
2524 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002525 ' git cl creds-check\n'
2526 '\n'
2527 'If git-cl is not working correctly, file a bug under the '
2528 'Infra>SDK component including the files below.\n'
2529 'Review the files before upload, since they might contain '
2530 'sensitive information.\n'
2531 'Set the Restrict-View-Google label so that they are not '
2532 'publicly accessible.\n'
2533 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002534 change_desc)
2535 finally:
2536 execution_time = time_time() - before_push
2537 metrics.collector.add_repeated('sub_commands', {
2538 'command': 'git push',
2539 'execution_time': execution_time,
2540 'exit_code': push_returncode,
2541 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2542 })
2543
Edward Lemur1b52d872019-05-09 21:12:12 +00002544 git_push_metadata['execution_time'] = execution_time
2545 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002546 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002547
Edward Lemur1b52d872019-05-09 21:12:12 +00002548 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002549 gclient_utils.rmtree(traces_dir)
2550
2551 return push_stdout
2552
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002553 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002554 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002555 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002556 # Load default for user, repo, squash=true, in this order.
2557 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002558
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002559 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002560 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002561 # This may be None; default fallback value is determined in logic below.
2562 title = options.title
2563
Dominic Battre7d1c4842017-10-27 09:17:28 +02002564 # Extract bug number from branch name.
2565 bug = options.bug
2566 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2567 if not bug and match:
2568 bug = match.group(1)
2569
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002570 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002571 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002572 if self.GetIssue():
2573 # Try to get the message from a previous upload.
2574 message = self.GetDescription()
2575 if not message:
2576 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002577 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002578 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002579 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002580 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002581 # When uploading a subsequent patchset, -m|--message is taken
2582 # as the patchset title if --title was not provided.
2583 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002584 else:
2585 default_title = RunGit(
2586 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002587 if options.force:
2588 title = default_title
2589 else:
2590 title = ask_for_data(
2591 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002592 change_id = self._GetChangeDetail()['change_id']
2593 while True:
2594 footer_change_ids = git_footers.get_footer_change_id(message)
2595 if footer_change_ids == [change_id]:
2596 break
2597 if not footer_change_ids:
2598 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002599 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002600 continue
2601 # There is already a valid footer but with different or several ids.
2602 # Doing this automatically is non-trivial as we don't want to lose
2603 # existing other footers, yet we want to append just 1 desired
2604 # Change-Id. Thus, just create a new footer, but let user verify the
2605 # new description.
2606 message = '%s\n\nChange-Id: %s' % (message, change_id)
2607 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002608 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002609 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002610 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002611 'Please, check the proposed correction to the description, '
2612 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2613 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2614 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002615 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002616 if not options.force:
2617 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002618 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619 message = change_desc.description
2620 if not message:
2621 DieWithError("Description is empty. Aborting...")
2622 # Continue the while loop.
2623 # Sanity check of this code - we should end up with proper message
2624 # footer.
2625 assert [change_id] == git_footers.get_footer_change_id(message)
2626 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002627 else: # if not self.GetIssue()
2628 if options.message:
2629 message = options.message
2630 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002631 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002632 if options.title:
2633 message = options.title + '\n\n' + message
2634 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002635
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002636 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002637 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002638 # On first upload, patchset title is always this string, while
2639 # --title flag gets converted to first line of message.
2640 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002641 if not change_desc.description:
2642 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002643 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002644 if len(change_ids) > 1:
2645 DieWithError('too many Change-Id footers, at most 1 allowed.')
2646 if not change_ids:
2647 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002648 change_desc.set_description(git_footers.add_footer_change_id(
2649 change_desc.description,
2650 GenerateGerritChangeId(change_desc.description)))
2651 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002652 assert len(change_ids) == 1
2653 change_id = change_ids[0]
2654
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002655 if options.reviewers or options.tbrs or options.add_owners_to:
2656 change_desc.update_reviewers(options.reviewers, options.tbrs,
2657 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002658 if options.preserve_tryjobs:
2659 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002660
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002661 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002662 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2663 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002664 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002665 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2666 desc_tempfile.write(change_desc.description)
2667 desc_tempfile.close()
2668 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2669 '-F', desc_tempfile.name]).strip()
2670 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002671 else:
2672 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002673 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002674 if not change_desc.description:
2675 DieWithError("Description is empty. Aborting...")
2676
2677 if not git_footers.get_footer_change_id(change_desc.description):
2678 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002679 change_desc.set_description(
2680 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002681 if options.reviewers or options.tbrs or options.add_owners_to:
2682 change_desc.update_reviewers(options.reviewers, options.tbrs,
2683 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002684 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002685 # For no-squash mode, we assume the remote called "origin" is the one we
2686 # want. It is not worthwhile to support different workflows for
2687 # no-squash mode.
2688 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002689 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2690
2691 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002692 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002693 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2694 ref_to_push)]).splitlines()
2695 if len(commits) > 1:
2696 print('WARNING: This will upload %d commits. Run the following command '
2697 'to see which commits will be uploaded: ' % len(commits))
2698 print('git log %s..%s' % (parent, ref_to_push))
2699 print('You can also use `git squash-branch` to squash these into a '
2700 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002701 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002702
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002703 if options.reviewers or options.tbrs or options.add_owners_to:
2704 change_desc.update_reviewers(options.reviewers, options.tbrs,
2705 options.add_owners_to, change)
2706
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002707 reviewers = sorted(change_desc.get_reviewers())
2708 # Add cc's from the CC_LIST and --cc flag (if any).
2709 if not options.private and not options.no_autocc:
2710 cc = self.GetCCList().split(',')
2711 else:
2712 cc = []
2713 if options.cc:
2714 cc.extend(options.cc)
2715 cc = filter(None, [email.strip() for email in cc])
2716 if change_desc.get_cced():
2717 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002718 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2719 valid_accounts = set(reviewers + cc)
2720 # TODO(crbug/877717): relax this for all hosts.
2721 else:
2722 valid_accounts = gerrit_util.ValidAccounts(
2723 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002724 logging.info('accounts %s are recognized, %s invalid',
2725 sorted(valid_accounts),
2726 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002727
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002728 # Extra options that can be specified at push time. Doc:
2729 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002730 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002731
Aaron Gable844cf292017-06-28 11:32:59 -07002732 # By default, new changes are started in WIP mode, and subsequent patchsets
2733 # don't send email. At any time, passing --send-mail will mark the change
2734 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002735 if options.send_mail:
2736 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002737 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002738 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002739 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002740 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002741 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002742
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002743 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002744 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002745
Aaron Gable9b713dd2016-12-14 16:04:21 -08002746 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002747 # Punctuation and whitespace in |title| must be percent-encoded.
2748 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002749
agablec6787972016-09-09 16:13:34 -07002750 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002751 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002752
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002753 for r in sorted(reviewers):
2754 if r in valid_accounts:
2755 refspec_opts.append('r=%s' % r)
2756 reviewers.remove(r)
2757 else:
2758 # TODO(tandrii): this should probably be a hard failure.
2759 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2760 % r)
2761 for c in sorted(cc):
2762 # refspec option will be rejected if cc doesn't correspond to an
2763 # account, even though REST call to add such arbitrary cc may succeed.
2764 if c in valid_accounts:
2765 refspec_opts.append('cc=%s' % c)
2766 cc.remove(c)
2767
rmistry9eadede2016-09-19 11:22:43 -07002768 if options.topic:
2769 # Documentation on Gerrit topics is here:
2770 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002771 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002772
Edward Lemur687ca902018-12-05 02:30:30 +00002773 if options.enable_auto_submit:
2774 refspec_opts.append('l=Auto-Submit+1')
2775 if options.use_commit_queue:
2776 refspec_opts.append('l=Commit-Queue+2')
2777 elif options.cq_dry_run:
2778 refspec_opts.append('l=Commit-Queue+1')
2779
2780 if change_desc.get_reviewers(tbr_only=True):
2781 score = gerrit_util.GetCodeReviewTbrScore(
2782 self._GetGerritHost(),
2783 self._GetGerritProject())
2784 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002785
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002786 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002787 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002788 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002789 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002790 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2791
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002792 refspec_suffix = ''
2793 if refspec_opts:
2794 refspec_suffix = '%' + ','.join(refspec_opts)
2795 assert ' ' not in refspec_suffix, (
2796 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2797 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2798
Edward Lemur1b52d872019-05-09 21:12:12 +00002799 git_push_metadata = {
2800 'gerrit_host': self._GetGerritHost(),
2801 'title': title or '<untitled>',
2802 'change_id': change_id,
2803 'description': change_desc.description,
2804 }
2805 push_stdout = self._RunGitPushWithTraces(
2806 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002807
2808 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002809 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002810 change_numbers = [m.group(1)
2811 for m in map(regex.match, push_stdout.splitlines())
2812 if m]
2813 if len(change_numbers) != 1:
2814 DieWithError(
2815 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002816 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002818 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002819
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002820 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002821 # GetIssue() is not set in case of non-squash uploads according to tests.
2822 # TODO(agable): non-squash uploads in git cl should be removed.
2823 gerrit_util.AddReviewers(
2824 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002825 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002826 reviewers, cc,
2827 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002828
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002829 return 0
2830
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002831 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2832 change_desc):
2833 """Computes parent of the generated commit to be uploaded to Gerrit.
2834
2835 Returns revision or a ref name.
2836 """
2837 if custom_cl_base:
2838 # Try to avoid creating additional unintended CLs when uploading, unless
2839 # user wants to take this risk.
2840 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2841 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2842 local_ref_of_target_remote])
2843 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002844 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002845 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2846 'If you proceed with upload, more than 1 CL may be created by '
2847 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2848 'If you are certain that specified base `%s` has already been '
2849 'uploaded to Gerrit as another CL, you may proceed.\n' %
2850 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2851 if not force:
2852 confirm_or_exit(
2853 'Do you take responsibility for cleaning up potential mess '
2854 'resulting from proceeding with upload?',
2855 action='upload')
2856 return custom_cl_base
2857
Aaron Gablef97e33d2017-03-30 15:44:27 -07002858 if remote != '.':
2859 return self.GetCommonAncestorWithUpstream()
2860
2861 # If our upstream branch is local, we base our squashed commit on its
2862 # squashed version.
2863 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2864
Aaron Gablef97e33d2017-03-30 15:44:27 -07002865 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002866 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002867
2868 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002869 # TODO(tandrii): consider checking parent change in Gerrit and using its
2870 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2871 # the tree hash of the parent branch. The upside is less likely bogus
2872 # requests to reupload parent change just because it's uploadhash is
2873 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002874 parent = RunGit(['config',
2875 'branch.%s.gerritsquashhash' % upstream_branch_name],
2876 error_ok=True).strip()
2877 # Verify that the upstream branch has been uploaded too, otherwise
2878 # Gerrit will create additional CLs when uploading.
2879 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2880 RunGitSilent(['rev-parse', parent + ':'])):
2881 DieWithError(
2882 '\nUpload upstream branch %s first.\n'
2883 'It is likely that this branch has been rebased since its last '
2884 'upload, so you just need to upload it again.\n'
2885 '(If you uploaded it with --no-squash, then branch dependencies '
2886 'are not supported, and you should reupload with --squash.)'
2887 % upstream_branch_name,
2888 change_desc)
2889 return parent
2890
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002891 def _AddChangeIdToCommitMessage(self, options, args):
2892 """Re-commits using the current message, assumes the commit hook is in
2893 place.
2894 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002895 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002896 git_command = ['commit', '--amend', '-m', log_desc]
2897 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002898 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002899 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002900 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002901 return new_log_desc
2902 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002903 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002904
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002905 def SetCQState(self, new_state):
2906 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002907 vote_map = {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002908 _CQState.NONE: 0,
2909 _CQState.DRY_RUN: 1,
2910 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002911 }
Aaron Gablefc62f762017-07-17 11:12:07 -07002912 labels = {'Commit-Queue': vote_map[new_state]}
2913 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002914 gerrit_util.SetReview(
2915 self._GetGerritHost(), self._GerritChangeIdentifier(),
2916 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002917
tandriie113dfd2016-10-11 10:20:12 -07002918 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002919 try:
2920 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002921 except GerritChangeNotExists:
2922 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002923
2924 if data['status'] in ('ABANDONED', 'MERGED'):
2925 return 'CL %s is closed' % self.GetIssue()
2926
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002927 def GetTryJobProperties(self, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002928 """Returns dictionary of properties to launch a tryjob."""
tandrii8c5a3532016-11-04 07:52:02 -07002929 data = self._GetChangeDetail(['ALL_REVISIONS'])
2930 patchset = int(patchset or self.GetPatchset())
2931 assert patchset
2932 revision_data = None # Pylint wants it to be defined.
2933 for revision_data in data['revisions'].itervalues():
2934 if int(revision_data['_number']) == patchset:
2935 break
2936 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002937 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002938 (patchset, self.GetIssue()))
2939 return {
2940 'patch_issue': self.GetIssue(),
2941 'patch_set': patchset or self.GetPatchset(),
2942 'patch_project': data['project'],
2943 'patch_storage': 'gerrit',
2944 'patch_ref': revision_data['fetch']['http']['ref'],
2945 'patch_repository_url': revision_data['fetch']['http']['url'],
2946 'patch_gerrit_url': self.GetCodereviewServer(),
2947 }
tandriie113dfd2016-10-11 10:20:12 -07002948
tandriide281ae2016-10-12 06:02:30 -07002949 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002950 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002951
Edward Lemur707d70b2018-02-07 00:50:14 +01002952 def GetReviewers(self):
2953 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002954 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002955
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002956
2957_CODEREVIEW_IMPLEMENTATIONS = {
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002958 'gerrit': _GerritChangelistImpl,
2959}
2960
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002961
iannuccie53c9352016-08-17 14:40:40 -07002962def _add_codereview_issue_select_options(parser, extra=""):
2963 _add_codereview_select_options(parser)
2964
2965 text = ('Operate on this issue number instead of the current branch\'s '
2966 'implicit issue.')
2967 if extra:
2968 text += ' '+extra
2969 parser.add_option('-i', '--issue', type=int, help=text)
2970
2971
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002972def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002973 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002974 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002975 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002976 parser.add_option_group(parser.codereview_group)
2977 parser.codereview_group.add_option(
2978 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002979 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002980
2981
2982def _process_codereview_select_options(parser, options):
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002983 options.forced_codereview = None
2984 if options.gerrit:
2985 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002986
2987
tandriif9aefb72016-07-01 09:06:51 -07002988def _get_bug_line_values(default_project, bugs):
2989 """Given default_project and comma separated list of bugs, yields bug line
2990 values.
2991
2992 Each bug can be either:
2993 * a number, which is combined with default_project
2994 * string, which is left as is.
2995
2996 This function may produce more than one line, because bugdroid expects one
2997 project per line.
2998
2999 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3000 ['v8:123', 'chromium:789']
3001 """
3002 default_bugs = []
3003 others = []
3004 for bug in bugs.split(','):
3005 bug = bug.strip()
3006 if bug:
3007 try:
3008 default_bugs.append(int(bug))
3009 except ValueError:
3010 others.append(bug)
3011
3012 if default_bugs:
3013 default_bugs = ','.join(map(str, default_bugs))
3014 if default_project:
3015 yield '%s:%s' % (default_project, default_bugs)
3016 else:
3017 yield default_bugs
3018 for other in sorted(others):
3019 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3020 yield other
3021
3022
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003023class ChangeDescription(object):
3024 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003025 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003026 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003027 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003028 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003029 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3030 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3031 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3032 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003033
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003034 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003035 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003036
agable@chromium.org42c20792013-09-12 17:34:49 +00003037 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003038 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003039 return '\n'.join(self._description_lines)
3040
3041 def set_description(self, desc):
3042 if isinstance(desc, basestring):
3043 lines = desc.splitlines()
3044 else:
3045 lines = [line.rstrip() for line in desc]
3046 while lines and not lines[0]:
3047 lines.pop(0)
3048 while lines and not lines[-1]:
3049 lines.pop(-1)
3050 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003051
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003052 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3053 """Rewrites the R=/TBR= line(s) as a single line each.
3054
3055 Args:
3056 reviewers (list(str)) - list of additional emails to use for reviewers.
3057 tbrs (list(str)) - list of additional emails to use for TBRs.
3058 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3059 the change that are missing OWNER coverage. If this is not None, you
3060 must also pass a value for `change`.
3061 change (Change) - The Change that should be used for OWNERS lookups.
3062 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003063 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003064 assert isinstance(tbrs, list), tbrs
3065
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003066 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003067 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003068
3069 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003070 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003071
3072 reviewers = set(reviewers)
3073 tbrs = set(tbrs)
3074 LOOKUP = {
3075 'TBR': tbrs,
3076 'R': reviewers,
3077 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003078
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003079 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003080 regexp = re.compile(self.R_LINE)
3081 matches = [regexp.match(line) for line in self._description_lines]
3082 new_desc = [l for i, l in enumerate(self._description_lines)
3083 if not matches[i]]
3084 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003085
agable@chromium.org42c20792013-09-12 17:34:49 +00003086 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003087
3088 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003089 for match in matches:
3090 if not match:
3091 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003092 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3093
3094 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003095 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003096 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003097 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003098 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003099 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003100 LOOKUP[add_owners_to].update(
3101 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003102
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003103 # If any folks ended up in both groups, remove them from tbrs.
3104 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003105
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003106 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3107 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003108
3109 # Put the new lines in the description where the old first R= line was.
3110 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3111 if 0 <= line_loc < len(self._description_lines):
3112 if new_tbr_line:
3113 self._description_lines.insert(line_loc, new_tbr_line)
3114 if new_r_line:
3115 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003116 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003117 if new_r_line:
3118 self.append_footer(new_r_line)
3119 if new_tbr_line:
3120 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003121
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003122 def set_preserve_tryjobs(self):
3123 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3124 footers = git_footers.parse_footers(self.description)
3125 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3126 if v.lower() == 'true':
3127 return
3128 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3129
Aaron Gable3a16ed12017-03-23 10:51:55 -07003130 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003131 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003132 self.set_description([
3133 '# Enter a description of the change.',
3134 '# This will be displayed on the codereview site.',
3135 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003136 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003137 '--------------------',
3138 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003139
agable@chromium.org42c20792013-09-12 17:34:49 +00003140 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003141 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00003142 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003143 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003144 if git_footer:
3145 self.append_footer('Bug: %s' % ', '.join(values))
3146 else:
3147 for value in values:
3148 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003149
agable@chromium.org42c20792013-09-12 17:34:49 +00003150 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003151 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003152 if not content:
3153 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003154 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003155
Bruce Dawson2377b012018-01-11 16:46:49 -08003156 # Strip off comments and default inserted "Bug:" line.
3157 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003158 (line.startswith('#') or
3159 line.rstrip() == "Bug:" or
3160 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003161 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003162 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003163 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003164
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003165 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003166 """Adds a footer line to the description.
3167
3168 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3169 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3170 that Gerrit footers are always at the end.
3171 """
3172 parsed_footer_line = git_footers.parse_footer(line)
3173 if parsed_footer_line:
3174 # Line is a gerrit footer in the form: Footer-Key: any value.
3175 # Thus, must be appended observing Gerrit footer rules.
3176 self.set_description(
3177 git_footers.add_footer(self.description,
3178 key=parsed_footer_line[0],
3179 value=parsed_footer_line[1]))
3180 return
3181
3182 if not self._description_lines:
3183 self._description_lines.append(line)
3184 return
3185
3186 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3187 if gerrit_footers:
3188 # git_footers.split_footers ensures that there is an empty line before
3189 # actual (gerrit) footers, if any. We have to keep it that way.
3190 assert top_lines and top_lines[-1] == ''
3191 top_lines, separator = top_lines[:-1], top_lines[-1:]
3192 else:
3193 separator = [] # No need for separator if there are no gerrit_footers.
3194
3195 prev_line = top_lines[-1] if top_lines else ''
3196 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3197 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3198 top_lines.append('')
3199 top_lines.append(line)
3200 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003201
tandrii99a72f22016-08-17 14:33:24 -07003202 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003203 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003204 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003205 reviewers = [match.group(2).strip()
3206 for match in matches
3207 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003208 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003209
bradnelsond975b302016-10-23 12:20:23 -07003210 def get_cced(self):
3211 """Retrieves the list of reviewers."""
3212 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3213 cced = [match.group(2).strip() for match in matches if match]
3214 return cleanup_list(cced)
3215
Nodir Turakulov23b82142017-11-16 11:04:25 -08003216 def get_hash_tags(self):
3217 """Extracts and sanitizes a list of Gerrit hashtags."""
3218 subject = (self._description_lines or ('',))[0]
3219 subject = re.sub(
3220 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3221
3222 tags = []
3223 start = 0
3224 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3225 while True:
3226 m = bracket_exp.match(subject, start)
3227 if not m:
3228 break
3229 tags.append(self.sanitize_hash_tag(m.group(1)))
3230 start = m.end()
3231
3232 if not tags:
3233 # Try "Tag: " prefix.
3234 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3235 if m:
3236 tags.append(self.sanitize_hash_tag(m.group(1)))
3237 return tags
3238
3239 @classmethod
3240 def sanitize_hash_tag(cls, tag):
3241 """Returns a sanitized Gerrit hash tag.
3242
3243 A sanitized hashtag can be used as a git push refspec parameter value.
3244 """
3245 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3246
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003247 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3248 """Updates this commit description given the parent.
3249
3250 This is essentially what Gnumbd used to do.
3251 Consult https://goo.gl/WMmpDe for more details.
3252 """
3253 assert parent_msg # No, orphan branch creation isn't supported.
3254 assert parent_hash
3255 assert dest_ref
3256 parent_footer_map = git_footers.parse_footers(parent_msg)
3257 # This will also happily parse svn-position, which GnumbD is no longer
3258 # supporting. While we'd generate correct footers, the verifier plugin
3259 # installed in Gerrit will block such commit (ie git push below will fail).
3260 parent_position = git_footers.get_position(parent_footer_map)
3261
3262 # Cherry-picks may have last line obscuring their prior footers,
3263 # from git_footers perspective. This is also what Gnumbd did.
3264 cp_line = None
3265 if (self._description_lines and
3266 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3267 cp_line = self._description_lines.pop()
3268
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003269 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003270
3271 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3272 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003273 for i, line in enumerate(footer_lines):
3274 k, v = git_footers.parse_footer(line) or (None, None)
3275 if k and k.startswith('Cr-'):
3276 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003277
3278 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003279 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003280 if parent_position[0] == dest_ref:
3281 # Same branch as parent.
3282 number = int(parent_position[1]) + 1
3283 else:
3284 number = 1 # New branch, and extra lineage.
3285 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3286 int(parent_position[1])))
3287
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003288 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3289 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003290
3291 self._description_lines = top_lines
3292 if cp_line:
3293 self._description_lines.append(cp_line)
3294 if self._description_lines[-1] != '':
3295 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003296 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003297
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003298
Aaron Gablea1bab272017-04-11 16:38:18 -07003299def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003300 """Retrieves the reviewers that approved a CL from the issue properties with
3301 messages.
3302
3303 Note that the list may contain reviewers that are not committer, thus are not
3304 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003305
3306 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003307 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003308 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003309 return sorted(
3310 set(
3311 message['sender']
3312 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003313 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003314 )
3315 )
3316
3317
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003318def FindCodereviewSettingsFile(filename='codereview.settings'):
3319 """Finds the given file starting in the cwd and going up.
3320
3321 Only looks up to the top of the repository unless an
3322 'inherit-review-settings-ok' file exists in the root of the repository.
3323 """
3324 inherit_ok_file = 'inherit-review-settings-ok'
3325 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003326 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003327 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3328 root = '/'
3329 while True:
3330 if filename in os.listdir(cwd):
3331 if os.path.isfile(os.path.join(cwd, filename)):
3332 return open(os.path.join(cwd, filename))
3333 if cwd == root:
3334 break
3335 cwd = os.path.dirname(cwd)
3336
3337
3338def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003339 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003340 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003341
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003342 def SetProperty(name, setting, unset_error_ok=False):
3343 fullname = 'rietveld.' + name
3344 if setting in keyvals:
3345 RunGit(['config', fullname, keyvals[setting]])
3346 else:
3347 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3348
tandrii48df5812016-10-17 03:55:37 -07003349 if not keyvals.get('GERRIT_HOST', False):
3350 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003351 # Only server setting is required. Other settings can be absent.
3352 # In that case, we ignore errors raised during option deletion attempt.
3353 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3354 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3355 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003356 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003357 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3358 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003359 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3360 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003361
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003362 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003363 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003364
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003365 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003366 RunGit(['config', 'gerrit.squash-uploads',
3367 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003368
tandrii@chromium.org28253532016-04-14 13:46:56 +00003369 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003370 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003371 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3372
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003373 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003374 # should be of the form
3375 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3376 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3378 keyvals['ORIGIN_URL_CONFIG']])
3379
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003381def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003382 """Downloads a network object to a local file, like urllib.urlretrieve.
3383
3384 This is necessary because urllib is broken for SSL connections via a proxy.
3385 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003386 with open(destination, 'w') as f:
3387 f.write(urllib2.urlopen(source).read())
3388
3389
ukai@chromium.org712d6102013-11-27 00:52:58 +00003390def hasSheBang(fname):
3391 """Checks fname is a #! script."""
3392 with open(fname) as f:
3393 return f.read(2).startswith('#!')
3394
3395
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003396# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3397def DownloadHooks(*args, **kwargs):
3398 pass
3399
3400
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003401def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003402 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003403
3404 Args:
3405 force: True to update hooks. False to install hooks if not present.
3406 """
3407 if not settings.GetIsGerrit():
3408 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003409 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003410 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3411 if not os.access(dst, os.X_OK):
3412 if os.path.exists(dst):
3413 if not force:
3414 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003415 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003416 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003417 if not hasSheBang(dst):
3418 DieWithError('Not a script: %s\n'
3419 'You need to download from\n%s\n'
3420 'into .git/hooks/commit-msg and '
3421 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003422 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3423 except Exception:
3424 if os.path.exists(dst):
3425 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003426 DieWithError('\nFailed to download hooks.\n'
3427 'You need to download from\n%s\n'
3428 'into .git/hooks/commit-msg and '
3429 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003430
3431
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003432class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003433 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003434
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003435 _GOOGLESOURCE = 'googlesource.com'
3436
3437 def __init__(self):
3438 # Cached list of [host, identity, source], where source is either
3439 # .gitcookies or .netrc.
3440 self._all_hosts = None
3441
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003442 def ensure_configured_gitcookies(self):
3443 """Runs checks and suggests fixes to make git use .gitcookies from default
3444 path."""
3445 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3446 configured_path = RunGitSilent(
3447 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003448 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003449 if configured_path:
3450 self._ensure_default_gitcookies_path(configured_path, default)
3451 else:
3452 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003453
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003454 @staticmethod
3455 def _ensure_default_gitcookies_path(configured_path, default_path):
3456 assert configured_path
3457 if configured_path == default_path:
3458 print('git is already configured to use your .gitcookies from %s' %
3459 configured_path)
3460 return
3461
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003462 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003463 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3464 (configured_path, default_path))
3465
3466 if not os.path.exists(configured_path):
3467 print('However, your configured .gitcookies file is missing.')
3468 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3469 action='reconfigure')
3470 RunGit(['config', '--global', 'http.cookiefile', default_path])
3471 return
3472
3473 if os.path.exists(default_path):
3474 print('WARNING: default .gitcookies file already exists %s' %
3475 default_path)
3476 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3477 default_path)
3478
3479 confirm_or_exit('Move existing .gitcookies to default location?',
3480 action='move')
3481 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003482 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003483 print('Moved and reconfigured git to use .gitcookies from %s' %
3484 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003485
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003486 @staticmethod
3487 def _configure_gitcookies_path(default_path):
3488 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3489 if os.path.exists(netrc_path):
3490 print('You seem to be using outdated .netrc for git credentials: %s' %
3491 netrc_path)
3492 print('This tool will guide you through setting up recommended '
3493 '.gitcookies store for git credentials.\n'
3494 '\n'
3495 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3496 ' git config --global --unset http.cookiefile\n'
3497 ' mv %s %s.backup\n\n' % (default_path, default_path))
3498 confirm_or_exit(action='setup .gitcookies')
3499 RunGit(['config', '--global', 'http.cookiefile', default_path])
3500 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003501
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003502 def get_hosts_with_creds(self, include_netrc=False):
3503 if self._all_hosts is None:
3504 a = gerrit_util.CookiesAuthenticator()
3505 self._all_hosts = [
3506 (h, u, s)
3507 for h, u, s in itertools.chain(
3508 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3509 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3510 )
3511 if h.endswith(self._GOOGLESOURCE)
3512 ]
3513
3514 if include_netrc:
3515 return self._all_hosts
3516 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3517
3518 def print_current_creds(self, include_netrc=False):
3519 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3520 if not hosts:
3521 print('No Git/Gerrit credentials found')
3522 return
3523 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3524 header = [('Host', 'User', 'Which file'),
3525 ['=' * l for l in lengths]]
3526 for row in (header + hosts):
3527 print('\t'.join((('%%+%ds' % l) % s)
3528 for l, s in zip(lengths, row)))
3529
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003530 @staticmethod
3531 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003532 """Parses identity "git-<username>.domain" into <username> and domain."""
3533 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003534 # distinguishable from sub-domains. But we do know typical domains:
3535 if identity.endswith('.chromium.org'):
3536 domain = 'chromium.org'
3537 username = identity[:-len('.chromium.org')]
3538 else:
3539 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003540 if username.startswith('git-'):
3541 username = username[len('git-'):]
3542 return username, domain
3543
3544 def _get_usernames_of_domain(self, domain):
3545 """Returns list of usernames referenced by .gitcookies in a given domain."""
3546 identities_by_domain = {}
3547 for _, identity, _ in self.get_hosts_with_creds():
3548 username, domain = self._parse_identity(identity)
3549 identities_by_domain.setdefault(domain, []).append(username)
3550 return identities_by_domain.get(domain)
3551
3552 def _canonical_git_googlesource_host(self, host):
3553 """Normalizes Gerrit hosts (with '-review') to Git host."""
3554 assert host.endswith(self._GOOGLESOURCE)
3555 # Prefix doesn't include '.' at the end.
3556 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3557 if prefix.endswith('-review'):
3558 prefix = prefix[:-len('-review')]
3559 return prefix + '.' + self._GOOGLESOURCE
3560
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003561 def _canonical_gerrit_googlesource_host(self, host):
3562 git_host = self._canonical_git_googlesource_host(host)
3563 prefix = git_host.split('.', 1)[0]
3564 return prefix + '-review.' + self._GOOGLESOURCE
3565
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003566 def _get_counterpart_host(self, host):
3567 assert host.endswith(self._GOOGLESOURCE)
3568 git = self._canonical_git_googlesource_host(host)
3569 gerrit = self._canonical_gerrit_googlesource_host(git)
3570 return git if gerrit == host else gerrit
3571
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003572 def has_generic_host(self):
3573 """Returns whether generic .googlesource.com has been configured.
3574
3575 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3576 """
3577 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3578 if host == '.' + self._GOOGLESOURCE:
3579 return True
3580 return False
3581
3582 def _get_git_gerrit_identity_pairs(self):
3583 """Returns map from canonic host to pair of identities (Git, Gerrit).
3584
3585 One of identities might be None, meaning not configured.
3586 """
3587 host_to_identity_pairs = {}
3588 for host, identity, _ in self.get_hosts_with_creds():
3589 canonical = self._canonical_git_googlesource_host(host)
3590 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3591 idx = 0 if canonical == host else 1
3592 pair[idx] = identity
3593 return host_to_identity_pairs
3594
3595 def get_partially_configured_hosts(self):
3596 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003597 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3598 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3599 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003600
3601 def get_conflicting_hosts(self):
3602 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003603 host
3604 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003605 if None not in (i1, i2) and i1 != i2)
3606
3607 def get_duplicated_hosts(self):
3608 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3609 return set(host for host, count in counters.iteritems() if count > 1)
3610
3611 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3612 'chromium.googlesource.com': 'chromium.org',
3613 'chrome-internal.googlesource.com': 'google.com',
3614 }
3615
3616 def get_hosts_with_wrong_identities(self):
3617 """Finds hosts which **likely** reference wrong identities.
3618
3619 Note: skips hosts which have conflicting identities for Git and Gerrit.
3620 """
3621 hosts = set()
3622 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3623 pair = self._get_git_gerrit_identity_pairs().get(host)
3624 if pair and pair[0] == pair[1]:
3625 _, domain = self._parse_identity(pair[0])
3626 if domain != expected:
3627 hosts.add(host)
3628 return hosts
3629
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003630 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003631 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003632 hosts = sorted(hosts)
3633 assert hosts
3634 if extra_column_func is None:
3635 extras = [''] * len(hosts)
3636 else:
3637 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003638 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3639 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003640 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 lines.append(tmpl % he)
3642 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003644 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003645 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003646 yield ('.googlesource.com wildcard record detected',
3647 ['Chrome Infrastructure team recommends to list full host names '
3648 'explicitly.'],
3649 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003650
3651 dups = self.get_duplicated_hosts()
3652 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003653 yield ('The following hosts were defined twice',
3654 self._format_hosts(dups),
3655 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003656
3657 partial = self.get_partially_configured_hosts()
3658 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3660 'These hosts are missing',
3661 self._format_hosts(partial, lambda host: 'but %s defined' %
3662 self._get_counterpart_host(host)),
3663 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003664
3665 conflicting = self.get_conflicting_hosts()
3666 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003667 yield ('The following Git hosts have differing credentials from their '
3668 'Gerrit counterparts',
3669 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3670 tuple(self._get_git_gerrit_identity_pairs()[host])),
3671 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003672
3673 wrong = self.get_hosts_with_wrong_identities()
3674 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003675 yield ('These hosts likely use wrong identity',
3676 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3677 (self._get_git_gerrit_identity_pairs()[host][0],
3678 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3679 wrong)
3680
3681 def find_and_report_problems(self):
3682 """Returns True if there was at least one problem, else False."""
3683 found = False
3684 bad_hosts = set()
3685 for title, sublines, hosts in self._find_problems():
3686 if not found:
3687 found = True
3688 print('\n\n.gitcookies problem report:\n')
3689 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003690 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003691 if sublines:
3692 print()
3693 print(' %s' % '\n '.join(sublines))
3694 print()
3695
3696 if bad_hosts:
3697 assert found
3698 print(' You can manually remove corresponding lines in your %s file and '
3699 'visit the following URLs with correct account to generate '
3700 'correct credential lines:\n' %
3701 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3702 print(' %s' % '\n '.join(sorted(set(
3703 gerrit_util.CookiesAuthenticator().get_new_password_url(
3704 self._canonical_git_googlesource_host(host))
3705 for host in bad_hosts
3706 ))))
3707 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003708
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003709
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003710@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003711def CMDcreds_check(parser, args):
3712 """Checks credentials and suggests changes."""
3713 _, _ = parser.parse_args(args)
3714
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003715 # Code below checks .gitcookies. Abort if using something else.
3716 authn = gerrit_util.Authenticator.get()
3717 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3718 if isinstance(authn, gerrit_util.GceAuthenticator):
3719 DieWithError(
3720 'This command is not designed for GCE, are you on a bot?\n'
3721 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3722 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003723 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003724 'This command is not designed for bot environment. It checks '
3725 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003726
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003727 checker = _GitCookiesChecker()
3728 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003729
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003730 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003731 checker.print_current_creds(include_netrc=True)
3732
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003733 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003734 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003735 return 0
3736 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003737
3738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003739@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003740def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003741 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003742 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3743 branch = ShortBranchName(branchref)
3744 _, args = parser.parse_args(args)
3745 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003747 return RunGit(['config', 'branch.%s.base-url' % branch],
3748 error_ok=False).strip()
3749 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003750 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003751 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3752 error_ok=False).strip()
3753
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003754
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003755def color_for_status(status):
3756 """Maps a Changelist status to color, for CMDstatus and other tools."""
3757 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003758 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003759 'waiting': Fore.BLUE,
3760 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003761 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003762 'lgtm': Fore.GREEN,
3763 'commit': Fore.MAGENTA,
3764 'closed': Fore.CYAN,
3765 'error': Fore.WHITE,
3766 }.get(status, Fore.WHITE)
3767
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003768
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003769def get_cl_statuses(changes, fine_grained, max_processes=None):
3770 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003771
3772 If fine_grained is true, this will fetch CL statuses from the server.
3773 Otherwise, simply indicate if there's a matching url for the given branches.
3774
3775 If max_processes is specified, it is used as the maximum number of processes
3776 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3777 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003778
3779 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003780 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003781 if not changes:
3782 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003783
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003784 if not fine_grained:
3785 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003786 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003787 for cl in changes:
3788 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003789 return
3790
3791 # First, sort out authentication issues.
3792 logging.debug('ensuring credentials exist')
3793 for cl in changes:
3794 cl.EnsureAuthenticated(force=False, refresh=True)
3795
3796 def fetch(cl):
3797 try:
3798 return (cl, cl.GetStatus())
3799 except:
3800 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003801 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003802 raise
3803
3804 threads_count = len(changes)
3805 if max_processes:
3806 threads_count = max(1, min(threads_count, max_processes))
3807 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3808
3809 pool = ThreadPool(threads_count)
3810 fetched_cls = set()
3811 try:
3812 it = pool.imap_unordered(fetch, changes).__iter__()
3813 while True:
3814 try:
3815 cl, status = it.next(timeout=5)
3816 except multiprocessing.TimeoutError:
3817 break
3818 fetched_cls.add(cl)
3819 yield cl, status
3820 finally:
3821 pool.close()
3822
3823 # Add any branches that failed to fetch.
3824 for cl in set(changes) - fetched_cls:
3825 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003826
rmistry@google.com2dd99862015-06-22 12:22:18 +00003827
3828def upload_branch_deps(cl, args):
3829 """Uploads CLs of local branches that are dependents of the current branch.
3830
3831 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003832
3833 test1 -> test2.1 -> test3.1
3834 -> test3.2
3835 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003836
3837 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3838 run on the dependent branches in this order:
3839 test2.1, test3.1, test3.2, test2.2, test3.3
3840
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003841 Note: This function does not rebase your local dependent branches. Use it
3842 when you make a change to the parent branch that will not conflict
3843 with its dependent branches, and you would like their dependencies
3844 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003845 """
3846 if git_common.is_dirty_git_tree('upload-branch-deps'):
3847 return 1
3848
3849 root_branch = cl.GetBranch()
3850 if root_branch is None:
3851 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3852 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003853 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003854 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3855 'patchset dependencies without an uploaded CL.')
3856
3857 branches = RunGit(['for-each-ref',
3858 '--format=%(refname:short) %(upstream:short)',
3859 'refs/heads'])
3860 if not branches:
3861 print('No local branches found.')
3862 return 0
3863
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003864 # Create a dictionary of all local branches to the branches that are
3865 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003866 tracked_to_dependents = collections.defaultdict(list)
3867 for b in branches.splitlines():
3868 tokens = b.split()
3869 if len(tokens) == 2:
3870 branch_name, tracked = tokens
3871 tracked_to_dependents[tracked].append(branch_name)
3872
vapiera7fbd5a2016-06-16 09:17:49 -07003873 print()
3874 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003876
rmistry@google.com2dd99862015-06-22 12:22:18 +00003877 def traverse_dependents_preorder(branch, padding=''):
3878 dependents_to_process = tracked_to_dependents.get(branch, [])
3879 padding += ' '
3880 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003882 dependents.append(dependent)
3883 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003884
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003886 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003887
3888 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 return 0
3891
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003892 confirm_or_exit('This command will checkout all dependent branches and run '
3893 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003894
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 # Record all dependents that failed to upload.
3896 failures = {}
3897 # Go through all dependents, checkout the branch and upload.
3898 try:
3899 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print()
3901 print('--------------------------------------')
3902 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905 try:
3906 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003909 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003910 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003912 finally:
3913 # Swap back to the original root branch.
3914 RunGit(['checkout', '-q', root_branch])
3915
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
3917 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003918 for dependent_branch in dependents:
3919 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003920 print(' %s : %s' % (dependent_branch, upload_status))
3921 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003922
3923 return 0
3924
3925
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003926@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003927def CMDarchive(parser, args):
3928 """Archives and deletes branches associated with closed changelists."""
3929 parser.add_option(
3930 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003931 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003932 parser.add_option(
3933 '-f', '--force', action='store_true',
3934 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003935 parser.add_option(
3936 '-d', '--dry-run', action='store_true',
3937 help='Skip the branch tagging and removal steps.')
3938 parser.add_option(
3939 '-t', '--notags', action='store_true',
3940 help='Do not tag archived branches. '
3941 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003942
3943 auth.add_auth_options(parser)
3944 options, args = parser.parse_args(args)
3945 if args:
3946 parser.error('Unsupported args: %s' % ' '.join(args))
3947 auth_config = auth.extract_auth_config_from_options(options)
3948
3949 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3950 if not branches:
3951 return 0
3952
vapiera7fbd5a2016-06-16 09:17:49 -07003953 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07003954 changes = [Changelist(branchref=b, auth_config=auth_config)
3955 for b in branches.splitlines()]
3956 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3957 statuses = get_cl_statuses(changes,
3958 fine_grained=True,
3959 max_processes=options.maxjobs)
3960 proposal = [(cl.GetBranch(),
3961 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3962 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003963 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003964 proposal.sort()
3965
3966 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003968 return 0
3969
3970 current_branch = GetCurrentBranch()
3971
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003973 if options.notags:
3974 for next_item in proposal:
3975 print(' ' + next_item[0])
3976 else:
3977 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3978 for next_item in proposal:
3979 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003980
kmarshall9249e012016-08-23 12:02:16 -07003981 # Quit now on precondition failure or if instructed by the user, either
3982 # via an interactive prompt or by command line flags.
3983 if options.dry_run:
3984 print('\nNo changes were made (dry run).\n')
3985 return 0
3986 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003987 print('You are currently on a branch \'%s\' which is associated with a '
3988 'closed codereview issue, so archive cannot proceed. Please '
3989 'checkout another branch and run this command again.' %
3990 current_branch)
3991 return 1
kmarshall9249e012016-08-23 12:02:16 -07003992 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003993 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3994 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003995 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003996 return 1
3997
3998 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003999 if not options.notags:
4000 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004001 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004002
vapiera7fbd5a2016-06-16 09:17:49 -07004003 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004004
4005 return 0
4006
4007
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004008@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004009def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004010 """Show status of changelists.
4011
4012 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004013 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004014 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004015 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004016 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004017 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004018 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004019 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004020
4021 Also see 'git cl comments'.
4022 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004023 parser.add_option(
4024 '--no-branch-color',
4025 action='store_true',
4026 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004027 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004028 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004029 parser.add_option('-f', '--fast', action='store_true',
4030 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004031 parser.add_option(
4032 '-j', '--maxjobs', action='store', type=int,
4033 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004034
4035 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004036 _add_codereview_issue_select_options(
4037 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004038 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004039 _process_codereview_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004040 if args:
4041 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004042 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004043
iannuccie53c9352016-08-17 14:40:40 -07004044 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004045 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07004046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047 if options.field:
Edward Lemurf38bc172019-09-03 21:02:13 +00004048 cl = Changelist(auth_config=auth_config, issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004049 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004050 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051 elif options.field == 'id':
4052 issueid = cl.GetIssue()
4053 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004054 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004055 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004056 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004058 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004059 elif options.field == 'status':
4060 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061 elif options.field == 'url':
4062 url = cl.GetIssueURL()
4063 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004065 return 0
4066
4067 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4068 if not branches:
4069 print('No local branch found.')
4070 return 0
4071
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004072 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004073 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004074 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004076 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004077 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004078 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004079
Daniel McArdlea23bf592019-02-12 00:25:12 +00004080 current_branch = GetCurrentBranch()
4081
4082 def FormatBranchName(branch, colorize=False):
4083 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4084 an asterisk when it is the current branch."""
4085
4086 asterisk = ""
4087 color = Fore.RESET
4088 if branch == current_branch:
4089 asterisk = "* "
4090 color = Fore.GREEN
4091 branch_name = ShortBranchName(branch)
4092
4093 if colorize:
4094 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004095 return asterisk + branch_name
4096
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004097 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004098
4099 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004100 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4101 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004102 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004103 c, status = output.next()
4104 branch_statuses[c.GetBranch()] = status
4105 status = branch_statuses.pop(branch)
4106 url = cl.GetIssueURL()
4107 if url and (not status or status == 'error'):
4108 # The issue probably doesn't exist anymore.
4109 url += ' (broken)'
4110
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004111 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004112 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004113 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004114 color = ''
4115 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004116 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004117
Alan Cuttera3be9a52019-03-04 18:50:33 +00004118 branch_display = FormatBranchName(branch)
4119 padding = ' ' * (alignment - len(branch_display))
4120 if not options.no_branch_color:
4121 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004122
Alan Cuttera3be9a52019-03-04 18:50:33 +00004123 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4124 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004125
vapiera7fbd5a2016-06-16 09:17:49 -07004126 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004127 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004128 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004129 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004130 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004131 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004132 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004133 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004134 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004135 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004136 print('Issue description:')
4137 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004138 return 0
4139
4140
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004141def colorize_CMDstatus_doc():
4142 """To be called once in main() to add colors to git cl status help."""
4143 colors = [i for i in dir(Fore) if i[0].isupper()]
4144
4145 def colorize_line(line):
4146 for color in colors:
4147 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004148 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004149 indent = len(line) - len(line.lstrip(' ')) + 1
4150 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4151 return line
4152
4153 lines = CMDstatus.__doc__.splitlines()
4154 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4155
4156
phajdan.jre328cf92016-08-22 04:12:17 -07004157def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004158 if path == '-':
4159 json.dump(contents, sys.stdout)
4160 else:
4161 with open(path, 'w') as f:
4162 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004163
4164
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004165@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004166@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004167def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004168 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004169
4170 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004171 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004172 parser.add_option('-r', '--reverse', action='store_true',
4173 help='Lookup the branch(es) for the specified issues. If '
4174 'no issues are specified, all branches with mapped '
4175 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004176 parser.add_option('--json',
4177 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004178 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004179 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004180 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004181
dnj@chromium.org406c4402015-03-03 17:22:28 +00004182 if options.reverse:
4183 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004184 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004185 # Reverse issue lookup.
4186 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004187
4188 git_config = {}
4189 for config in RunGit(['config', '--get-regexp',
4190 r'branch\..*issue']).splitlines():
4191 name, _space, val = config.partition(' ')
4192 git_config[name] = val
4193
dnj@chromium.org406c4402015-03-03 17:22:28 +00004194 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004195 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4196 config_key = _git_branch_config_key(ShortBranchName(branch),
4197 cls.IssueConfigKey())
4198 issue = git_config.get(config_key)
4199 if issue:
4200 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004201 if not args:
4202 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004203 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004204 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004205 try:
4206 issue_num = int(issue)
4207 except ValueError:
4208 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004209 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004210 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004212 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004213 if options.json:
4214 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004215 return 0
4216
4217 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004218 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004219 if not issue.valid:
4220 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4221 'or no argument to list it.\n'
4222 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004223 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004224 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004225 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004226 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004227 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4228 if options.json:
4229 write_json(options.json, {
4230 'issue': cl.GetIssue(),
4231 'issue_url': cl.GetIssueURL(),
4232 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004233 return 0
4234
4235
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004236@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004237def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004238 """Shows or posts review comments for any changelist."""
4239 parser.add_option('-a', '--add-comment', dest='comment',
4240 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004241 parser.add_option('-p', '--publish', action='store_true',
4242 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004243 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004244 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004245 parser.add_option('-m', '--machine-readable', dest='readable',
4246 action='store_false', default=True,
4247 help='output comments in a format compatible with '
4248 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004249 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004250 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004251 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004252 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004253 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004254 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004255 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004256
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004257 issue = None
4258 if options.issue:
4259 try:
4260 issue = int(options.issue)
4261 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004262 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004263
Edward Lemurf38bc172019-09-03 21:02:13 +00004264 cl = Changelist(issue=issue, auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004265
4266 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004267 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004268 return 0
4269
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004270 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4271 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004272 for comment in summary:
4273 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004274 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004275 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004277 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004278 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004279 elif comment.autogenerated:
4280 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004281 else:
4282 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004283 print('\n%s%s %s%s\n%s' % (
4284 color,
4285 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4286 comment.sender,
4287 Fore.RESET,
4288 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4289
smut@google.comc85ac942015-09-15 16:34:43 +00004290 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004291 def pre_serialize(c):
4292 dct = c.__dict__.copy()
4293 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4294 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004295 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004296 return 0
4297
4298
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004299@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004300@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004301def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004302 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004303 parser.add_option('-d', '--display', action='store_true',
4304 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004305 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004306 help='New description to set for this issue (- for stdin, '
4307 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004308 parser.add_option('-f', '--force', action='store_true',
4309 help='Delete any unpublished Gerrit edits for this issue '
4310 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004311
4312 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004313 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004314 options, args = parser.parse_args(args)
4315 _process_codereview_select_options(parser, options)
4316
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004317 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004318 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004319 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004320 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004321 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004322
martiniss6eda05f2016-06-30 10:18:35 -07004323 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004324 'auth_config': auth.extract_auth_config_from_options(options),
martiniss6eda05f2016-06-30 10:18:35 -07004325 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004326 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004327 if target_issue_arg:
4328 kwargs['issue'] = target_issue_arg.issue
4329 kwargs['codereview_host'] = target_issue_arg.hostname
Edward Lemurf38bc172019-09-03 21:02:13 +00004330 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004331 detected_codereview_from_url = True
martiniss6eda05f2016-06-30 10:18:35 -07004332
4333 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004334 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004335 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004336 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004337
4338 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004339 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004340
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004341 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004342
smut@google.com34fb6b12015-07-13 20:03:26 +00004343 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004344 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004345 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004346
4347 if options.new_description:
4348 text = options.new_description
4349 if text == '-':
4350 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004351 elif text == '+':
4352 base_branch = cl.GetCommonAncestorWithUpstream()
4353 change = cl.GetChange(base_branch, None, local_description=True)
4354 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004355
4356 description.set_description(text)
4357 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004358 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004359 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004360 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004361 return 0
4362
4363
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004364@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004365def CMDlint(parser, args):
4366 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004367 parser.add_option('--filter', action='append', metavar='-x,+y',
4368 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004369 auth.add_auth_options(parser)
4370 options, args = parser.parse_args(args)
4371 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004372
4373 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004374 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004375 try:
4376 import cpplint
4377 import cpplint_chromium
4378 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004379 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004380 return 1
4381
4382 # Change the current working directory before calling lint so that it
4383 # shows the correct base.
4384 previous_cwd = os.getcwd()
4385 os.chdir(settings.GetRoot())
4386 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004387 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004388 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4389 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004390 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004391 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004392 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004393
4394 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004395 command = args + files
4396 if options.filter:
4397 command = ['--filter=' + ','.join(options.filter)] + command
4398 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399
4400 white_regex = re.compile(settings.GetLintRegex())
4401 black_regex = re.compile(settings.GetLintIgnoreRegex())
4402 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4403 for filename in filenames:
4404 if white_regex.match(filename):
4405 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004406 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 else:
4408 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4409 extra_check_functions)
4410 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004411 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004412 finally:
4413 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004414 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004415 if cpplint._cpplint_state.error_count != 0:
4416 return 1
4417 return 0
4418
4419
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004420@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004421def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004422 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004423 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004424 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004425 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004426 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004427 parser.add_option('--all', action='store_true',
4428 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004429 parser.add_option('--parallel', action='store_true',
4430 help='Run all tests specified by input_api.RunTests in all '
4431 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004432 auth.add_auth_options(parser)
4433 options, args = parser.parse_args(args)
4434 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435
sbc@chromium.org71437c02015-04-09 19:29:40 +00004436 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004437 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004438 return 1
4439
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004440 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441 if args:
4442 base_branch = args[0]
4443 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004444 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004445 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004446
Aaron Gable8076c282017-11-29 14:39:41 -08004447 if options.all:
4448 base_change = cl.GetChange(base_branch, None)
4449 files = [('M', f) for f in base_change.AllFiles()]
4450 change = presubmit_support.GitChange(
4451 base_change.Name(),
4452 base_change.FullDescriptionText(),
4453 base_change.RepositoryRoot(),
4454 files,
4455 base_change.issue,
4456 base_change.patchset,
4457 base_change.author_email,
4458 base_change._upstream)
4459 else:
4460 change = cl.GetChange(base_branch, None)
4461
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004462 cl.RunHook(
4463 committing=not options.upload,
4464 may_prompt=False,
4465 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004466 change=change,
4467 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004468 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004469
4470
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004471def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004472 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004473
4474 Works the same way as
4475 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4476 but can be called on demand on all platforms.
4477
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004478 The basic idea is to generate git hash of a state of the tree, original
4479 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004480 """
4481 lines = []
4482 tree_hash = RunGitSilent(['write-tree'])
4483 lines.append('tree %s' % tree_hash.strip())
4484 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4485 if code == 0:
4486 lines.append('parent %s' % parent.strip())
4487 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4488 lines.append('author %s' % author.strip())
4489 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4490 lines.append('committer %s' % committer.strip())
4491 lines.append('')
4492 # Note: Gerrit's commit-hook actually cleans message of some lines and
4493 # whitespace. This code is not doing this, but it clearly won't decrease
4494 # entropy.
4495 lines.append(message)
4496 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004497 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004498 return 'I%s' % change_hash.strip()
4499
4500
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004501def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004502 """Computes the remote branch ref to use for the CL.
4503
4504 Args:
4505 remote (str): The git remote for the CL.
4506 remote_branch (str): The git remote branch for the CL.
4507 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004508 """
4509 if not (remote and remote_branch):
4510 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004511
wittman@chromium.org455dc922015-01-26 20:15:50 +00004512 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004513 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004514 # refs, which are then translated into the remote full symbolic refs
4515 # below.
4516 if '/' not in target_branch:
4517 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4518 else:
4519 prefix_replacements = (
4520 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4521 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4522 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4523 )
4524 match = None
4525 for regex, replacement in prefix_replacements:
4526 match = re.search(regex, target_branch)
4527 if match:
4528 remote_branch = target_branch.replace(match.group(0), replacement)
4529 break
4530 if not match:
4531 # This is a branch path but not one we recognize; use as-is.
4532 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004533 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4534 # Handle the refs that need to land in different refs.
4535 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004536
wittman@chromium.org455dc922015-01-26 20:15:50 +00004537 # Create the true path to the remote branch.
4538 # Does the following translation:
4539 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4540 # * refs/remotes/origin/master -> refs/heads/master
4541 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4542 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4543 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4544 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4545 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4546 'refs/heads/')
4547 elif remote_branch.startswith('refs/remotes/branch-heads'):
4548 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004549
wittman@chromium.org455dc922015-01-26 20:15:50 +00004550 return remote_branch
4551
4552
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004553def cleanup_list(l):
4554 """Fixes a list so that comma separated items are put as individual items.
4555
4556 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4557 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4558 """
4559 items = sum((i.split(',') for i in l), [])
4560 stripped_items = (i.strip() for i in items)
4561 return sorted(filter(None, stripped_items))
4562
4563
Aaron Gable4db38df2017-11-03 14:59:07 -07004564@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004565@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004566def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004567 """Uploads the current changelist to codereview.
4568
4569 Can skip dependency patchset uploads for a branch by running:
4570 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004571 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004572 git config --unset branch.branch_name.skip-deps-uploads
4573 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004574
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004575 If the name of the checked out branch starts with "bug-" or "fix-" followed
4576 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004577 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004578
4579 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004580 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004581 [git-cl] add support for hashtags
4582 Foo bar: implement foo
4583 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004584 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004585 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4586 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004587 parser.add_option('--bypass-watchlists', action='store_true',
4588 dest='bypass_watchlists',
4589 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004590 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004591 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004592 parser.add_option('--message', '-m', dest='message',
4593 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004594 parser.add_option('-b', '--bug',
4595 help='pre-populate the bug number(s) for this issue. '
4596 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004597 parser.add_option('--message-file', dest='message_file',
4598 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004599 parser.add_option('--title', '-t', dest='title',
4600 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004601 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004602 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004603 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004604 parser.add_option('--tbrs',
4605 action='append', default=[],
4606 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004607 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004608 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004609 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004610 parser.add_option('--hashtag', dest='hashtags',
4611 action='append', default=[],
4612 help=('Gerrit hashtag for new CL; '
4613 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004614 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004615 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004616 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004617 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004618 metavar='TARGET',
4619 help='Apply CL to remote ref TARGET. ' +
4620 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004621 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004622 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004623 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004624 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004625 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004626 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004627 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4628 const='TBR', help='add a set of OWNERS to TBR')
4629 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4630 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004631 parser.add_option('-c', '--use-commit-queue', action='store_true',
4632 help='tell the CQ to commit this patchset; '
4633 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004634 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4635 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004636 help='Send the patchset to do a CQ dry run right after '
4637 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004638 parser.add_option('--preserve-tryjobs', action='store_true',
4639 help='instruct the CQ to let tryjobs running even after '
4640 'new patchsets are uploaded instead of canceling '
4641 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004642 parser.add_option('--dependencies', action='store_true',
4643 help='Uploads CLs of all the local branches that depend on '
4644 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004645 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4646 help='Sends your change to the CQ after an approval. Only '
4647 'works on repos that have the Auto-Submit label '
4648 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004649 parser.add_option('--parallel', action='store_true',
4650 help='Run all tests specified by input_api.RunTests in all '
4651 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004652
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004653 parser.add_option('--no-autocc', action='store_true',
4654 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004655 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004656 help='Set the review private. This implies --no-autocc.')
4657
rmistry@google.com2dd99862015-06-22 12:22:18 +00004658 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004659 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004660 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004661 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004662 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004663 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004664
sbc@chromium.org71437c02015-04-09 19:29:40 +00004665 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004666 return 1
4667
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004668 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004669 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004670 options.cc = cleanup_list(options.cc)
4671
tandriib80458a2016-06-23 12:20:07 -07004672 if options.message_file:
4673 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004674 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004675 options.message = gclient_utils.FileRead(options.message_file)
4676 options.message_file = None
4677
tandrii4d0545a2016-07-06 03:56:49 -07004678 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004679 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004680
Aaron Gableedbc4132017-09-11 13:22:28 -07004681 if options.use_commit_queue:
4682 options.send_mail = True
4683
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004684 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4685 settings.GetIsGerrit()
4686
Edward Lemurf38bc172019-09-03 21:02:13 +00004687 cl = Changelist(auth_config=auth_config)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004688
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004689 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004690
4691
Francois Dorayd42c6812017-05-30 15:10:20 -04004692@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004693@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004694def CMDsplit(parser, args):
4695 """Splits a branch into smaller branches and uploads CLs.
4696
4697 Creates a branch and uploads a CL for each group of files modified in the
4698 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004699 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004700 the shared OWNERS file.
4701 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004702 parser.add_option('-d', '--description', dest='description_file',
4703 help='A text file containing a CL description in which '
4704 '$directory will be replaced by each CL\'s directory.')
4705 parser.add_option('-c', '--comment', dest='comment_file',
4706 help='A text file containing a CL comment.')
4707 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004708 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004709 help='List the files and reviewers for each CL that would '
4710 'be created, but don\'t create branches or CLs.')
4711 parser.add_option('--cq-dry-run', action='store_true',
4712 help='If set, will do a cq dry run for each uploaded CL. '
4713 'Please be careful when doing this; more than ~10 CLs '
4714 'has the potential to overload our build '
4715 'infrastructure. Try to upload these not during high '
4716 'load times (usually 11-3 Mountain View time). Email '
4717 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004718 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4719 default=True,
4720 help='Sends your change to the CQ after an approval. Only '
4721 'works on repos that have the Auto-Submit label '
4722 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004723 options, _ = parser.parse_args(args)
4724
4725 if not options.description_file:
4726 parser.error('No --description flag specified.')
4727
4728 def WrappedCMDupload(args):
4729 return CMDupload(OptionParser(), args)
4730
4731 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004732 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004733 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004734
4735
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004736@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004737@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004738def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004739 """DEPRECATED: Used to commit the current changelist via git-svn."""
4740 message = ('git-cl no longer supports committing to SVN repositories via '
4741 'git-svn. You probably want to use `git cl land` instead.')
4742 print(message)
4743 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004744
4745
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004746# Two special branches used by git cl land.
4747MERGE_BRANCH = 'git-cl-commit'
4748CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4749
4750
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004751@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004752@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004753def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004754 """Commits the current changelist via git.
4755
4756 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4757 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004758 """
4759 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4760 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004761 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004762 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004763 parser.add_option('--parallel', action='store_true',
4764 help='Run all tests specified by input_api.RunTests in all '
4765 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004766 auth.add_auth_options(parser)
4767 (options, args) = parser.parse_args(args)
4768 auth_config = auth.extract_auth_config_from_options(options)
4769
4770 cl = Changelist(auth_config=auth_config)
4771
Robert Iannucci2e73d432018-03-14 01:10:47 -07004772 if not cl.GetIssue():
4773 DieWithError('You must upload the change first to Gerrit.\n'
4774 ' If you would rather have `git cl land` upload '
4775 'automatically for you, see http://crbug.com/642759')
4776 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004777 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004778
4779
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004780@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004781@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004782def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004783 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004784 parser.add_option('-b', dest='newbranch',
4785 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004786 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004787 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004788 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004789 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004790
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004791 group = optparse.OptionGroup(
4792 parser,
4793 'Options for continuing work on the current issue uploaded from a '
4794 'different clone (e.g. different machine). Must be used independently '
4795 'from the other options. No issue number should be specified, and the '
4796 'branch must have an issue number associated with it')
4797 group.add_option('--reapply', action='store_true', dest='reapply',
4798 help='Reset the branch and reapply the issue.\n'
4799 'CAUTION: This will undo any local changes in this '
4800 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004801
4802 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004803 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004804 parser.add_option_group(group)
4805
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004806 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004807 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004808 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004809 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004810 auth_config = auth.extract_auth_config_from_options(options)
4811
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004812 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004813 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004814 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004815 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004816 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004817
Edward Lemurf38bc172019-09-03 21:02:13 +00004818 cl = Changelist(auth_config=auth_config)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004819 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004820 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004821
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004822 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004823 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004824 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004825
4826 RunGit(['reset', '--hard', upstream])
4827 if options.pull:
4828 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004829
Edward Lemurf38bc172019-09-03 21:02:13 +00004830 return cl.CMDPatchIssue(cl.GetIssue(), options.nocommit)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004831
4832 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004833 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004834
Edward Lemurf38bc172019-09-03 21:02:13 +00004835 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004836 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004837 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004838
4839 cl_kwargs = {
4840 'auth_config': auth_config,
4841 'codereview_host': target_issue_arg.hostname,
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004842 }
4843 detected_codereview_from_url = False
Edward Lemurf38bc172019-09-03 21:02:13 +00004844 if not args[0].isdigit() and not options.forced_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004845 detected_codereview_from_url = True
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004846 cl_kwargs['issue'] = target_issue_arg.issue
4847
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004848 # We don't want uncommitted changes mixed up with the patch.
4849 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004850 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004851
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004852 if options.newbranch:
4853 if options.force:
4854 RunGit(['branch', '-D', options.newbranch],
4855 stderr=subprocess2.PIPE, error_ok=True)
4856 RunGit(['new-branch', options.newbranch])
4857
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004858 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004859
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004860 if detected_codereview_from_url:
Edward Lemurf38bc172019-09-03 21:02:13 +00004861 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004862
Edward Lemurf38bc172019-09-03 21:02:13 +00004863 return cl.CMDPatchWithParsedIssue(
4864 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004865
4866
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004867def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004868 """Fetches the tree status and returns either 'open', 'closed',
4869 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004870 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004871 if url:
4872 status = urllib2.urlopen(url).read().lower()
4873 if status.find('closed') != -1 or status == '0':
4874 return 'closed'
4875 elif status.find('open') != -1 or status == '1':
4876 return 'open'
4877 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004878 return 'unset'
4879
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004880
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004881def GetTreeStatusReason():
4882 """Fetches the tree status from a json url and returns the message
4883 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004884 url = settings.GetTreeStatusUrl()
4885 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004886 connection = urllib2.urlopen(json_url)
4887 status = json.loads(connection.read())
4888 connection.close()
4889 return status['message']
4890
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004891
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004892@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004893def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004894 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004895 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004896 status = GetTreeStatus()
4897 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004898 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004899 return 2
4900
vapiera7fbd5a2016-06-16 09:17:49 -07004901 print('The tree is %s' % status)
4902 print()
4903 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004904 if status != 'open':
4905 return 1
4906 return 0
4907
4908
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004909@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004910def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004911 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4912 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004913 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004914 '-b', '--bot', action='append',
4915 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4916 'times to specify multiple builders. ex: '
4917 '"-b win_rel -b win_layout". See '
4918 'the try server waterfall for the builders name and the tests '
4919 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004920 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004921 '-B', '--bucket', default='',
4922 help=('Buildbucket bucket to send the try requests.'))
4923 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004924 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004925 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004926 'be determined by the try recipe that builder runs, which usually '
4927 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004928 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004929 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004930 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004931 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004932 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004933 '--category', default='git_cl_try', help='Specify custom build category.')
4934 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004935 '--project',
4936 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004937 'in recipe to determine to which repository or directory to '
4938 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004939 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004940 '-p', '--property', dest='properties', action='append', default=[],
4941 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004942 'key2=value2 etc. The value will be treated as '
4943 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004944 'NOTE: using this may make your tryjob not usable for CQ, '
4945 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004946 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004947 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4948 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004949 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004950 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004951 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004952 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00004953 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004954 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004955
machenbach@chromium.org45453142015-09-15 08:45:22 +00004956 # Make sure that all properties are prop=value pairs.
4957 bad_params = [x for x in options.properties if '=' not in x]
4958 if bad_params:
4959 parser.error('Got properties with missing "=": %s' % bad_params)
4960
maruel@chromium.org15192402012-09-06 12:38:29 +00004961 if args:
4962 parser.error('Unknown arguments: %s' % args)
4963
Edward Lemurf38bc172019-09-03 21:02:13 +00004964 cl = Changelist(auth_config=auth_config, issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004965 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004966 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004967
Edward Lemurf38bc172019-09-03 21:02:13 +00004968 # HACK: warm up Gerrit change detail cache to save on RPCs.
4969 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004970
tandriie113dfd2016-10-11 10:20:12 -07004971 error_message = cl.CannotTriggerTryJobReason()
4972 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004973 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004974
qyearsley1fdfcb62016-10-24 13:22:03 -07004975 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004976
qyearsleydd49f942016-10-28 11:57:22 -07004977 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4978 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004979 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004980 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004981 print('git cl try with no bots now defaults to CQ dry run.')
4982 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4983 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004984
borenet6c0efe62016-10-19 08:13:29 -07004985 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004986 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004987 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004988 'of bot requires an initial job from a parent (usually a builder). '
4989 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004990 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004991 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004992
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004993 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07004994 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004995 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07004996 except BuildbucketResponseException as ex:
4997 print('ERROR: %s' % ex)
4998 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00004999 return 0
5000
5001
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005002@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005003def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005004 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005005 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005006 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005007 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005008 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005009 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005010 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005011 '--color', action='store_true', default=setup_color.IS_TTY,
5012 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005013 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005014 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5015 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005016 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005017 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005018 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005019 parser.add_option_group(group)
5020 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005021 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005022 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00005023 _process_codereview_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005024 if args:
5025 parser.error('Unrecognized args: %s' % ' '.join(args))
5026
5027 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemurf38bc172019-09-03 21:02:13 +00005028 cl = Changelist(issue=options.issue, auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005029 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005030 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005031
tandrii221ab252016-10-06 08:12:04 -07005032 patchset = options.patchset
5033 if not patchset:
5034 patchset = cl.GetMostRecentPatchset()
5035 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005036 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005037 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005038 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005039 cl.GetIssue())
5040
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005041 try:
tandrii221ab252016-10-06 08:12:04 -07005042 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005043 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005044 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005045 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005046 if options.json:
5047 write_try_results_json(options.json, jobs)
5048 else:
5049 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005050 return 0
5051
5052
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005053@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005054@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005055def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005056 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005057 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005058 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005059 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005060
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005061 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005062 if args:
5063 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005064 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005065 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005066 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005067 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005068
5069 # Clear configured merge-base, if there is one.
5070 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005071 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005072 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005073 return 0
5074
5075
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005076@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005077def CMDweb(parser, args):
5078 """Opens the current CL in the web browser."""
5079 _, args = parser.parse_args(args)
5080 if args:
5081 parser.error('Unrecognized args: %s' % ' '.join(args))
5082
5083 issue_url = Changelist().GetIssueURL()
5084 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005085 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005086 return 1
5087
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005088 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005089 # allows us to hide the "Created new window in existing browser session."
5090 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005091 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005092 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005093 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005094 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005095 os.open(os.devnull, os.O_RDWR)
5096 try:
5097 webbrowser.open(issue_url)
5098 finally:
5099 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005100 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005101 return 0
5102
5103
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005104@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005105def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005106 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005107 parser.add_option('-d', '--dry-run', action='store_true',
5108 help='trigger in dry run mode')
5109 parser.add_option('-c', '--clear', action='store_true',
5110 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005111 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005112 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005113 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00005114 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005115 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005116 if args:
5117 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005118 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005119 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005120
Edward Lemurf38bc172019-09-03 21:02:13 +00005121 cl = Changelist(auth_config=auth_config, issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005122 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005123 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005124 elif options.dry_run:
5125 state = _CQState.DRY_RUN
5126 else:
5127 state = _CQState.COMMIT
5128 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005129 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07005130 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005131 return 0
5132
5133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005134@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005135def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005136 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005137 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005138 auth.add_auth_options(parser)
5139 options, args = parser.parse_args(args)
Edward Lemurf38bc172019-09-03 21:02:13 +00005140 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005141 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005142 if args:
5143 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemurf38bc172019-09-03 21:02:13 +00005144 cl = Changelist(auth_config=auth_config, issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005145 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005146 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005147 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005148 cl.CloseIssue()
5149 return 0
5150
5151
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005152@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005153def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005154 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005155 parser.add_option(
5156 '--stat',
5157 action='store_true',
5158 dest='stat',
5159 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005160 auth.add_auth_options(parser)
5161 options, args = parser.parse_args(args)
5162 auth_config = auth.extract_auth_config_from_options(options)
5163 if args:
5164 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005165
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005166 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005167 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005168 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005169 if not issue:
5170 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005171
Aaron Gablea718c3e2017-08-28 17:47:28 -07005172 base = cl._GitGetBranchConfigValue('last-upload-hash')
5173 if not base:
5174 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5175 if not base:
5176 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5177 revision_info = detail['revisions'][detail['current_revision']]
5178 fetch_info = revision_info['fetch']['http']
5179 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5180 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005181
Aaron Gablea718c3e2017-08-28 17:47:28 -07005182 cmd = ['git', 'diff']
5183 if options.stat:
5184 cmd.append('--stat')
5185 cmd.append(base)
5186 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005187
5188 return 0
5189
5190
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005191@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005192def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005193 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005194 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005195 '--ignore-current',
5196 action='store_true',
5197 help='Ignore the CL\'s current reviewers and start from scratch.')
5198 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005199 '--ignore-self',
5200 action='store_true',
5201 help='Do not consider CL\'s author as an owners.')
5202 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005203 '--no-color',
5204 action='store_true',
5205 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005206 parser.add_option(
5207 '--batch',
5208 action='store_true',
5209 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005210 # TODO: Consider moving this to another command, since other
5211 # git-cl owners commands deal with owners for a given CL.
5212 parser.add_option(
5213 '--show-all',
5214 action='store_true',
5215 help='Show all owners for a particular file')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005216 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005217 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005218 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005219
5220 author = RunGit(['config', 'user.email']).strip() or None
5221
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005222 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005223
Yang Guo6e269a02019-06-26 11:17:02 +00005224 if options.show_all:
5225 for arg in args:
5226 base_branch = cl.GetCommonAncestorWithUpstream()
5227 change = cl.GetChange(base_branch, None)
5228 database = owners.Database(change.RepositoryRoot(), file, os.path)
5229 database.load_data_needed_for([arg])
5230 print('Owners for %s:' % arg)
5231 for owner in sorted(database.all_possible_owners([arg], None)):
5232 print(' - %s' % owner)
5233 return 0
5234
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005235 if args:
5236 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005237 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005238 base_branch = args[0]
5239 else:
5240 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005241 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005242
5243 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005244 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5245
5246 if options.batch:
5247 db = owners.Database(change.RepositoryRoot(), file, os.path)
5248 print('\n'.join(db.reviewers_for(affected_files, author)))
5249 return 0
5250
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005251 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005252 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005253 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005254 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005255 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005256 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005257 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005258 override_files=change.OriginalOwnersFiles(),
5259 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005260
5261
Aiden Bennerc08566e2018-10-03 17:52:42 +00005262def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005263 """Generates a diff command."""
5264 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005265 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5266
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005267 if allow_prefix:
5268 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5269 # case that diff.noprefix is set in the user's git config.
5270 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5271 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005272 diff_cmd += ['--no-prefix']
5273
5274 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005275
5276 if args:
5277 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005278 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005279 diff_cmd.append(arg)
5280 else:
5281 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005282
5283 return diff_cmd
5284
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005285
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005286def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005287 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005288 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005289
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005290
enne@chromium.org555cfe42014-01-29 18:21:39 +00005291@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005292@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005293def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005294 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005295 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005296 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005297 parser.add_option('--full', action='store_true',
5298 help='Reformat the full content of all touched files')
5299 parser.add_option('--dry-run', action='store_true',
5300 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005301 parser.add_option(
5302 '--python',
5303 action='store_true',
5304 default=None,
5305 help='Enables python formatting on all python files.')
5306 parser.add_option(
5307 '--no-python',
5308 action='store_true',
5309 dest='python',
5310 help='Disables python formatting on all python files. '
5311 'Takes precedence over --python. '
5312 'If neither --python or --no-python are set, python '
5313 'files that have a .style.yapf file in an ancestor '
5314 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005315 parser.add_option('--js', action='store_true',
5316 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005317 parser.add_option('--diff', action='store_true',
5318 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005319 parser.add_option('--presubmit', action='store_true',
5320 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005321 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005322
Daniel Chengc55eecf2016-12-30 03:11:02 -08005323 # Normalize any remaining args against the current path, so paths relative to
5324 # the current directory are still resolved as expected.
5325 args = [os.path.join(os.getcwd(), arg) for arg in args]
5326
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005327 # git diff generates paths against the root of the repository. Change
5328 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005329 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005330 if rel_base_path:
5331 os.chdir(rel_base_path)
5332
digit@chromium.org29e47272013-05-17 17:01:46 +00005333 # Grab the merge-base commit, i.e. the upstream commit of the current
5334 # branch when it was created or the last time it was rebased. This is
5335 # to cover the case where the user may have called "git fetch origin",
5336 # moving the origin branch to a newer commit, but hasn't rebased yet.
5337 upstream_commit = None
5338 cl = Changelist()
5339 upstream_branch = cl.GetUpstreamBranch()
5340 if upstream_branch:
5341 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5342 upstream_commit = upstream_commit.strip()
5343
5344 if not upstream_commit:
5345 DieWithError('Could not find base commit for this branch. '
5346 'Are you in detached state?')
5347
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005348 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5349 diff_output = RunGit(changed_files_cmd)
5350 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005351 # Filter out files deleted by this CL
5352 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005353
Christopher Lamc5ba6922017-01-24 11:19:14 +11005354 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005355 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005356
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005357 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5358 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5359 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005360 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005361
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005362 top_dir = os.path.normpath(
5363 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5364
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005365 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5366 # formatted. This is used to block during the presubmit.
5367 return_value = 0
5368
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005369 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005370 # Locate the clang-format binary in the checkout
5371 try:
5372 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005373 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005374 DieWithError(e)
5375
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005376 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005377 cmd = [clang_format_tool]
5378 if not opts.dry_run and not opts.diff:
5379 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005380 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005381 if opts.diff:
5382 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005383 else:
5384 env = os.environ.copy()
5385 env['PATH'] = str(os.path.dirname(clang_format_tool))
5386 try:
5387 script = clang_format.FindClangFormatScriptInChromiumTree(
5388 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005389 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005390 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005391
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005392 cmd = [sys.executable, script, '-p0']
5393 if not opts.dry_run and not opts.diff:
5394 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005395
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005396 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5397 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005398
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005399 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5400 if opts.diff:
5401 sys.stdout.write(stdout)
5402 if opts.dry_run and len(stdout) > 0:
5403 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005404
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005405 # Similar code to above, but using yapf on .py files rather than clang-format
5406 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005407 py_explicitly_disabled = opts.python is not None and not opts.python
5408 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005409 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5410 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5411 if sys.platform.startswith('win'):
5412 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005413
Aiden Bennerc08566e2018-10-03 17:52:42 +00005414 # If we couldn't find a yapf file we'll default to the chromium style
5415 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005416 chromium_default_yapf_style = os.path.join(depot_tools_path,
5417 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005418 # Used for caching.
5419 yapf_configs = {}
5420 for f in python_diff_files:
5421 # Find the yapf style config for the current file, defaults to depot
5422 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005423 _FindYapfConfigFile(f, yapf_configs, top_dir)
5424
5425 # Turn on python formatting by default if a yapf config is specified.
5426 # This breaks in the case of this repo though since the specified
5427 # style file is also the global default.
5428 if opts.python is None:
5429 filtered_py_files = []
5430 for f in python_diff_files:
5431 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5432 filtered_py_files.append(f)
5433 else:
5434 filtered_py_files = python_diff_files
5435
5436 # Note: yapf still seems to fix indentation of the entire file
5437 # even if line ranges are specified.
5438 # See https://github.com/google/yapf/issues/499
5439 if not opts.full and filtered_py_files:
5440 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5441
5442 for f in filtered_py_files:
5443 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5444 if yapf_config is None:
5445 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005446
5447 cmd = [yapf_tool, '--style', yapf_config, f]
5448
5449 has_formattable_lines = False
5450 if not opts.full:
5451 # Only run yapf over changed line ranges.
5452 for diff_start, diff_len in py_line_diffs[f]:
5453 diff_end = diff_start + diff_len - 1
5454 # Yapf errors out if diff_end < diff_start but this
5455 # is a valid line range diff for a removal.
5456 if diff_end >= diff_start:
5457 has_formattable_lines = True
5458 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5459 # If all line diffs were removals we have nothing to format.
5460 if not has_formattable_lines:
5461 continue
5462
5463 if opts.diff or opts.dry_run:
5464 cmd += ['--diff']
5465 # Will return non-zero exit code if non-empty diff.
5466 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5467 if opts.diff:
5468 sys.stdout.write(stdout)
5469 elif len(stdout) > 0:
5470 return_value = 2
5471 else:
5472 cmd += ['-i']
5473 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005474
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005475 # Dart's formatter does not have the nice property of only operating on
5476 # modified chunks, so hard code full.
5477 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005478 try:
5479 command = [dart_format.FindDartFmtToolInChromiumTree()]
5480 if not opts.dry_run and not opts.diff:
5481 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005482 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005483
ppi@chromium.org6593d932016-03-03 15:41:15 +00005484 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005485 if opts.dry_run and stdout:
5486 return_value = 2
5487 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5489 'found in this checkout. Files in other languages are still '
5490 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005491
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005492 # Format GN build files. Always run on full build files for canonical form.
5493 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005494 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005495 if opts.dry_run or opts.diff:
5496 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005497 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005498 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5499 shell=sys.platform == 'win32',
5500 cwd=top_dir)
5501 if opts.dry_run and gn_ret == 2:
5502 return_value = 2 # Not formatted.
5503 elif opts.diff and gn_ret == 2:
5504 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005505 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005506 elif gn_ret != 0:
5507 # For non-dry run cases (and non-2 return values for dry-run), a
5508 # nonzero error code indicates a failure, probably because the file
5509 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005510 DieWithError('gn format failed on ' + gn_diff_file +
5511 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005512
Ilya Shermane081cbe2017-08-15 17:51:04 -07005513 # Skip the metrics formatting from the global presubmit hook. These files have
5514 # a separate presubmit hook that issues an error if the files need formatting,
5515 # whereas the top-level presubmit script merely issues a warning. Formatting
5516 # these files is somewhat slow, so it's important not to duplicate the work.
5517 if not opts.presubmit:
5518 for xml_dir in GetDirtyMetricsDirs(diff_files):
5519 tool_dir = os.path.join(top_dir, xml_dir)
5520 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5521 if opts.dry_run or opts.diff:
5522 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005523 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005524 if opts.diff:
5525 sys.stdout.write(stdout)
5526 if opts.dry_run and stdout:
5527 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005528
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005529 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005530
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005531
Steven Holte2e664bf2017-04-21 13:10:47 -07005532def GetDirtyMetricsDirs(diff_files):
5533 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5534 metrics_xml_dirs = [
5535 os.path.join('tools', 'metrics', 'actions'),
5536 os.path.join('tools', 'metrics', 'histograms'),
5537 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005538 os.path.join('tools', 'metrics', 'ukm'),
5539 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005540 for xml_dir in metrics_xml_dirs:
5541 if any(file.startswith(xml_dir) for file in xml_diff_files):
5542 yield xml_dir
5543
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005544
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005545@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005546@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005547def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005548 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005549 _, args = parser.parse_args(args)
5550
5551 if len(args) != 1:
5552 parser.print_help()
5553 return 1
5554
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005555 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005556 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005557 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005558
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005559 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005560
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005561 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005562 output = RunGit(['config', '--local', '--get-regexp',
5563 r'branch\..*\.%s' % issueprefix],
5564 error_ok=True)
5565 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005566 if issue == target_issue:
5567 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005568
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005569 branches = []
5570 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005571 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005572 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005573 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005574 return 1
5575 if len(branches) == 1:
5576 RunGit(['checkout', branches[0]])
5577 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005578 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005579 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005580 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005581 which = raw_input('Choose by index: ')
5582 try:
5583 RunGit(['checkout', branches[int(which)]])
5584 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005585 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005586 return 1
5587
5588 return 0
5589
5590
maruel@chromium.org29404b52014-09-08 22:58:00 +00005591def CMDlol(parser, args):
5592 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005593 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005594 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5595 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5596 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005597 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005598 return 0
5599
5600
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005601class OptionParser(optparse.OptionParser):
5602 """Creates the option parse and add --verbose support."""
5603 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005604 optparse.OptionParser.__init__(
5605 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005606 self.add_option(
5607 '-v', '--verbose', action='count', default=0,
5608 help='Use 2 times for more debugging info')
5609
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005610 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005611 try:
5612 return self._parse_args(args)
5613 finally:
5614 # Regardless of success or failure of args parsing, we want to report
5615 # metrics, but only after logging has been initialized (if parsing
5616 # succeeded).
5617 global settings
5618 settings = Settings()
5619
5620 if not metrics.DISABLE_METRICS_COLLECTION:
5621 # GetViewVCUrl ultimately calls logging method.
5622 project_url = settings.GetViewVCUrl().strip('/+')
5623 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5624 metrics.collector.add('project_urls', [project_url])
5625
5626 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005627 # Create an optparse.Values object that will store only the actual passed
5628 # options, without the defaults.
5629 actual_options = optparse.Values()
5630 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5631 # Create an optparse.Values object with the default options.
5632 options = optparse.Values(self.get_default_values().__dict__)
5633 # Update it with the options passed by the user.
5634 options._update_careful(actual_options.__dict__)
5635 # Store the options passed by the user in an _actual_options attribute.
5636 # We store only the keys, and not the values, since the values can contain
5637 # arbitrary information, which might be PII.
5638 metrics.collector.add('arguments', actual_options.__dict__.keys())
5639
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005640 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005641 logging.basicConfig(
5642 level=levels[min(options.verbose, len(levels) - 1)],
5643 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5644 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005645
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005646 return options, args
5647
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005648
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005649def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005650 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005651 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005652 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005653 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005654
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005655 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005656 dispatcher = subcommand.CommandDispatcher(__name__)
5657 try:
5658 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005659 except auth.AuthenticationError as e:
5660 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005661 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005662 if e.code != 500:
5663 raise
5664 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005665 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005666 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005667 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005668
5669
5670if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005671 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5672 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005673 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005674 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005675 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005676 sys.exit(main(sys.argv[1:]))