blob: f8b1596008cc55fe2f2489607a05686d9cb133d2 [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
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000032import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000033import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000035import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000036import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000037import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000038import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000039
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000040from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000041from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000042import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000043import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000044import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000045import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000046import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000047import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000048import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000049import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000050import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000051import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000052import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000053import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000054import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import presubmit_support
57import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040058import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000059import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000060import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import watchlists
62
tandrii7400cf02016-06-21 08:48:07 -070063__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
Edward Lemur0f58ae42019-04-30 17:24:12 +000065# Traces for git push will be stored in a traces directory inside the
66# depot_tools checkout.
67DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
68TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
69
70# When collecting traces, Git hashes will be reduced to 6 characters to reduce
71# the size after compression.
72GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
73# Used to redact the cookies from the gitcookies file.
74GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
75
Edward Lemur1b52d872019-05-09 21:12:12 +000076# The maximum number of traces we will keep. Multiplied by 3 since we store
77# 3 files per trace.
78MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000079# Message to be displayed to the user to inform where to find the traces for a
80# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000081TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000082'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000083'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000084' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000085'Copies of your gitcookies file and git config have been recorded at:\n'
86' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000087# Format of the message to be stored as part of the traces to give developers a
88# better context when they go through traces.
89TRACES_README_FORMAT = (
90'Date: %(now)s\n'
91'\n'
92'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
93'Title: %(title)s\n'
94'\n'
95'%(description)s\n'
96'\n'
97'Execution time: %(execution_time)s\n'
98'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000099
tandrii9d2c7a32016-06-22 03:42:45 -0700100COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800101POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000103REFS_THAT_ALIAS_TO_OTHER_REFS = {
104 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
105 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
106}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000107
thestig@chromium.org44202a22014-03-11 19:22:18 +0000108# Valid extensions for files we want to lint.
109DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
110DEFAULT_LINT_IGNORE_REGEX = r"$^"
111
Aiden Bennerc08566e2018-10-03 17:52:42 +0000112# File name for yapf style config files.
113YAPF_CONFIG_FILENAME = '.style.yapf'
114
borenet6c0efe62016-10-19 08:13:29 -0700115# Buildbucket master name prefix.
116MASTER_PREFIX = 'master.'
117
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000118# Shortcut since it quickly becomes redundant.
119Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000120
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000121# Initialized in main()
122settings = None
123
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100124# Used by tests/git_cl_test.py to add extra logging.
125# Inside the weirdly failing test, add this:
126# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700127# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100128_IS_BEING_TESTED = False
129
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000130
Christopher Lamf732cd52017-01-24 12:40:11 +1100131def DieWithError(message, change_desc=None):
132 if change_desc:
133 SaveDescriptionBackup(change_desc)
134
vapiera7fbd5a2016-06-16 09:17:49 -0700135 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136 sys.exit(1)
137
138
Christopher Lamf732cd52017-01-24 12:40:11 +1100139def SaveDescriptionBackup(change_desc):
140 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000141 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100142 backup_file = open(backup_path, 'w')
143 backup_file.write(change_desc.description)
144 backup_file.close()
145
146
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000147def GetNoGitPagerEnv():
148 env = os.environ.copy()
149 # 'cat' is a magical git string that disables pagers on all platforms.
150 env['GIT_PAGER'] = 'cat'
151 return env
152
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000153
bsep@chromium.org627d9002016-04-29 00:00:52 +0000154def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000156 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000157 except subprocess2.CalledProcessError as e:
158 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000159 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000161 'Command "%s" failed.\n%s' % (
162 ' '.join(args), error_message or e.stdout or ''))
163 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000164
165
166def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000167 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000168 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000169
170
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000171def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000172 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700173 if suppress_stderr:
174 stderr = subprocess2.VOID
175 else:
176 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000177 try:
tandrii5d48c322016-08-18 16:19:37 -0700178 (out, _), code = subprocess2.communicate(['git'] + args,
179 env=GetNoGitPagerEnv(),
180 stdout=subprocess2.PIPE,
181 stderr=stderr)
182 return code, out
183 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900184 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700185 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000186
187
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000188def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000189 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000190 return RunGitWithCode(args, suppress_stderr=True)[1]
191
192
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000193def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000194 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000196 return (version.startswith(prefix) and
197 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000198
199
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000200def BranchExists(branch):
201 """Return True if specified branch exists."""
202 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
203 suppress_stderr=True)
204 return not code
205
206
tandrii2a16b952016-10-19 07:09:44 -0700207def time_sleep(seconds):
208 # Use this so that it can be mocked in tests without interfering with python
209 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700210 return time.sleep(seconds)
211
212
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000213def time_time():
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
216 return time.time()
217
218
Edward Lemur1b52d872019-05-09 21:12:12 +0000219def datetime_now():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return datetime.datetime.now()
223
224
maruel@chromium.org90541732011-04-01 17:54:18 +0000225def ask_for_data(prompt):
226 try:
227 return raw_input(prompt)
228 except KeyboardInterrupt:
229 # Hide the exception.
230 sys.exit(1)
231
232
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100233def confirm_or_exit(prefix='', action='confirm'):
234 """Asks user to press enter to continue or press Ctrl+C to abort."""
235 if not prefix or prefix.endswith('\n'):
236 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100237 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100238 mid = ' Press'
239 elif prefix.endswith(' '):
240 mid = 'press'
241 else:
242 mid = ' press'
243 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
244
245
246def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000247 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100248 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
249 while True:
250 if 'yes'.startswith(result):
251 return True
252 if 'no'.startswith(result):
253 return False
254 result = ask_for_data('Please, type yes or no: ').lower()
255
256
tandrii5d48c322016-08-18 16:19:37 -0700257def _git_branch_config_key(branch, key):
258 """Helper method to return Git config key for a branch."""
259 assert branch, 'branch name is required to set git config for it'
260 return 'branch.%s.%s' % (branch, key)
261
262
263def _git_get_branch_config_value(key, default=None, value_type=str,
264 branch=False):
265 """Returns git config value of given or current branch if any.
266
267 Returns default in all other cases.
268 """
269 assert value_type in (int, str, bool)
270 if branch is False: # Distinguishing default arg value from None.
271 branch = GetCurrentBranch()
272
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000273 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700274 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000275
tandrii5d48c322016-08-18 16:19:37 -0700276 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700277 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700278 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700279 # git config also has --int, but apparently git config suffers from integer
280 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700281 args.append(_git_branch_config_key(branch, key))
282 code, out = RunGitWithCode(args)
283 if code == 0:
284 value = out.strip()
285 if value_type == int:
286 return int(value)
287 if value_type == bool:
288 return bool(value.lower() == 'true')
289 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000290 return default
291
292
tandrii5d48c322016-08-18 16:19:37 -0700293def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000294 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700295
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000296 If value is None, the key will be unset, otherwise it will be set.
297 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700298 """
299 if not branch:
300 branch = GetCurrentBranch()
301 assert branch, 'a branch name OR currently checked out branch is required'
302 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700303 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700304 if value is None:
305 args.append('--unset')
306 elif isinstance(value, bool):
307 args.append('--bool')
308 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700309 else:
tandrii33a46ff2016-08-23 05:53:40 -0700310 # git config also has --int, but apparently git config suffers from integer
311 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700312 value = str(value)
313 args.append(_git_branch_config_key(branch, key))
314 if value is not None:
315 args.append(value)
316 RunGit(args, **kwargs)
317
318
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100319def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700320 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100321
322 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
323 """
324 # Git also stores timezone offset, but it only affects visual display,
325 # actual point in time is defined by this timestamp only.
326 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
327
328
329def _git_amend_head(message, committer_timestamp):
330 """Amends commit with new message and desired committer_timestamp.
331
332 Sets committer timezone to UTC.
333 """
334 env = os.environ.copy()
335 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
336 return RunGit(['commit', '--amend', '-m', message], env=env)
337
338
machenbach@chromium.org45453142015-09-15 08:45:22 +0000339def _get_properties_from_options(options):
340 properties = dict(x.split('=', 1) for x in options.properties)
341 for key, val in properties.iteritems():
342 try:
343 properties[key] = json.loads(val)
344 except ValueError:
345 pass # If a value couldn't be evaluated, treat it as a string.
346 return properties
347
348
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000349def _prefix_master(master):
350 """Convert user-specified master name to full master name.
351
352 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
353 name, while the developers always use shortened master name
354 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
355 function does the conversion for buildbucket migration.
356 """
borenet6c0efe62016-10-19 08:13:29 -0700357 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000358 return master
borenet6c0efe62016-10-19 08:13:29 -0700359 return '%s%s' % (MASTER_PREFIX, master)
360
361
362def _unprefix_master(bucket):
363 """Convert bucket name to shortened master name.
364
365 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
366 name, while the developers always use shortened master name
367 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
368 function does the conversion for buildbucket migration.
369 """
370 if bucket.startswith(MASTER_PREFIX):
371 return bucket[len(MASTER_PREFIX):]
372 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000373
374
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000375def _buildbucket_retry(operation_name, http, *args, **kwargs):
376 """Retries requests to buildbucket service and returns parsed json content."""
377 try_count = 0
378 while True:
379 response, content = http.request(*args, **kwargs)
380 try:
381 content_json = json.loads(content)
382 except ValueError:
383 content_json = None
384
385 # Buildbucket could return an error even if status==200.
386 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error = content_json.get('error')
388 if error.get('code') == 403:
389 raise BuildbucketResponseException(
390 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000391 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000392 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000393 raise BuildbucketResponseException(msg)
394
395 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700396 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000397 raise BuildbucketResponseException(
398 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700399 'Please file bugs at http://crbug.com, '
400 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000401 content)
402 return content_json
403 if response.status < 500 or try_count >= 2:
404 raise httplib2.HttpLib2Error(content)
405
406 # status >= 500 means transient failures.
407 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700408 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000409 try_count += 1
410 assert False, 'unreachable'
411
412
qyearsley1fdfcb62016-10-24 13:22:03 -0700413def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700414 """Returns a dict mapping bucket names to builders and tests,
415 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700416 """
qyearsleydd49f942016-10-28 11:57:22 -0700417 # If no bots are listed, we try to get a set of builders and tests based
418 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 if not options.bot:
420 change = changelist.GetChange(
421 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700422 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700423 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700424 change=change,
425 changed_files=change.LocalPaths(),
426 repository_root=settings.GetRoot(),
427 default_presubmit=None,
428 project=None,
429 verbose=options.verbose,
430 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700431 if masters is None:
432 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100433 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700434
qyearsley1fdfcb62016-10-24 13:22:03 -0700435 if options.bucket:
436 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700437 if options.master:
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000438 print(
439 'WARNING: "-m <master>" option is deprecated. Use -B <bucket> instead.')
qyearsleydd49f942016-10-28 11:57:22 -0700440 return {_prefix_master(options.master): {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000441 option_parser.error(
442 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800445def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700446 """Sends a request to Buildbucket to trigger try jobs for a changelist.
447
448 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700449 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 changelist: Changelist that the try jobs are associated with.
451 buckets: A nested dict mapping bucket names to builders to tests.
452 options: Command-line options.
453 """
tandriide281ae2016-10-12 06:02:30 -0700454 assert changelist.GetIssue(), 'CL must be uploaded first'
455 codereview_url = changelist.GetCodereviewServer()
456 assert codereview_url, 'CL must be uploaded first'
457 patchset = patchset or changelist.GetMostRecentPatchset()
458 assert patchset, 'CL must be uploaded first'
459
460 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700461 # Cache the buildbucket credentials under the codereview host key, so that
462 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700463 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000464 http = authenticator.authorize(httplib2.Http())
465 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700466
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000467 buildbucket_put_url = (
468 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000469 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000470 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700471 hostname=codereview_host,
472 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000473 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700474
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700475 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800476 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700477 if options.clobber:
478 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700479 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700480 if extra_properties:
481 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000482
483 batch_req_body = {'builds': []}
484 print_text = []
485 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700486 for bucket, builders_and_tests in sorted(buckets.iteritems()):
487 print_text.append('Bucket: %s' % bucket)
488 master = None
489 if bucket.startswith(MASTER_PREFIX):
490 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000491 for builder, tests in sorted(builders_and_tests.iteritems()):
492 print_text.append(' %s: %s' % (builder, tests))
493 parameters = {
494 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000495 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100496 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000497 'revision': options.revision,
498 }],
tandrii8c5a3532016-11-04 07:52:02 -0700499 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000501 if 'presubmit' in builder.lower():
502 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000503 if tests:
504 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700505
506 tags = [
507 'builder:%s' % builder,
508 'buildset:%s' % buildset,
509 'user_agent:git_cl_try',
510 ]
511 if master:
512 parameters['properties']['master'] = master
513 tags.append('master:%s' % master)
514
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000515 batch_req_body['builds'].append(
516 {
517 'bucket': bucket,
518 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700520 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000521 }
522 )
523
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000524 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700525 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526 http,
527 buildbucket_put_url,
528 'PUT',
529 body=json.dumps(batch_req_body),
530 headers={'Content-Type': 'application/json'}
531 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000532 print_text.append('To see results here, run: git cl try-results')
533 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700534 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000535
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000536
tandrii221ab252016-10-06 08:12:04 -0700537def fetch_try_jobs(auth_config, changelist, buildbucket_host,
538 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700539 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540
qyearsley53f48a12016-09-01 10:45:13 -0700541 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000542 """
tandrii221ab252016-10-06 08:12:04 -0700543 assert buildbucket_host
544 assert changelist.GetIssue(), 'CL must be uploaded first'
545 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
546 patchset = patchset or changelist.GetMostRecentPatchset()
547 assert patchset, 'CL must be uploaded first'
548
549 codereview_url = changelist.GetCodereviewServer()
550 codereview_host = urlparse.urlparse(codereview_url).hostname
551 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 if authenticator.has_cached_credentials():
553 http = authenticator.authorize(httplib2.Http())
554 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700555 print('Warning: Some results might be missing because %s' %
556 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700557 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 http = httplib2.Http()
559
560 http.force_exception_to_status_code = True
561
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000562 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700563 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700565 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 params = {'tag': 'buildset:%s' % buildset}
567
568 builds = {}
569 while True:
570 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700571 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700573 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000574 for build in content.get('builds', []):
575 builds[build['id']] = build
576 if 'next_cursor' in content:
577 params['start_cursor'] = content['next_cursor']
578 else:
579 break
580 return builds
581
582
qyearsleyeab3c042016-08-24 09:18:28 -0700583def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 """Prints nicely result of fetch_try_jobs."""
585 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700586 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587 return
588
589 # Make a copy, because we'll be modifying builds dictionary.
590 builds = builds.copy()
591 builder_names_cache = {}
592
593 def get_builder(b):
594 try:
595 return builder_names_cache[b['id']]
596 except KeyError:
597 try:
598 parameters = json.loads(b['parameters_json'])
599 name = parameters['builder_name']
600 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700601 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700602 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 name = None
604 builder_names_cache[b['id']] = name
605 return name
606
607 def get_bucket(b):
608 bucket = b['bucket']
609 if bucket.startswith('master.'):
610 return bucket[len('master.'):]
611 return bucket
612
613 if options.print_master:
614 name_fmt = '%%-%ds %%-%ds' % (
615 max(len(str(get_bucket(b))) for b in builds.itervalues()),
616 max(len(str(get_builder(b))) for b in builds.itervalues()))
617 def get_name(b):
618 return name_fmt % (get_bucket(b), get_builder(b))
619 else:
620 name_fmt = '%%-%ds' % (
621 max(len(str(get_builder(b))) for b in builds.itervalues()))
622 def get_name(b):
623 return name_fmt % get_builder(b)
624
625 def sort_key(b):
626 return b['status'], b.get('result'), get_name(b), b.get('url')
627
628 def pop(title, f, color=None, **kwargs):
629 """Pop matching builds from `builds` dict and print them."""
630
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000631 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632 colorize = str
633 else:
634 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
635
636 result = []
637 for b in builds.values():
638 if all(b.get(k) == v for k, v in kwargs.iteritems()):
639 builds.pop(b['id'])
640 result.append(b)
641 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700642 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000643 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700644 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000645
646 total = len(builds)
647 pop(status='COMPLETED', result='SUCCESS',
648 title='Successes:', color=Fore.GREEN,
649 f=lambda b: (get_name(b), b.get('url')))
650 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
651 title='Infra Failures:', color=Fore.MAGENTA,
652 f=lambda b: (get_name(b), b.get('url')))
653 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
654 title='Failures:', color=Fore.RED,
655 f=lambda b: (get_name(b), b.get('url')))
656 pop(status='COMPLETED', result='CANCELED',
657 title='Canceled:', color=Fore.MAGENTA,
658 f=lambda b: (get_name(b),))
659 pop(status='COMPLETED', result='FAILURE',
660 failure_reason='INVALID_BUILD_DEFINITION',
661 title='Wrong master/builder name:', color=Fore.MAGENTA,
662 f=lambda b: (get_name(b),))
663 pop(status='COMPLETED', result='FAILURE',
664 title='Other failures:',
665 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
666 pop(status='COMPLETED',
667 title='Other finished:',
668 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
669 pop(status='STARTED',
670 title='Started:', color=Fore.YELLOW,
671 f=lambda b: (get_name(b), b.get('url')))
672 pop(status='SCHEDULED',
673 title='Scheduled:',
674 f=lambda b: (get_name(b), 'id=%s' % b['id']))
675 # The last section is just in case buildbucket API changes OR there is a bug.
676 pop(title='Other:',
677 f=lambda b: (get_name(b), 'id=%s' % b['id']))
678 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700679 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000680
681
Aiden Bennerc08566e2018-10-03 17:52:42 +0000682def _ComputeDiffLineRanges(files, upstream_commit):
683 """Gets the changed line ranges for each file since upstream_commit.
684
685 Parses a git diff on provided files and returns a dict that maps a file name
686 to an ordered list of range tuples in the form (start_line, count).
687 Ranges are in the same format as a git diff.
688 """
689 # If files is empty then diff_output will be a full diff.
690 if len(files) == 0:
691 return {}
692
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000693 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000694 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
695 diff_output = RunGit(diff_cmd)
696
697 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
698 # 2 capture groups
699 # 0 == fname of diff file
700 # 1 == 'diff_start,diff_count' or 'diff_start'
701 # will match each of
702 # diff --git a/foo.foo b/foo.py
703 # @@ -12,2 +14,3 @@
704 # @@ -12,2 +17 @@
705 # running re.findall on the above string with pattern will give
706 # [('foo.py', ''), ('', '14,3'), ('', '17')]
707
708 curr_file = None
709 line_diffs = {}
710 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
711 if match[0] != '':
712 # Will match the second filename in diff --git a/a.py b/b.py.
713 curr_file = match[0]
714 line_diffs[curr_file] = []
715 else:
716 # Matches +14,3
717 if ',' in match[1]:
718 diff_start, diff_count = match[1].split(',')
719 else:
720 # Single line changes are of the form +12 instead of +12,1.
721 diff_start = match[1]
722 diff_count = 1
723
724 diff_start = int(diff_start)
725 diff_count = int(diff_count)
726
727 # If diff_count == 0 this is a removal we can ignore.
728 line_diffs[curr_file].append((diff_start, diff_count))
729
730 return line_diffs
731
732
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000733def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000734 """Checks if a yapf file is in any parent directory of fpath until top_dir.
735
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000736 Recursively checks parent directories to find yapf file and if no yapf file
737 is found returns None. Uses yapf_config_cache as a cache for
738 previously found configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000739 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000740 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000741 # Return result if we've already computed it.
742 if fpath in yapf_config_cache:
743 return yapf_config_cache[fpath]
744
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000745 parent_dir = os.path.dirname(fpath)
746 if os.path.isfile(fpath):
747 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000748 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000749 # Otherwise fpath is a directory
750 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
751 if os.path.isfile(yapf_file):
752 ret = yapf_file
753 elif fpath == top_dir or parent_dir == fpath:
754 # If we're at the top level directory, or if we're at root
755 # there is no provided style.
756 ret = None
757 else:
758 # Otherwise recurse on the current directory.
759 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000760 yapf_config_cache[fpath] = ret
761 return ret
762
763
qyearsley53f48a12016-09-01 10:45:13 -0700764def write_try_results_json(output_file, builds):
765 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
766
767 The input |builds| dict is assumed to be generated by Buildbucket.
768 Buildbucket documentation: http://goo.gl/G0s101
769 """
770
771 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800772 """Extracts some of the information from one build dict."""
773 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700774 return {
775 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700776 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800777 'builder_name': parameters.get('builder_name'),
778 'created_ts': build.get('created_ts'),
779 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700780 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800781 'result': build.get('result'),
782 'status': build.get('status'),
783 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700784 'url': build.get('url'),
785 }
786
787 converted = []
788 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000789 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700790 write_json(output_file, converted)
791
792
Aaron Gable13101a62018-02-09 13:20:41 -0800793def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000794 """Prints statistics about the change to the user."""
795 # --no-ext-diff is broken in some versions of Git, so try to work around
796 # this by overriding the environment (but there is still a problem if the
797 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000798 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000799 if 'GIT_EXTERNAL_DIFF' in env:
800 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000801
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000802 try:
803 stdout = sys.stdout.fileno()
804 except AttributeError:
805 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000806 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800807 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000808 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000809
810
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000811class BuildbucketResponseException(Exception):
812 pass
813
814
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815class Settings(object):
816 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000818 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819 self.tree_status_url = None
820 self.viewvc_url = None
821 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000822 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000823 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000824 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000825 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826
827 def LazyUpdateIfNeeded(self):
828 """Updates the settings from a codereview.settings file, if available."""
829 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000830 # The only value that actually changes the behavior is
831 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000832 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000833 error_ok=True
834 ).strip().lower()
835
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000836 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000837 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000838 LoadCodereviewSettingsFromFile(cr_settings_file)
839 self.updated = True
840
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000841 @staticmethod
842 def GetRelativeRoot():
843 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000844
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000845 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000846 if self.root is None:
847 self.root = os.path.abspath(self.GetRelativeRoot())
848 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000849
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850 def GetTreeStatusUrl(self, error_ok=False):
851 if not self.tree_status_url:
852 error_message = ('You must configure your tree status URL by running '
853 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000854 self.tree_status_url = self._GetConfig(
855 'rietveld.tree-status-url', error_ok=error_ok,
856 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000857 return self.tree_status_url
858
859 def GetViewVCUrl(self):
860 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000861 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000862 return self.viewvc_url
863
rmistry@google.com90752582014-01-14 21:04:50 +0000864 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000865 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000866
rmistry@google.com5626a922015-02-26 14:03:30 +0000867 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000868 run_post_upload_hook = self._GetConfig(
869 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000870 return run_post_upload_hook == "True"
871
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000872 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000873 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000874
ukai@chromium.orge8077812012-02-03 03:41:46 +0000875 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700876 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000877 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700878 self.is_gerrit = (
879 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000880 return self.is_gerrit
881
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000882 def GetSquashGerritUploads(self):
883 """Return true if uploads to Gerrit should be squashed by default."""
884 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700885 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
886 if self.squash_gerrit_uploads is None:
887 # Default is squash now (http://crbug.com/611892#c23).
888 self.squash_gerrit_uploads = not (
889 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
890 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000891 return self.squash_gerrit_uploads
892
tandriia60502f2016-06-20 02:01:53 -0700893 def GetSquashGerritUploadsOverride(self):
894 """Return True or False if codereview.settings should be overridden.
895
896 Returns None if no override has been defined.
897 """
898 # See also http://crbug.com/611892#c23
899 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
900 error_ok=True).strip()
901 if result == 'true':
902 return True
903 if result == 'false':
904 return False
905 return None
906
tandrii@chromium.org28253532016-04-14 13:46:56 +0000907 def GetGerritSkipEnsureAuthenticated(self):
908 """Return True if EnsureAuthenticated should not be done for Gerrit
909 uploads."""
910 if self.gerrit_skip_ensure_authenticated is None:
911 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000912 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000913 error_ok=True).strip() == 'true')
914 return self.gerrit_skip_ensure_authenticated
915
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000916 def GetGitEditor(self):
917 """Return the editor specified in the git config, or None if none is."""
918 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000919 # Git requires single quotes for paths with spaces. We need to replace
920 # them with double quotes for Windows to treat such paths as a single
921 # path.
922 self.git_editor = self._GetConfig(
923 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000924 return self.git_editor or None
925
thestig@chromium.org44202a22014-03-11 19:22:18 +0000926 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000927 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000928 DEFAULT_LINT_REGEX)
929
930 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000931 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000932 DEFAULT_LINT_IGNORE_REGEX)
933
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000934 def _GetConfig(self, param, **kwargs):
935 self.LazyUpdateIfNeeded()
936 return RunGit(['config', param], **kwargs).strip()
937
938
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100939@contextlib.contextmanager
940def _get_gerrit_project_config_file(remote_url):
941 """Context manager to fetch and store Gerrit's project.config from
942 refs/meta/config branch and store it in temp file.
943
944 Provides a temporary filename or None if there was error.
945 """
946 error, _ = RunGitWithCode([
947 'fetch', remote_url,
948 '+refs/meta/config:refs/git_cl/meta/config'])
949 if error:
950 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700951 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100952 (remote_url, error))
953 yield None
954 return
955
956 error, project_config_data = RunGitWithCode(
957 ['show', 'refs/git_cl/meta/config:project.config'])
958 if error:
959 print('WARNING: project.config file not found')
960 yield None
961 return
962
963 with gclient_utils.temporary_directory() as tempdir:
964 project_config_file = os.path.join(tempdir, 'project.config')
965 gclient_utils.FileWrite(project_config_file, project_config_data)
966 yield project_config_file
967
968
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969def ShortBranchName(branch):
970 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000971 return branch.replace('refs/heads/', '', 1)
972
973
974def GetCurrentBranchRef():
975 """Returns branch ref (e.g., refs/heads/master) or None."""
976 return RunGit(['symbolic-ref', 'HEAD'],
977 stderr=subprocess2.VOID, error_ok=True).strip() or None
978
979
980def GetCurrentBranch():
981 """Returns current branch or None.
982
983 For refs/heads/* branches, returns just last part. For others, full ref.
984 """
985 branchref = GetCurrentBranchRef()
986 if branchref:
987 return ShortBranchName(branchref)
988 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000989
990
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000991class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000992 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000993 NONE = 'none'
994 DRY_RUN = 'dry_run'
995 COMMIT = 'commit'
996
997 ALL_STATES = [NONE, DRY_RUN, COMMIT]
998
999
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001000class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001001 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001002 self.issue = issue
1003 self.patchset = patchset
1004 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001005 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001006 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001007
1008 @property
1009 def valid(self):
1010 return self.issue is not None
1011
1012
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001013def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001014 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1015 fail_result = _ParsedIssueNumberArgument()
1016
1017 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001018 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001019 if not arg.startswith('http'):
1020 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001021
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001022 url = gclient_utils.UpgradeToHttps(arg)
1023 try:
1024 parsed_url = urlparse.urlparse(url)
1025 except ValueError:
1026 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001027
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001028 if codereview is not None:
1029 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1030 return parsed or fail_result
1031
Andrii Shyshkalov0a264d82018-11-21 00:36:16 +00001032 return _GerritChangelistImpl.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001033
1034
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001035def _create_description_from_log(args):
1036 """Pulls out the commit log to use as a base for the CL description."""
1037 log_args = []
1038 if len(args) == 1 and not args[0].endswith('.'):
1039 log_args = [args[0] + '..']
1040 elif len(args) == 1 and args[0].endswith('...'):
1041 log_args = [args[0][:-1]]
1042 elif len(args) == 2:
1043 log_args = [args[0] + '..' + args[1]]
1044 else:
1045 log_args = args[:] # Hope for the best!
1046 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1047
1048
Aaron Gablea45ee112016-11-22 15:14:38 -08001049class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001050 def __init__(self, issue, url):
1051 self.issue = issue
1052 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001053 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001054
1055 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001056 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001057 self.issue, self.url)
1058
1059
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001060_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001061 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001062 # TODO(tandrii): these two aren't known in Gerrit.
1063 'approval', 'disapproval'])
1064
1065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001067 """Changelist works with one changelist in local branch.
1068
1069 Supports two codereview backends: Rietveld or Gerrit, selected at object
1070 creation.
1071
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001072 Notes:
1073 * Not safe for concurrent multi-{thread,process} use.
1074 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001075 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001076 """
1077
1078 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1079 """Create a new ChangeList instance.
1080
1081 If issue is given, the codereview must be given too.
1082
1083 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1084 Otherwise, it's decided based on current configuration of the local branch,
1085 with default being 'rietveld' for backwards compatibility.
1086 See _load_codereview_impl for more details.
1087
1088 **kwargs will be passed directly to codereview implementation.
1089 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001091 global settings
1092 if not settings:
1093 # Happens when git_cl.py is used as a utility library.
1094 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001095
1096 if issue:
1097 assert codereview, 'codereview must be known, if issue is known'
1098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 self.branchref = branchref
1100 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001101 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 self.branch = ShortBranchName(self.branchref)
1103 else:
1104 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001106 self.lookedup_issue = False
1107 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 self.has_description = False
1109 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001110 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001112 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001113 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001114 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001115 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001116
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001117 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001118 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001119 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001120 assert self._codereview_impl
1121 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001122
1123 def _load_codereview_impl(self, codereview=None, **kwargs):
1124 if codereview:
Joe Masond87b0962018-12-03 21:04:46 +00001125 assert codereview in _CODEREVIEW_IMPLEMENTATIONS, (
1126 'codereview {} not in {}'.format(codereview,
1127 _CODEREVIEW_IMPLEMENTATIONS))
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001128 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1129 self._codereview = codereview
1130 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001131 return
1132
1133 # Automatic selection based on issue number set for a current branch.
1134 # Rietveld takes precedence over Gerrit.
1135 assert not self.issue
1136 # Whether we find issue or not, we are doing the lookup.
1137 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001138 if self.GetBranch():
1139 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1140 issue = _git_get_branch_config_value(
1141 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1142 if issue:
1143 self._codereview = codereview
1144 self._codereview_impl = cls(self, **kwargs)
1145 self.issue = int(issue)
1146 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001147
Bryce Thomascfc97122018-12-13 20:21:47 +00001148 # No issue is set for this branch, so default to gerrit.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001149 return self._load_codereview_impl(
Bryce Thomascfc97122018-12-13 20:21:47 +00001150 codereview='gerrit',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001151 **kwargs)
1152
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001153 def IsGerrit(self):
1154 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001155
1156 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001157 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001158
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001159 The return value is a string suitable for passing to git cl with the --cc
1160 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001161 """
1162 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001163 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001164 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001165 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1166 return self.cc
1167
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001168 def GetCCListWithoutDefault(self):
1169 """Return the users cc'd on this CL excluding default ones."""
1170 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001171 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001172 return self.cc
1173
Daniel Cheng7227d212017-11-17 08:12:37 -08001174 def ExtendCC(self, more_cc):
1175 """Extends the list of users to cc on this CL based on the changed files."""
1176 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001177
1178 def GetBranch(self):
1179 """Returns the short branch name, e.g. 'master'."""
1180 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001181 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001182 if not branchref:
1183 return None
1184 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185 self.branch = ShortBranchName(self.branchref)
1186 return self.branch
1187
1188 def GetBranchRef(self):
1189 """Returns the full branch name, e.g. 'refs/heads/master'."""
1190 self.GetBranch() # Poke the lazy loader.
1191 return self.branchref
1192
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001193 def ClearBranch(self):
1194 """Clears cached branch data of this object."""
1195 self.branch = self.branchref = None
1196
tandrii5d48c322016-08-18 16:19:37 -07001197 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1198 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1199 kwargs['branch'] = self.GetBranch()
1200 return _git_get_branch_config_value(key, default, **kwargs)
1201
1202 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1203 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1204 assert self.GetBranch(), (
1205 'this CL must have an associated branch to %sset %s%s' %
1206 ('un' if value is None else '',
1207 key,
1208 '' if value is None else ' to %r' % value))
1209 kwargs['branch'] = self.GetBranch()
1210 return _git_set_branch_config_value(key, value, **kwargs)
1211
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 @staticmethod
1213 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001214 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 e.g. 'origin', 'refs/heads/master'
1216 """
1217 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001218 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1219
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001221 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001223 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1224 error_ok=True).strip()
1225 if upstream_branch:
1226 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001228 # Else, try to guess the origin remote.
1229 remote_branches = RunGit(['branch', '-r']).split()
1230 if 'origin/master' in remote_branches:
1231 # Fall back on origin/master if it exits.
1232 remote = 'origin'
1233 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001235 DieWithError(
1236 'Unable to determine default branch to diff against.\n'
1237 'Either pass complete "git diff"-style arguments, like\n'
1238 ' git cl upload origin/master\n'
1239 'or verify this branch is set up to track another \n'
1240 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241
1242 return remote, upstream_branch
1243
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001244 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001245 upstream_branch = self.GetUpstreamBranch()
1246 if not BranchExists(upstream_branch):
1247 DieWithError('The upstream for the current branch (%s) does not exist '
1248 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001249 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001250 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001251
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 def GetUpstreamBranch(self):
1253 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001254 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001255 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001256 upstream_branch = upstream_branch.replace('refs/heads/',
1257 'refs/remotes/%s/' % remote)
1258 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1259 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 self.upstream_branch = upstream_branch
1261 return self.upstream_branch
1262
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001263 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001264 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001265 remote, branch = None, self.GetBranch()
1266 seen_branches = set()
1267 while branch not in seen_branches:
1268 seen_branches.add(branch)
1269 remote, branch = self.FetchUpstreamTuple(branch)
1270 branch = ShortBranchName(branch)
1271 if remote != '.' or branch.startswith('refs/remotes'):
1272 break
1273 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001274 remotes = RunGit(['remote'], error_ok=True).split()
1275 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001276 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001277 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001278 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001279 logging.warn('Could not determine which remote this change is '
1280 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001281 else:
1282 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001283 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001284 branch = 'HEAD'
1285 if branch.startswith('refs/remotes'):
1286 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001287 elif branch.startswith('refs/branch-heads/'):
1288 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001289 else:
1290 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001291 return self._remote
1292
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 def GitSanityChecks(self, upstream_git_obj):
1294 """Checks git repo status and ensures diff is from local commits."""
1295
sbc@chromium.org79706062015-01-14 21:18:12 +00001296 if upstream_git_obj is None:
1297 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001298 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001299 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001300 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001301 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001302 return False
1303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 # Verify the commit we're diffing against is in our current branch.
1305 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1306 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1307 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001308 print('ERROR: %s is not in the current branch. You may need to rebase '
1309 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001310 return False
1311
1312 # List the commits inside the diff, and verify they are all local.
1313 commits_in_diff = RunGit(
1314 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1315 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1316 remote_branch = remote_branch.strip()
1317 if code != 0:
1318 _, remote_branch = self.GetRemoteBranch()
1319
1320 commits_in_remote = RunGit(
1321 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1322
1323 common_commits = set(commits_in_diff) & set(commits_in_remote)
1324 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001325 print('ERROR: Your diff contains %d commits already in %s.\n'
1326 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1327 'the diff. If you are using a custom git flow, you can override'
1328 ' the reference used for this check with "git config '
1329 'gitcl.remotebranch <git-ref>".' % (
1330 len(common_commits), remote_branch, upstream_git_obj),
1331 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 return False
1333 return True
1334
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001335 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001336 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001337
1338 Returns None if it is not set.
1339 """
tandrii5d48c322016-08-18 16:19:37 -07001340 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001341
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342 def GetRemoteUrl(self):
1343 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1344
1345 Returns None if there is no remote.
1346 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001347 is_cached, value = self._cached_remote_url
1348 if is_cached:
1349 return value
1350
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001351 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001352 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1353
Edward Lemur298f2cf2019-02-22 21:40:39 +00001354 # Check if the remote url can be parsed as an URL.
1355 host = urlparse.urlparse(url).netloc
1356 if host:
1357 self._cached_remote_url = (True, url)
1358 return url
1359
1360 # If it cannot be parsed as an url, assume it is a local directory, probably
1361 # a git cache.
1362 logging.warning('"%s" doesn\'t appear to point to a git host. '
1363 'Interpreting it as a local directory.', url)
1364 if not os.path.isdir(url):
1365 logging.error(
1366 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
1367 remote, url, self.GetBranch())
1368 return None
1369
1370 cache_path = url
1371 url = RunGit(['config', 'remote.%s.url' % remote],
1372 error_ok=True,
1373 cwd=url).strip()
1374
1375 host = urlparse.urlparse(url).netloc
1376 if not host:
1377 logging.error(
1378 'Remote "%(remote)s" for branch "%(branch)s" points to '
1379 '"%(cache_path)s", but it is misconfigured.\n'
1380 '"%(cache_path)s" must be a git repo and must have a remote named '
1381 '"%(remote)s" pointing to the git host.', {
1382 'remote': remote,
1383 'cache_path': cache_path,
1384 'branch': self.GetBranch()})
1385 return None
1386
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001387 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001388 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001389
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001390 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001391 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001392 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001393 self.issue = self._GitGetBranchConfigValue(
1394 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001395 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396 return self.issue
1397
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001398 def GetIssueURL(self):
1399 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001400 issue = self.GetIssue()
1401 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001402 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001403 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001405 def GetDescription(self, pretty=False, force=False):
1406 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001408 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409 self.has_description = True
1410 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001411 # Set width to 72 columns + 2 space indent.
1412 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001414 lines = self.description.splitlines()
1415 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 return self.description
1417
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001418 def GetDescriptionFooters(self):
1419 """Returns (non_footer_lines, footers) for the commit message.
1420
1421 Returns:
1422 non_footer_lines (list(str)) - Simple list of description lines without
1423 any footer. The lines do not contain newlines, nor does the list contain
1424 the empty line between the message and the footers.
1425 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1426 [("Change-Id", "Ideadbeef...."), ...]
1427 """
1428 raw_description = self.GetDescription()
1429 msg_lines, _, footers = git_footers.split_footers(raw_description)
1430 if footers:
1431 msg_lines = msg_lines[:len(msg_lines)-1]
1432 return msg_lines, footers
1433
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001434 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001435 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001436 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001437 self.patchset = self._GitGetBranchConfigValue(
1438 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001439 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001440 return self.patchset
1441
1442 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001443 """Set this branch's patchset. If patchset=0, clears the patchset."""
1444 assert self.GetBranch()
1445 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001447 else:
1448 self.patchset = int(patchset)
1449 self._GitSetBranchConfigValue(
1450 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001451
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001452 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001453 """Set this branch's issue. If issue isn't given, clears the issue."""
1454 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001455 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001456 issue = int(issue)
1457 self._GitSetBranchConfigValue(
1458 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001459 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001460 codereview_server = self._codereview_impl.GetCodereviewServer()
1461 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001462 self._GitSetBranchConfigValue(
1463 self._codereview_impl.CodereviewServerConfigKey(),
1464 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001465 else:
tandrii5d48c322016-08-18 16:19:37 -07001466 # Reset all of these just to be clean.
1467 reset_suffixes = [
1468 'last-upload-hash',
1469 self._codereview_impl.IssueConfigKey(),
1470 self._codereview_impl.PatchsetConfigKey(),
1471 self._codereview_impl.CodereviewServerConfigKey(),
1472 ] + self._PostUnsetIssueProperties()
1473 for prop in reset_suffixes:
1474 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001475 msg = RunGit(['log', '-1', '--format=%B']).strip()
1476 if msg and git_footers.get_footer_change_id(msg):
1477 print('WARNING: The change patched into this branch has a Change-Id. '
1478 'Removing it.')
1479 RunGit(['commit', '--amend', '-m',
1480 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001481 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001482 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001483
dnjba1b0f32016-09-02 12:37:42 -07001484 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001485 if not self.GitSanityChecks(upstream_branch):
1486 DieWithError('\nGit sanity check failure')
1487
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001488 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001489 if not root:
1490 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001491 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001492
1493 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001494 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001495 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001496 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001497 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001498 except subprocess2.CalledProcessError:
1499 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001500 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001501 'This branch probably doesn\'t exist anymore. To reset the\n'
1502 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001503 ' git branch --set-upstream-to origin/master %s\n'
1504 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001505 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001506
maruel@chromium.org52424302012-08-29 15:14:30 +00001507 issue = self.GetIssue()
1508 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001509 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001510 description = self.GetDescription()
1511 else:
1512 # If the change was never uploaded, use the log messages of all commits
1513 # up to the branch point, as git cl upload will prefill the description
1514 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001515 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1516 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001517
1518 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001519 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001520 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001521 name,
1522 description,
1523 absroot,
1524 files,
1525 issue,
1526 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001527 author,
1528 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001529
dsansomee2d6fd92016-09-08 00:10:47 -07001530 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001531 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001532 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001533 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001534
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001535 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1536 """Sets the description for this CL remotely.
1537
1538 You can get description_lines and footers with GetDescriptionFooters.
1539
1540 Args:
1541 description_lines (list(str)) - List of CL description lines without
1542 newline characters.
1543 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1544 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1545 `List-Of-Tokens`). It will be case-normalized so that each token is
1546 title-cased.
1547 """
1548 new_description = '\n'.join(description_lines)
1549 if footers:
1550 new_description += '\n'
1551 for k, v in footers:
1552 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1553 if not git_footers.FOOTER_PATTERN.match(foot):
1554 raise ValueError('Invalid footer %r' % foot)
1555 new_description += foot + '\n'
1556 self.UpdateDescription(new_description, force)
1557
Edward Lesmes8e282792018-04-03 18:50:29 -04001558 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1560 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001561 start = time_time()
1562 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001563 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1564 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001565 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1566 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001567 metrics.collector.add_repeated('sub_commands', {
1568 'command': 'presubmit',
1569 'execution_time': time_time() - start,
1570 'exit_code': 0 if result.should_continue() else 1,
1571 })
1572 return result
vapierfd77ac72016-06-16 08:33:57 -07001573 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001574 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001575
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001576 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1577 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001578 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1579 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001580 else:
1581 # Assume url.
1582 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1583 urlparse.urlparse(issue_arg))
1584 if not parsed_issue_arg or not parsed_issue_arg.valid:
1585 DieWithError('Failed to parse issue argument "%s". '
1586 'Must be an issue number or a valid URL.' % issue_arg)
1587 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001588 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001589
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 def CMDUpload(self, options, git_diff_args, orig_args):
1591 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001592 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001593 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001595 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001596 else:
1597 if self.GetBranch() is None:
1598 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1599
1600 # Default to diffing against common ancestor of upstream branch
1601 base_branch = self.GetCommonAncestorWithUpstream()
1602 git_diff_args = [base_branch, 'HEAD']
1603
Aaron Gablec4c40d12017-05-22 11:49:53 -07001604
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001605 # Fast best-effort checks to abort before running potentially
1606 # expensive hooks if uploading is likely to fail anyway. Passing these
1607 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001608 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001609 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001610
1611 # Apply watchlists on upload.
1612 change = self.GetChange(base_branch, None)
1613 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1614 files = [f.LocalPath() for f in change.AffectedFiles()]
1615 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001616 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001617
1618 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001619 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620 # Set the reviewer list now so that presubmit checks can access it.
1621 change_description = ChangeDescription(change.FullDescriptionText())
1622 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001623 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001624 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001625 change)
1626 change.SetDescriptionText(change_description.description)
1627 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001628 may_prompt=not options.force,
1629 verbose=options.verbose,
1630 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001631 if not hook_results.should_continue():
1632 return 1
1633 if not options.reviewers and hook_results.reviewers:
1634 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001635 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001636
Aaron Gable13101a62018-02-09 13:20:41 -08001637 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001638 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001639 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001640 _git_set_branch_config_value('last-upload-hash',
1641 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001642 # Run post upload hooks, if specified.
1643 if settings.GetRunPostUploadHook():
1644 presubmit_support.DoPostUploadExecuter(
1645 change,
1646 self,
1647 settings.GetRoot(),
1648 options.verbose,
1649 sys.stdout)
1650
1651 # Upload all dependencies if specified.
1652 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001653 print()
1654 print('--dependencies has been specified.')
1655 print('All dependent local branches will be re-uploaded.')
1656 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001657 # Remove the dependencies flag from args so that we do not end up in a
1658 # loop.
1659 orig_args.remove('--dependencies')
1660 ret = upload_branch_deps(self, orig_args)
1661 return ret
1662
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001663 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001664 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001665
1666 Issue must have been already uploaded and known.
1667 """
1668 assert new_state in _CQState.ALL_STATES
1669 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001670 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001671 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001672 return 0
1673 except KeyboardInterrupt:
1674 raise
1675 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001676 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001677 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001678 ' * Your project has no CQ,\n'
1679 ' * You don\'t have permission to change the CQ state,\n'
1680 ' * There\'s a bug in this code (see stack trace below).\n'
1681 'Consider specifying which bots to trigger manually or asking your '
1682 'project owners for permissions or contacting Chrome Infra at:\n'
1683 'https://www.chromium.org/infra\n\n' %
1684 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001685 # Still raise exception so that stack trace is printed.
1686 raise
1687
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001688 # Forward methods to codereview specific implementation.
1689
Aaron Gable636b13f2017-07-14 10:42:48 -07001690 def AddComment(self, message, publish=None):
1691 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001692
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001693 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001694 """Returns list of _CommentSummary for each comment.
1695
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001696 args:
1697 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001698 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001699 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001700
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001701 def CloseIssue(self):
1702 return self._codereview_impl.CloseIssue()
1703
1704 def GetStatus(self):
1705 return self._codereview_impl.GetStatus()
1706
1707 def GetCodereviewServer(self):
1708 return self._codereview_impl.GetCodereviewServer()
1709
tandriide281ae2016-10-12 06:02:30 -07001710 def GetIssueOwner(self):
1711 """Get owner from codereview, which may differ from this checkout."""
1712 return self._codereview_impl.GetIssueOwner()
1713
Edward Lemur707d70b2018-02-07 00:50:14 +01001714 def GetReviewers(self):
1715 return self._codereview_impl.GetReviewers()
1716
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001717 def GetMostRecentPatchset(self):
1718 return self._codereview_impl.GetMostRecentPatchset()
1719
tandriide281ae2016-10-12 06:02:30 -07001720 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001721 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001722 return self._codereview_impl.CannotTriggerTryJobReason()
1723
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001724 def GetTryJobProperties(self, patchset=None):
1725 """Returns dictionary of properties to launch try job."""
1726 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001727
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001728 def __getattr__(self, attr):
1729 # This is because lots of untested code accesses Rietveld-specific stuff
1730 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001731 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001732 # Note that child method defines __getattr__ as well, and forwards it here,
1733 # because _RietveldChangelistImpl is not cleaned up yet, and given
1734 # deprecation of Rietveld, it should probably be just removed.
1735 # Until that time, avoid infinite recursion by bypassing __getattr__
1736 # of implementation class.
1737 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738
1739
1740class _ChangelistCodereviewBase(object):
1741 """Abstract base class encapsulating codereview specifics of a changelist."""
1742 def __init__(self, changelist):
1743 self._changelist = changelist # instance of Changelist
1744
1745 def __getattr__(self, attr):
1746 # Forward methods to changelist.
1747 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1748 # _RietveldChangelistImpl to avoid this hack?
1749 return getattr(self._changelist, attr)
1750
1751 def GetStatus(self):
1752 """Apply a rough heuristic to give a simple summary of an issue's review
1753 or CQ status, assuming adherence to a common workflow.
1754
1755 Returns None if no issue for this branch, or specific string keywords.
1756 """
1757 raise NotImplementedError()
1758
1759 def GetCodereviewServer(self):
1760 """Returns server URL without end slash, like "https://codereview.com"."""
1761 raise NotImplementedError()
1762
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001763 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764 """Fetches and returns description from the codereview server."""
1765 raise NotImplementedError()
1766
tandrii5d48c322016-08-18 16:19:37 -07001767 @classmethod
1768 def IssueConfigKey(cls):
1769 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770 raise NotImplementedError()
1771
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001772 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001773 def PatchsetConfigKey(cls):
1774 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001775 raise NotImplementedError()
1776
tandrii5d48c322016-08-18 16:19:37 -07001777 @classmethod
1778 def CodereviewServerConfigKey(cls):
1779 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001780 raise NotImplementedError()
1781
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001782 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001783 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001784 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001785
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001786 def GetGerritObjForPresubmit(self):
1787 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1788 return None
1789
dsansomee2d6fd92016-09-08 00:10:47 -07001790 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 """Update the description on codereview site."""
1792 raise NotImplementedError()
1793
Aaron Gable636b13f2017-07-14 10:42:48 -07001794 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001795 """Posts a comment to the codereview site."""
1796 raise NotImplementedError()
1797
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001798 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001799 raise NotImplementedError()
1800
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 def CloseIssue(self):
1802 """Closes the issue."""
1803 raise NotImplementedError()
1804
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001805 def GetMostRecentPatchset(self):
1806 """Returns the most recent patchset number from the codereview site."""
1807 raise NotImplementedError()
1808
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001809 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001810 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001811 """Fetches and applies the issue.
1812
1813 Arguments:
1814 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1815 reject: if True, reject the failed patch instead of switching to 3-way
1816 merge. Rietveld only.
1817 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1818 only.
1819 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001820 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001821 """
1822 raise NotImplementedError()
1823
1824 @staticmethod
1825 def ParseIssueURL(parsed_url):
1826 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1827 failed."""
1828 raise NotImplementedError()
1829
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001830 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001831 """Best effort check that user is authenticated with codereview server.
1832
1833 Arguments:
1834 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001835 refresh: whether to attempt to refresh credentials. Ignored if not
1836 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001837 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001838 raise NotImplementedError()
1839
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001840 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001841 """Best effort check that uploading isn't supposed to fail for predictable
1842 reasons.
1843
1844 This method should raise informative exception if uploading shouldn't
1845 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001846
1847 Arguments:
1848 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001849 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001850 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001851
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001852 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001853 """Uploads a change to codereview."""
1854 raise NotImplementedError()
1855
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001856 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001857 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001858
1859 Issue must have been already uploaded and known.
1860 """
1861 raise NotImplementedError()
1862
tandriie113dfd2016-10-11 10:20:12 -07001863 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001864 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001865 raise NotImplementedError()
1866
tandriide281ae2016-10-12 06:02:30 -07001867 def GetIssueOwner(self):
1868 raise NotImplementedError()
1869
Edward Lemur707d70b2018-02-07 00:50:14 +01001870 def GetReviewers(self):
1871 raise NotImplementedError()
1872
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001873 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001874 raise NotImplementedError()
1875
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001876
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001877class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001878 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001879 # auth_config is Rietveld thing, kept here to preserve interface only.
1880 super(_GerritChangelistImpl, self).__init__(changelist)
1881 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001882 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001883 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001884 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001885 # Map from change number (issue) to its detail cache.
1886 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001887
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001888 if codereview_host is not None:
1889 assert not codereview_host.startswith('https://'), codereview_host
1890 self._gerrit_host = codereview_host
1891 self._gerrit_server = 'https://%s' % codereview_host
1892
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001893 def _GetGerritHost(self):
1894 # Lazy load of configs.
1895 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001896 if self._gerrit_host and '.' not in self._gerrit_host:
1897 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1898 # This happens for internal stuff http://crbug.com/614312.
1899 parsed = urlparse.urlparse(self.GetRemoteUrl())
1900 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001901 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07001902 ' Your current remote is: %s' % self.GetRemoteUrl())
1903 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1904 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905 return self._gerrit_host
1906
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001907 def _GetGitHost(self):
1908 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001909 remote_url = self.GetRemoteUrl()
1910 if not remote_url:
1911 return None
1912 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001913
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001914 def GetCodereviewServer(self):
1915 if not self._gerrit_server:
1916 # If we're on a branch then get the server potentially associated
1917 # with that branch.
1918 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001919 self._gerrit_server = self._GitGetBranchConfigValue(
1920 self.CodereviewServerConfigKey())
1921 if self._gerrit_server:
1922 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923 if not self._gerrit_server:
1924 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1925 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001926 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001927 parts[0] = parts[0] + '-review'
1928 self._gerrit_host = '.'.join(parts)
1929 self._gerrit_server = 'https://%s' % self._gerrit_host
1930 return self._gerrit_server
1931
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001932 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001933 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001934 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001935 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001936 logging.warn('can\'t detect Gerrit project.')
1937 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001938 project = urlparse.urlparse(remote_url).path.strip('/')
1939 if project.endswith('.git'):
1940 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001941 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1942 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1943 # gitiles/git-over-https protocol. E.g.,
1944 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1945 # as
1946 # https://chromium.googlesource.com/v8/v8
1947 if project.startswith('a/'):
1948 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001949 return project
1950
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001951 def _GerritChangeIdentifier(self):
1952 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1953
1954 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001955 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001956 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001957 project = self._GetGerritProject()
1958 if project:
1959 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1960 # Fall back on still unique, but less efficient change number.
1961 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001962
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001963 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001964 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001965 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966
tandrii5d48c322016-08-18 16:19:37 -07001967 @classmethod
1968 def PatchsetConfigKey(cls):
1969 return 'gerritpatchset'
1970
1971 @classmethod
1972 def CodereviewServerConfigKey(cls):
1973 return 'gerritserver'
1974
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001975 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001976 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001977 if settings.GetGerritSkipEnsureAuthenticated():
1978 # For projects with unusual authentication schemes.
1979 # See http://crbug.com/603378.
1980 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001981
1982 # Check presence of cookies only if using cookies-based auth method.
1983 cookie_auth = gerrit_util.Authenticator.get()
1984 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001985 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001986
Daniel Chengcf6269b2019-05-18 01:02:12 +00001987 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1988 print('WARNING: Ignoring branch %s with non-https remote %s' %
1989 (self._changelist.branch, self.GetRemoteUrl()))
1990 return
1991
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001992 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001993 self.GetCodereviewServer()
1994 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001995 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001996
1997 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1998 git_auth = cookie_auth.get_auth_header(git_host)
1999 if gerrit_auth and git_auth:
2000 if gerrit_auth == git_auth:
2001 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002002 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002003 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002004 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002005 ' %s\n'
2006 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002007 ' Consider running the following command:\n'
2008 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002009 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002010 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002011 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002012 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002013 cookie_auth.get_new_password_message(git_host)))
2014 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002015 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002016 return
2017 else:
2018 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002019 ([] if gerrit_auth else [self._gerrit_host]) +
2020 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021 DieWithError('Credentials for the following hosts are required:\n'
2022 ' %s\n'
2023 'These are read from %s (or legacy %s)\n'
2024 '%s' % (
2025 '\n '.join(missing),
2026 cookie_auth.get_gitcookies_path(),
2027 cookie_auth.get_netrc_path(),
2028 cookie_auth.get_new_password_message(git_host)))
2029
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002030 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002031 if not self.GetIssue():
2032 return
2033
2034 # Warm change details cache now to avoid RPCs later, reducing latency for
2035 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002036 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002037 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002038
2039 status = self._GetChangeDetail()['status']
2040 if status in ('MERGED', 'ABANDONED'):
2041 DieWithError('Change %s has been %s, new uploads are not allowed' %
2042 (self.GetIssueURL(),
2043 'submitted' if status == 'MERGED' else 'abandoned'))
2044
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002045 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2046 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2047 # Apparently this check is not very important? Otherwise get_auth_email
2048 # could have been added to other implementations of Authenticator.
2049 cookies_auth = gerrit_util.Authenticator.get()
2050 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002051 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002052
2053 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002054 if self.GetIssueOwner() == cookies_user:
2055 return
2056 logging.debug('change %s owner is %s, cookies user is %s',
2057 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002058 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002059 # so ask what Gerrit thinks of this user.
2060 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2061 if details['email'] == self.GetIssueOwner():
2062 return
2063 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002064 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002065 'as %s.\n'
2066 'Uploading may fail due to lack of permissions.' %
2067 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2068 confirm_or_exit(action='upload')
2069
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002070 def _PostUnsetIssueProperties(self):
2071 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002072 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002073
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002074 def GetGerritObjForPresubmit(self):
2075 return presubmit_support.GerritAccessor(self._GetGerritHost())
2076
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002077 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002078 """Apply a rough heuristic to give a simple summary of an issue's review
2079 or CQ status, assuming adherence to a common workflow.
2080
2081 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002082 * 'error' - error from review tool (including deleted issues)
2083 * 'unsent' - no reviewers added
2084 * 'waiting' - waiting for review
2085 * 'reply' - waiting for uploader to reply to review
2086 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002087 * 'dry-run' - dry-running in the CQ
2088 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002089 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002090 """
2091 if not self.GetIssue():
2092 return None
2093
2094 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002095 data = self._GetChangeDetail([
2096 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002097 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002098 return 'error'
2099
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002100 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002101 return 'closed'
2102
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002103 cq_label = data['labels'].get('Commit-Queue', {})
2104 max_cq_vote = 0
2105 for vote in cq_label.get('all', []):
2106 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2107 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002108 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002109 if max_cq_vote == 1:
2110 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002111
Aaron Gable9ab38c62017-04-06 14:36:33 -07002112 if data['labels'].get('Code-Review', {}).get('approved'):
2113 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002114
2115 if not data.get('reviewers', {}).get('REVIEWER', []):
2116 return 'unsent'
2117
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002118 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002119 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2120 last_message_author = messages.pop().get('author', {})
2121 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002122 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2123 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002124 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002125 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002126 if last_message_author.get('_account_id') == owner:
2127 # Most recent message was by owner.
2128 return 'waiting'
2129 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002130 # Some reply from non-owner.
2131 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002132
2133 # Somehow there are no messages even though there are reviewers.
2134 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002135
2136 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002137 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002138 patchset = data['revisions'][data['current_revision']]['_number']
2139 self.SetPatchset(patchset)
2140 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002141
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002142 def FetchDescription(self, force=False):
2143 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2144 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002145 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00002146 return data['revisions'][current_rev]['commit']['message'].encode(
2147 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002148
dsansomee2d6fd92016-09-08 00:10:47 -07002149 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002150 if gerrit_util.HasPendingChangeEdit(
2151 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002152 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002153 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002154 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002155 'unpublished edit. Either publish the edit in the Gerrit web UI '
2156 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002157
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002158 gerrit_util.DeletePendingChangeEdit(
2159 self._GetGerritHost(), self._GerritChangeIdentifier())
2160 gerrit_util.SetCommitMessage(
2161 self._GetGerritHost(), self._GerritChangeIdentifier(),
2162 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002163
Aaron Gable636b13f2017-07-14 10:42:48 -07002164 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002165 gerrit_util.SetReview(
2166 self._GetGerritHost(), self._GerritChangeIdentifier(),
2167 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002168
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002169 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002170 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002171 # CURRENT_REVISION is included to get the latest patchset so that
2172 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002173 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002174 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2175 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002176 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002177 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002178 robot_file_comments = gerrit_util.GetChangeRobotComments(
2179 self._GetGerritHost(), self._GerritChangeIdentifier())
2180
2181 # Add the robot comments onto the list of comments, but only
2182 # keep those that are from the latest pachset.
2183 latest_patch_set = self.GetMostRecentPatchset()
2184 for path, robot_comments in robot_file_comments.iteritems():
2185 line_comments = file_comments.setdefault(path, [])
2186 line_comments.extend(
2187 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002188
2189 # Build dictionary of file comments for easy access and sorting later.
2190 # {author+date: {path: {patchset: {line: url+message}}}}
2191 comments = collections.defaultdict(
2192 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2193 for path, line_comments in file_comments.iteritems():
2194 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002195 tag = comment.get('tag', '')
2196 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002197 continue
2198 key = (comment['author']['email'], comment['updated'])
2199 if comment.get('side', 'REVISION') == 'PARENT':
2200 patchset = 'Base'
2201 else:
2202 patchset = 'PS%d' % comment['patch_set']
2203 line = comment.get('line', 0)
2204 url = ('https://%s/c/%s/%s/%s#%s%s' %
2205 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2206 'b' if comment.get('side') == 'PARENT' else '',
2207 str(line) if line else ''))
2208 comments[key][path][patchset][line] = (url, comment['message'])
2209
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002210 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002211 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002212 summary = self._BuildCommentSummary(msg, comments, readable)
2213 if summary:
2214 summaries.append(summary)
2215 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002216
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002217 @staticmethod
2218 def _BuildCommentSummary(msg, comments, readable):
2219 key = (msg['author']['email'], msg['date'])
2220 # Don't bother showing autogenerated messages that don't have associated
2221 # file or line comments. this will filter out most autogenerated
2222 # messages, but will keep robot comments like those from Tricium.
2223 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2224 if is_autogenerated and not comments.get(key):
2225 return None
2226 message = msg['message']
2227 # Gerrit spits out nanoseconds.
2228 assert len(msg['date'].split('.')[-1]) == 9
2229 date = datetime.datetime.strptime(msg['date'][:-3],
2230 '%Y-%m-%d %H:%M:%S.%f')
2231 if key in comments:
2232 message += '\n'
2233 for path, patchsets in sorted(comments.get(key, {}).items()):
2234 if readable:
2235 message += '\n%s' % path
2236 for patchset, lines in sorted(patchsets.items()):
2237 for line, (url, content) in sorted(lines.items()):
2238 if line:
2239 line_str = 'Line %d' % line
2240 path_str = '%s:%d:' % (path, line)
2241 else:
2242 line_str = 'File comment'
2243 path_str = '%s:0:' % path
2244 if readable:
2245 message += '\n %s, %s: %s' % (patchset, line_str, url)
2246 message += '\n %s\n' % content
2247 else:
2248 message += '\n%s ' % path_str
2249 message += '\n%s\n' % content
2250
2251 return _CommentSummary(
2252 date=date,
2253 message=message,
2254 sender=msg['author']['email'],
2255 autogenerated=is_autogenerated,
2256 # These could be inferred from the text messages and correlated with
2257 # Code-Review label maximum, however this is not reliable.
2258 # Leaving as is until the need arises.
2259 approval=False,
2260 disapproval=False,
2261 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002262
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002263 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002264 gerrit_util.AbandonChange(
2265 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002266
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002267 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002268 gerrit_util.SubmitChange(
2269 self._GetGerritHost(), self._GerritChangeIdentifier(),
2270 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002271
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002272 def _GetChangeDetail(self, options=None, no_cache=False):
2273 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002274
2275 If fresh data is needed, set no_cache=True which will clear cache and
2276 thus new data will be fetched from Gerrit.
2277 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002279 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002280
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002281 # Optimization to avoid multiple RPCs:
2282 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2283 'CURRENT_COMMIT' not in options):
2284 options.append('CURRENT_COMMIT')
2285
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002286 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002287 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002288 options = [o.upper() for o in options]
2289
2290 # Check in cache first unless no_cache is True.
2291 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002292 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002293 else:
2294 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002295 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002296 # Assumption: data fetched before with extra options is suitable
2297 # for return for a smaller set of options.
2298 # For example, if we cached data for
2299 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2300 # and request is for options=[CURRENT_REVISION],
2301 # THEN we can return prior cached data.
2302 if options_set.issubset(cached_options_set):
2303 return data
2304
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002305 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002306 data = gerrit_util.GetChangeDetail(
2307 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002308 except gerrit_util.GerritError as e:
2309 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002310 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002311 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002312
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002313 self._detail_cache.setdefault(cache_key, []).append(
2314 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002315 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002316
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002317 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002318 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002319 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002320 data = gerrit_util.GetChangeCommit(
2321 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002322 except gerrit_util.GerritError as e:
2323 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002324 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002325 raise
agable32978d92016-11-01 12:55:02 -07002326 return data
2327
Karen Qian40c19422019-03-13 21:28:29 +00002328 def _IsCqConfigured(self):
2329 detail = self._GetChangeDetail(['LABELS'])
2330 if not u'Commit-Queue' in detail.get('labels', {}):
2331 return False
2332 # TODO(crbug/753213): Remove temporary hack
2333 if ('https://chromium.googlesource.com/chromium/src' ==
2334 self._changelist.GetRemoteUrl() and
2335 detail['branch'].startswith('refs/branch-heads/')):
2336 return False
2337 return True
2338
Olivier Robin75ee7252018-04-13 10:02:56 +02002339 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002340 if git_common.is_dirty_git_tree('land'):
2341 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002342
tandriid60367b2016-06-22 05:25:12 -07002343 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002344 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002345 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002346 'which can test and land changes for you. '
2347 'Are you sure you wish to bypass it?\n',
2348 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002349 differs = True
tandriic4344b52016-08-29 06:04:54 -07002350 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002351 # Note: git diff outputs nothing if there is no diff.
2352 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002353 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002354 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002355 if detail['current_revision'] == last_upload:
2356 differs = False
2357 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002358 print('WARNING: Local branch contents differ from latest uploaded '
2359 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002360 if differs:
2361 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002362 confirm_or_exit(
2363 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2364 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002365 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002366 elif not bypass_hooks:
2367 hook_results = self.RunHook(
2368 committing=True,
2369 may_prompt=not force,
2370 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002371 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2372 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002373 if not hook_results.should_continue():
2374 return 1
2375
2376 self.SubmitIssue(wait_for_merge=True)
2377 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002378 links = self._GetChangeCommit().get('web_links', [])
2379 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002380 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002381 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002382 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002383 return 0
2384
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002385 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002386 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002387 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002388 assert not directory
2389 assert parsed_issue_arg.valid
2390
2391 self._changelist.issue = parsed_issue_arg.issue
2392
2393 if parsed_issue_arg.hostname:
2394 self._gerrit_host = parsed_issue_arg.hostname
2395 self._gerrit_server = 'https://%s' % self._gerrit_host
2396
tandriic2405f52016-10-10 08:13:15 -07002397 try:
2398 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002399 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002400 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002401
2402 if not parsed_issue_arg.patchset:
2403 # Use current revision by default.
2404 revision_info = detail['revisions'][detail['current_revision']]
2405 patchset = int(revision_info['_number'])
2406 else:
2407 patchset = parsed_issue_arg.patchset
2408 for revision_info in detail['revisions'].itervalues():
2409 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2410 break
2411 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002412 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002413 (parsed_issue_arg.patchset, self.GetIssue()))
2414
Aaron Gable697a91b2018-01-19 15:20:15 -08002415 remote_url = self._changelist.GetRemoteUrl()
2416 if remote_url.endswith('.git'):
2417 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002418 remote_url = remote_url.rstrip('/')
2419
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002420 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002421 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002422
2423 if remote_url != fetch_info['url']:
2424 DieWithError('Trying to patch a change from %s but this repo appears '
2425 'to be %s.' % (fetch_info['url'], remote_url))
2426
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002427 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002428
Aaron Gable62619a32017-06-16 08:22:09 -07002429 if force:
2430 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2431 print('Checked out commit for change %i patchset %i locally' %
2432 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002433 elif nocommit:
2434 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2435 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002436 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002437 RunGit(['cherry-pick', 'FETCH_HEAD'])
2438 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002439 (parsed_issue_arg.issue, patchset))
2440 print('Note: this created a local commit which does not have '
2441 'the same hash as the one uploaded for review. This will make '
2442 'uploading changes based on top of this branch difficult.\n'
2443 'If you want to do that, use "git cl patch --force" instead.')
2444
Stefan Zagerd08043c2017-10-12 12:07:02 -07002445 if self.GetBranch():
2446 self.SetIssue(parsed_issue_arg.issue)
2447 self.SetPatchset(patchset)
2448 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2449 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2450 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2451 else:
2452 print('WARNING: You are in detached HEAD state.\n'
2453 'The patch has been applied to your checkout, but you will not be '
2454 'able to upload a new patch set to the gerrit issue.\n'
2455 'Try using the \'-b\' option if you would like to work on a '
2456 'branch and/or upload a new patch set.')
2457
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002458 return 0
2459
2460 @staticmethod
2461 def ParseIssueURL(parsed_url):
2462 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2463 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002464 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2465 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002466 # Short urls like https://domain/<issue_number> can be used, but don't allow
2467 # specifying the patchset (you'd 404), but we allow that here.
2468 if parsed_url.path == '/':
2469 part = parsed_url.fragment
2470 else:
2471 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002472 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002473 if match:
2474 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002475 issue=int(match.group(3)),
2476 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002477 hostname=parsed_url.netloc,
2478 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002479 return None
2480
tandrii16e0b4e2016-06-07 10:34:28 -07002481 def _GerritCommitMsgHookCheck(self, offer_removal):
2482 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2483 if not os.path.exists(hook):
2484 return
2485 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2486 # custom developer made one.
2487 data = gclient_utils.FileRead(hook)
2488 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2489 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002490 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002491 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002492 'and may interfere with it in subtle ways.\n'
2493 'We recommend you remove the commit-msg hook.')
2494 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002495 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002496 gclient_utils.rm_file_or_tree(hook)
2497 print('Gerrit commit-msg hook removed.')
2498 else:
2499 print('OK, will keep Gerrit commit-msg hook in place.')
2500
Edward Lemur1b52d872019-05-09 21:12:12 +00002501 def _CleanUpOldTraces(self):
2502 """Keep only the last |MAX_TRACES| traces."""
2503 try:
2504 traces = sorted([
2505 os.path.join(TRACES_DIR, f)
2506 for f in os.listdir(TRACES_DIR)
2507 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2508 and not f.startswith('tmp'))
2509 ])
2510 traces_to_delete = traces[:-MAX_TRACES]
2511 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002512 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002513 except OSError:
2514 print('WARNING: Failed to remove old git traces from\n'
2515 ' %s'
2516 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002517
Edward Lemur5737f022019-05-17 01:24:00 +00002518 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002519 """Zip and write the git push traces stored in traces_dir."""
2520 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002521 traces_zip = trace_name + '-traces'
2522 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002523 # Create a temporary dir to store git config and gitcookies in. It will be
2524 # compressed and stored next to the traces.
2525 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002526 git_info_zip = trace_name + '-git-info'
2527
Edward Lemur5737f022019-05-17 01:24:00 +00002528 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002529 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002530 git_push_metadata['now'] = git_push_metadata['now'].decode(
2531 sys.stdin.encoding)
2532
Edward Lemur1b52d872019-05-09 21:12:12 +00002533 git_push_metadata['trace_name'] = trace_name
2534 gclient_utils.FileWrite(
2535 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2536
2537 # Keep only the first 6 characters of the git hashes on the packet
2538 # trace. This greatly decreases size after compression.
2539 packet_traces = os.path.join(traces_dir, 'trace-packet')
2540 if os.path.isfile(packet_traces):
2541 contents = gclient_utils.FileRead(packet_traces)
2542 gclient_utils.FileWrite(
2543 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2544 shutil.make_archive(traces_zip, 'zip', traces_dir)
2545
2546 # Collect and compress the git config and gitcookies.
2547 git_config = RunGit(['config', '-l'])
2548 gclient_utils.FileWrite(
2549 os.path.join(git_info_dir, 'git-config'),
2550 git_config)
2551
2552 cookie_auth = gerrit_util.Authenticator.get()
2553 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2554 gitcookies_path = cookie_auth.get_gitcookies_path()
2555 if os.path.isfile(gitcookies_path):
2556 gitcookies = gclient_utils.FileRead(gitcookies_path)
2557 gclient_utils.FileWrite(
2558 os.path.join(git_info_dir, 'gitcookies'),
2559 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2560 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2561
Edward Lemur1b52d872019-05-09 21:12:12 +00002562 gclient_utils.rmtree(git_info_dir)
2563
2564 def _RunGitPushWithTraces(
2565 self, change_desc, refspec, refspec_opts, git_push_metadata):
2566 """Run git push and collect the traces resulting from the execution."""
2567 # Create a temporary directory to store traces in. Traces will be compressed
2568 # and stored in a 'traces' dir inside depot_tools.
2569 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002570 trace_name = os.path.join(
2571 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002572
2573 env = os.environ.copy()
2574 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2575 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002576 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002577 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2578 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2579 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2580
2581 try:
2582 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002583 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002584 before_push = time_time()
2585 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002586 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002587 env=env,
2588 print_stdout=True,
2589 # Flush after every line: useful for seeing progress when running as
2590 # recipe.
2591 filter_fn=lambda _: sys.stdout.flush())
2592 except subprocess2.CalledProcessError as e:
2593 push_returncode = e.returncode
2594 DieWithError('Failed to create a change. Please examine output above '
2595 'for the reason of the failure.\n'
2596 'Hint: run command below to diagnose common Git/Gerrit '
2597 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002598 ' git cl creds-check\n'
2599 '\n'
2600 'If git-cl is not working correctly, file a bug under the '
2601 'Infra>SDK component including the files below.\n'
2602 'Review the files before upload, since they might contain '
2603 'sensitive information.\n'
2604 'Set the Restrict-View-Google label so that they are not '
2605 'publicly accessible.\n'
2606 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002607 change_desc)
2608 finally:
2609 execution_time = time_time() - before_push
2610 metrics.collector.add_repeated('sub_commands', {
2611 'command': 'git push',
2612 'execution_time': execution_time,
2613 'exit_code': push_returncode,
2614 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2615 })
2616
Edward Lemur1b52d872019-05-09 21:12:12 +00002617 git_push_metadata['execution_time'] = execution_time
2618 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002619 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002620
Edward Lemur1b52d872019-05-09 21:12:12 +00002621 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002622 gclient_utils.rmtree(traces_dir)
2623
2624 return push_stdout
2625
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002626 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002628 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002629 # Load default for user, repo, squash=true, in this order.
2630 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002631
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002632 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002633 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002634 # This may be None; default fallback value is determined in logic below.
2635 title = options.title
2636
Dominic Battre7d1c4842017-10-27 09:17:28 +02002637 # Extract bug number from branch name.
2638 bug = options.bug
2639 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2640 if not bug and match:
2641 bug = match.group(1)
2642
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002643 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002644 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002645 if self.GetIssue():
2646 # Try to get the message from a previous upload.
2647 message = self.GetDescription()
2648 if not message:
2649 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002650 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002651 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002652 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002653 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002654 # When uploading a subsequent patchset, -m|--message is taken
2655 # as the patchset title if --title was not provided.
2656 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002657 else:
2658 default_title = RunGit(
2659 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002660 if options.force:
2661 title = default_title
2662 else:
2663 title = ask_for_data(
2664 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002665 change_id = self._GetChangeDetail()['change_id']
2666 while True:
2667 footer_change_ids = git_footers.get_footer_change_id(message)
2668 if footer_change_ids == [change_id]:
2669 break
2670 if not footer_change_ids:
2671 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002672 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002673 continue
2674 # There is already a valid footer but with different or several ids.
2675 # Doing this automatically is non-trivial as we don't want to lose
2676 # existing other footers, yet we want to append just 1 desired
2677 # Change-Id. Thus, just create a new footer, but let user verify the
2678 # new description.
2679 message = '%s\n\nChange-Id: %s' % (message, change_id)
2680 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002681 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002682 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002683 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002684 'Please, check the proposed correction to the description, '
2685 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2686 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2687 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002688 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002689 if not options.force:
2690 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002691 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002692 message = change_desc.description
2693 if not message:
2694 DieWithError("Description is empty. Aborting...")
2695 # Continue the while loop.
2696 # Sanity check of this code - we should end up with proper message
2697 # footer.
2698 assert [change_id] == git_footers.get_footer_change_id(message)
2699 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002700 else: # if not self.GetIssue()
2701 if options.message:
2702 message = options.message
2703 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002704 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002705 if options.title:
2706 message = options.title + '\n\n' + message
2707 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002708
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002709 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002710 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002711 # On first upload, patchset title is always this string, while
2712 # --title flag gets converted to first line of message.
2713 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002714 if not change_desc.description:
2715 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002716 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002717 if len(change_ids) > 1:
2718 DieWithError('too many Change-Id footers, at most 1 allowed.')
2719 if not change_ids:
2720 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002721 change_desc.set_description(git_footers.add_footer_change_id(
2722 change_desc.description,
2723 GenerateGerritChangeId(change_desc.description)))
2724 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002725 assert len(change_ids) == 1
2726 change_id = change_ids[0]
2727
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002728 if options.reviewers or options.tbrs or options.add_owners_to:
2729 change_desc.update_reviewers(options.reviewers, options.tbrs,
2730 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002731 if options.preserve_tryjobs:
2732 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002733
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002734 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002735 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2736 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002737 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002738 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2739 desc_tempfile.write(change_desc.description)
2740 desc_tempfile.close()
2741 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2742 '-F', desc_tempfile.name]).strip()
2743 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002744 else:
2745 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002746 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002747 if not change_desc.description:
2748 DieWithError("Description is empty. Aborting...")
2749
2750 if not git_footers.get_footer_change_id(change_desc.description):
2751 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002752 change_desc.set_description(
2753 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002754 if options.reviewers or options.tbrs or options.add_owners_to:
2755 change_desc.update_reviewers(options.reviewers, options.tbrs,
2756 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002757 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002758 # For no-squash mode, we assume the remote called "origin" is the one we
2759 # want. It is not worthwhile to support different workflows for
2760 # no-squash mode.
2761 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002762 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2763
2764 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002765 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2767 ref_to_push)]).splitlines()
2768 if len(commits) > 1:
2769 print('WARNING: This will upload %d commits. Run the following command '
2770 'to see which commits will be uploaded: ' % len(commits))
2771 print('git log %s..%s' % (parent, ref_to_push))
2772 print('You can also use `git squash-branch` to squash these into a '
2773 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002774 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002775
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002776 if options.reviewers or options.tbrs or options.add_owners_to:
2777 change_desc.update_reviewers(options.reviewers, options.tbrs,
2778 options.add_owners_to, change)
2779
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002780 reviewers = sorted(change_desc.get_reviewers())
2781 # Add cc's from the CC_LIST and --cc flag (if any).
2782 if not options.private and not options.no_autocc:
2783 cc = self.GetCCList().split(',')
2784 else:
2785 cc = []
2786 if options.cc:
2787 cc.extend(options.cc)
2788 cc = filter(None, [email.strip() for email in cc])
2789 if change_desc.get_cced():
2790 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002791 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2792 valid_accounts = set(reviewers + cc)
2793 # TODO(crbug/877717): relax this for all hosts.
2794 else:
2795 valid_accounts = gerrit_util.ValidAccounts(
2796 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002797 logging.info('accounts %s are recognized, %s invalid',
2798 sorted(valid_accounts),
2799 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002800
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002801 # Extra options that can be specified at push time. Doc:
2802 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002803 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002804
Aaron Gable844cf292017-06-28 11:32:59 -07002805 # By default, new changes are started in WIP mode, and subsequent patchsets
2806 # don't send email. At any time, passing --send-mail will mark the change
2807 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002808 if options.send_mail:
2809 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002810 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002811 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002812 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002813 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002814 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002815
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002816 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002817 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002818
Aaron Gable9b713dd2016-12-14 16:04:21 -08002819 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002820 # Punctuation and whitespace in |title| must be percent-encoded.
2821 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002822
agablec6787972016-09-09 16:13:34 -07002823 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002824 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002825
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002826 for r in sorted(reviewers):
2827 if r in valid_accounts:
2828 refspec_opts.append('r=%s' % r)
2829 reviewers.remove(r)
2830 else:
2831 # TODO(tandrii): this should probably be a hard failure.
2832 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2833 % r)
2834 for c in sorted(cc):
2835 # refspec option will be rejected if cc doesn't correspond to an
2836 # account, even though REST call to add such arbitrary cc may succeed.
2837 if c in valid_accounts:
2838 refspec_opts.append('cc=%s' % c)
2839 cc.remove(c)
2840
rmistry9eadede2016-09-19 11:22:43 -07002841 if options.topic:
2842 # Documentation on Gerrit topics is here:
2843 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002844 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002845
Edward Lemur687ca902018-12-05 02:30:30 +00002846 if options.enable_auto_submit:
2847 refspec_opts.append('l=Auto-Submit+1')
2848 if options.use_commit_queue:
2849 refspec_opts.append('l=Commit-Queue+2')
2850 elif options.cq_dry_run:
2851 refspec_opts.append('l=Commit-Queue+1')
2852
2853 if change_desc.get_reviewers(tbr_only=True):
2854 score = gerrit_util.GetCodeReviewTbrScore(
2855 self._GetGerritHost(),
2856 self._GetGerritProject())
2857 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002858
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002859 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002860 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002861 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002862 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002863 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2864
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002865 refspec_suffix = ''
2866 if refspec_opts:
2867 refspec_suffix = '%' + ','.join(refspec_opts)
2868 assert ' ' not in refspec_suffix, (
2869 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2870 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2871
Edward Lemur1b52d872019-05-09 21:12:12 +00002872 git_push_metadata = {
2873 'gerrit_host': self._GetGerritHost(),
2874 'title': title or '<untitled>',
2875 'change_id': change_id,
2876 'description': change_desc.description,
2877 }
2878 push_stdout = self._RunGitPushWithTraces(
2879 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880
2881 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002882 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002883 change_numbers = [m.group(1)
2884 for m in map(regex.match, push_stdout.splitlines())
2885 if m]
2886 if len(change_numbers) != 1:
2887 DieWithError(
2888 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002889 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002891 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002892
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002893 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002894 # GetIssue() is not set in case of non-squash uploads according to tests.
2895 # TODO(agable): non-squash uploads in git cl should be removed.
2896 gerrit_util.AddReviewers(
2897 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002898 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002899 reviewers, cc,
2900 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002901
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902 return 0
2903
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002904 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2905 change_desc):
2906 """Computes parent of the generated commit to be uploaded to Gerrit.
2907
2908 Returns revision or a ref name.
2909 """
2910 if custom_cl_base:
2911 # Try to avoid creating additional unintended CLs when uploading, unless
2912 # user wants to take this risk.
2913 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2914 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2915 local_ref_of_target_remote])
2916 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002917 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002918 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2919 'If you proceed with upload, more than 1 CL may be created by '
2920 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2921 'If you are certain that specified base `%s` has already been '
2922 'uploaded to Gerrit as another CL, you may proceed.\n' %
2923 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2924 if not force:
2925 confirm_or_exit(
2926 'Do you take responsibility for cleaning up potential mess '
2927 'resulting from proceeding with upload?',
2928 action='upload')
2929 return custom_cl_base
2930
Aaron Gablef97e33d2017-03-30 15:44:27 -07002931 if remote != '.':
2932 return self.GetCommonAncestorWithUpstream()
2933
2934 # If our upstream branch is local, we base our squashed commit on its
2935 # squashed version.
2936 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2937
Aaron Gablef97e33d2017-03-30 15:44:27 -07002938 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002939 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002940
2941 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002942 # TODO(tandrii): consider checking parent change in Gerrit and using its
2943 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2944 # the tree hash of the parent branch. The upside is less likely bogus
2945 # requests to reupload parent change just because it's uploadhash is
2946 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002947 parent = RunGit(['config',
2948 'branch.%s.gerritsquashhash' % upstream_branch_name],
2949 error_ok=True).strip()
2950 # Verify that the upstream branch has been uploaded too, otherwise
2951 # Gerrit will create additional CLs when uploading.
2952 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2953 RunGitSilent(['rev-parse', parent + ':'])):
2954 DieWithError(
2955 '\nUpload upstream branch %s first.\n'
2956 'It is likely that this branch has been rebased since its last '
2957 'upload, so you just need to upload it again.\n'
2958 '(If you uploaded it with --no-squash, then branch dependencies '
2959 'are not supported, and you should reupload with --squash.)'
2960 % upstream_branch_name,
2961 change_desc)
2962 return parent
2963
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002964 def _AddChangeIdToCommitMessage(self, options, args):
2965 """Re-commits using the current message, assumes the commit hook is in
2966 place.
2967 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002968 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002969 git_command = ['commit', '--amend', '-m', log_desc]
2970 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002971 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002972 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002973 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002974 return new_log_desc
2975 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002976 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002977
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002978 def SetCQState(self, new_state):
2979 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002980 vote_map = {
2981 _CQState.NONE: 0,
2982 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002983 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002984 }
Aaron Gablefc62f762017-07-17 11:12:07 -07002985 labels = {'Commit-Queue': vote_map[new_state]}
2986 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002987 gerrit_util.SetReview(
2988 self._GetGerritHost(), self._GerritChangeIdentifier(),
2989 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002990
tandriie113dfd2016-10-11 10:20:12 -07002991 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002992 try:
2993 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002994 except GerritChangeNotExists:
2995 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002996
2997 if data['status'] in ('ABANDONED', 'MERGED'):
2998 return 'CL %s is closed' % self.GetIssue()
2999
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003000 def GetTryJobProperties(self, patchset=None):
3001 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003002 data = self._GetChangeDetail(['ALL_REVISIONS'])
3003 patchset = int(patchset or self.GetPatchset())
3004 assert patchset
3005 revision_data = None # Pylint wants it to be defined.
3006 for revision_data in data['revisions'].itervalues():
3007 if int(revision_data['_number']) == patchset:
3008 break
3009 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003010 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003011 (patchset, self.GetIssue()))
3012 return {
3013 'patch_issue': self.GetIssue(),
3014 'patch_set': patchset or self.GetPatchset(),
3015 'patch_project': data['project'],
3016 'patch_storage': 'gerrit',
3017 'patch_ref': revision_data['fetch']['http']['ref'],
3018 'patch_repository_url': revision_data['fetch']['http']['url'],
3019 'patch_gerrit_url': self.GetCodereviewServer(),
3020 }
tandriie113dfd2016-10-11 10:20:12 -07003021
tandriide281ae2016-10-12 06:02:30 -07003022 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003023 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003024
Edward Lemur707d70b2018-02-07 00:50:14 +01003025 def GetReviewers(self):
3026 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003027 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003028
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003029
3030_CODEREVIEW_IMPLEMENTATIONS = {
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003031 'gerrit': _GerritChangelistImpl,
3032}
3033
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003034
iannuccie53c9352016-08-17 14:40:40 -07003035def _add_codereview_issue_select_options(parser, extra=""):
3036 _add_codereview_select_options(parser)
3037
3038 text = ('Operate on this issue number instead of the current branch\'s '
3039 'implicit issue.')
3040 if extra:
3041 text += ' '+extra
3042 parser.add_option('-i', '--issue', type=int, help=text)
3043
3044
3045def _process_codereview_issue_select_options(parser, options):
3046 _process_codereview_select_options(parser, options)
3047 if options.issue is not None and not options.forced_codereview:
3048 parser.error('--issue must be specified with either --rietveld or --gerrit')
3049
3050
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003051def _add_codereview_select_options(parser):
3052 """Appends --gerrit and --rietveld options to force specific codereview."""
3053 parser.codereview_group = optparse.OptionGroup(
3054 parser, 'EXPERIMENTAL! Codereview override options')
3055 parser.add_option_group(parser.codereview_group)
3056 parser.codereview_group.add_option(
3057 '--gerrit', action='store_true',
3058 help='Force the use of Gerrit for codereview')
3059 parser.codereview_group.add_option(
3060 '--rietveld', action='store_true',
3061 help='Force the use of Rietveld for codereview')
3062
3063
3064def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003065 if options.rietveld:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003066 parser.error('--rietveld is no longer supported.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003067 options.forced_codereview = None
3068 if options.gerrit:
3069 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003070
3071
tandriif9aefb72016-07-01 09:06:51 -07003072def _get_bug_line_values(default_project, bugs):
3073 """Given default_project and comma separated list of bugs, yields bug line
3074 values.
3075
3076 Each bug can be either:
3077 * a number, which is combined with default_project
3078 * string, which is left as is.
3079
3080 This function may produce more than one line, because bugdroid expects one
3081 project per line.
3082
3083 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3084 ['v8:123', 'chromium:789']
3085 """
3086 default_bugs = []
3087 others = []
3088 for bug in bugs.split(','):
3089 bug = bug.strip()
3090 if bug:
3091 try:
3092 default_bugs.append(int(bug))
3093 except ValueError:
3094 others.append(bug)
3095
3096 if default_bugs:
3097 default_bugs = ','.join(map(str, default_bugs))
3098 if default_project:
3099 yield '%s:%s' % (default_project, default_bugs)
3100 else:
3101 yield default_bugs
3102 for other in sorted(others):
3103 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3104 yield other
3105
3106
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003107class ChangeDescription(object):
3108 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003109 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003110 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003111 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003112 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003113 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3114 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3115 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3116 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003117
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003118 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003119 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003120
agable@chromium.org42c20792013-09-12 17:34:49 +00003121 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003122 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003123 return '\n'.join(self._description_lines)
3124
3125 def set_description(self, desc):
3126 if isinstance(desc, basestring):
3127 lines = desc.splitlines()
3128 else:
3129 lines = [line.rstrip() for line in desc]
3130 while lines and not lines[0]:
3131 lines.pop(0)
3132 while lines and not lines[-1]:
3133 lines.pop(-1)
3134 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003135
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003136 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3137 """Rewrites the R=/TBR= line(s) as a single line each.
3138
3139 Args:
3140 reviewers (list(str)) - list of additional emails to use for reviewers.
3141 tbrs (list(str)) - list of additional emails to use for TBRs.
3142 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3143 the change that are missing OWNER coverage. If this is not None, you
3144 must also pass a value for `change`.
3145 change (Change) - The Change that should be used for OWNERS lookups.
3146 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003147 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003148 assert isinstance(tbrs, list), tbrs
3149
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003150 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003151 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003152
3153 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003154 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003155
3156 reviewers = set(reviewers)
3157 tbrs = set(tbrs)
3158 LOOKUP = {
3159 'TBR': tbrs,
3160 'R': reviewers,
3161 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003162
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003163 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003164 regexp = re.compile(self.R_LINE)
3165 matches = [regexp.match(line) for line in self._description_lines]
3166 new_desc = [l for i, l in enumerate(self._description_lines)
3167 if not matches[i]]
3168 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003169
agable@chromium.org42c20792013-09-12 17:34:49 +00003170 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003171
3172 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003173 for match in matches:
3174 if not match:
3175 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003176 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3177
3178 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003179 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003180 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003181 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003182 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003183 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003184 LOOKUP[add_owners_to].update(
3185 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003186
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003187 # If any folks ended up in both groups, remove them from tbrs.
3188 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003189
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003190 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3191 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003192
3193 # Put the new lines in the description where the old first R= line was.
3194 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3195 if 0 <= line_loc < len(self._description_lines):
3196 if new_tbr_line:
3197 self._description_lines.insert(line_loc, new_tbr_line)
3198 if new_r_line:
3199 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003200 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003201 if new_r_line:
3202 self.append_footer(new_r_line)
3203 if new_tbr_line:
3204 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003205
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003206 def set_preserve_tryjobs(self):
3207 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3208 footers = git_footers.parse_footers(self.description)
3209 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3210 if v.lower() == 'true':
3211 return
3212 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3213
Aaron Gable3a16ed12017-03-23 10:51:55 -07003214 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003216 self.set_description([
3217 '# Enter a description of the change.',
3218 '# This will be displayed on the codereview site.',
3219 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003220 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003221 '--------------------',
3222 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003223
agable@chromium.org42c20792013-09-12 17:34:49 +00003224 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003225 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00003226 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003227 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003228 if git_footer:
3229 self.append_footer('Bug: %s' % ', '.join(values))
3230 else:
3231 for value in values:
3232 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003233
agable@chromium.org42c20792013-09-12 17:34:49 +00003234 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003235 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003236 if not content:
3237 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003238 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003239
Bruce Dawson2377b012018-01-11 16:46:49 -08003240 # Strip off comments and default inserted "Bug:" line.
3241 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003242 (line.startswith('#') or
3243 line.rstrip() == "Bug:" or
3244 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003246 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003247 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003248
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003249 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003250 """Adds a footer line to the description.
3251
3252 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3253 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3254 that Gerrit footers are always at the end.
3255 """
3256 parsed_footer_line = git_footers.parse_footer(line)
3257 if parsed_footer_line:
3258 # Line is a gerrit footer in the form: Footer-Key: any value.
3259 # Thus, must be appended observing Gerrit footer rules.
3260 self.set_description(
3261 git_footers.add_footer(self.description,
3262 key=parsed_footer_line[0],
3263 value=parsed_footer_line[1]))
3264 return
3265
3266 if not self._description_lines:
3267 self._description_lines.append(line)
3268 return
3269
3270 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3271 if gerrit_footers:
3272 # git_footers.split_footers ensures that there is an empty line before
3273 # actual (gerrit) footers, if any. We have to keep it that way.
3274 assert top_lines and top_lines[-1] == ''
3275 top_lines, separator = top_lines[:-1], top_lines[-1:]
3276 else:
3277 separator = [] # No need for separator if there are no gerrit_footers.
3278
3279 prev_line = top_lines[-1] if top_lines else ''
3280 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3281 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3282 top_lines.append('')
3283 top_lines.append(line)
3284 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003285
tandrii99a72f22016-08-17 14:33:24 -07003286 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003287 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003288 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003289 reviewers = [match.group(2).strip()
3290 for match in matches
3291 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003292 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003293
bradnelsond975b302016-10-23 12:20:23 -07003294 def get_cced(self):
3295 """Retrieves the list of reviewers."""
3296 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3297 cced = [match.group(2).strip() for match in matches if match]
3298 return cleanup_list(cced)
3299
Nodir Turakulov23b82142017-11-16 11:04:25 -08003300 def get_hash_tags(self):
3301 """Extracts and sanitizes a list of Gerrit hashtags."""
3302 subject = (self._description_lines or ('',))[0]
3303 subject = re.sub(
3304 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3305
3306 tags = []
3307 start = 0
3308 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3309 while True:
3310 m = bracket_exp.match(subject, start)
3311 if not m:
3312 break
3313 tags.append(self.sanitize_hash_tag(m.group(1)))
3314 start = m.end()
3315
3316 if not tags:
3317 # Try "Tag: " prefix.
3318 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3319 if m:
3320 tags.append(self.sanitize_hash_tag(m.group(1)))
3321 return tags
3322
3323 @classmethod
3324 def sanitize_hash_tag(cls, tag):
3325 """Returns a sanitized Gerrit hash tag.
3326
3327 A sanitized hashtag can be used as a git push refspec parameter value.
3328 """
3329 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3330
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003331 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3332 """Updates this commit description given the parent.
3333
3334 This is essentially what Gnumbd used to do.
3335 Consult https://goo.gl/WMmpDe for more details.
3336 """
3337 assert parent_msg # No, orphan branch creation isn't supported.
3338 assert parent_hash
3339 assert dest_ref
3340 parent_footer_map = git_footers.parse_footers(parent_msg)
3341 # This will also happily parse svn-position, which GnumbD is no longer
3342 # supporting. While we'd generate correct footers, the verifier plugin
3343 # installed in Gerrit will block such commit (ie git push below will fail).
3344 parent_position = git_footers.get_position(parent_footer_map)
3345
3346 # Cherry-picks may have last line obscuring their prior footers,
3347 # from git_footers perspective. This is also what Gnumbd did.
3348 cp_line = None
3349 if (self._description_lines and
3350 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3351 cp_line = self._description_lines.pop()
3352
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003353 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003354
3355 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3356 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003357 for i, line in enumerate(footer_lines):
3358 k, v = git_footers.parse_footer(line) or (None, None)
3359 if k and k.startswith('Cr-'):
3360 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003361
3362 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003363 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003364 if parent_position[0] == dest_ref:
3365 # Same branch as parent.
3366 number = int(parent_position[1]) + 1
3367 else:
3368 number = 1 # New branch, and extra lineage.
3369 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3370 int(parent_position[1])))
3371
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003372 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3373 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003374
3375 self._description_lines = top_lines
3376 if cp_line:
3377 self._description_lines.append(cp_line)
3378 if self._description_lines[-1] != '':
3379 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003380 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003381
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003382
Aaron Gablea1bab272017-04-11 16:38:18 -07003383def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003384 """Retrieves the reviewers that approved a CL from the issue properties with
3385 messages.
3386
3387 Note that the list may contain reviewers that are not committer, thus are not
3388 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003389
3390 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003391 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003392 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003393 return sorted(
3394 set(
3395 message['sender']
3396 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003397 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003398 )
3399 )
3400
3401
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003402def FindCodereviewSettingsFile(filename='codereview.settings'):
3403 """Finds the given file starting in the cwd and going up.
3404
3405 Only looks up to the top of the repository unless an
3406 'inherit-review-settings-ok' file exists in the root of the repository.
3407 """
3408 inherit_ok_file = 'inherit-review-settings-ok'
3409 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003410 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003411 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3412 root = '/'
3413 while True:
3414 if filename in os.listdir(cwd):
3415 if os.path.isfile(os.path.join(cwd, filename)):
3416 return open(os.path.join(cwd, filename))
3417 if cwd == root:
3418 break
3419 cwd = os.path.dirname(cwd)
3420
3421
3422def LoadCodereviewSettingsFromFile(fileobj):
3423 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003424 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003425
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003426 def SetProperty(name, setting, unset_error_ok=False):
3427 fullname = 'rietveld.' + name
3428 if setting in keyvals:
3429 RunGit(['config', fullname, keyvals[setting]])
3430 else:
3431 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3432
tandrii48df5812016-10-17 03:55:37 -07003433 if not keyvals.get('GERRIT_HOST', False):
3434 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435 # Only server setting is required. Other settings can be absent.
3436 # In that case, we ignore errors raised during option deletion attempt.
3437 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3438 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3439 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003440 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003441 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3442 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003443 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3444 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003445
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003446 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003447 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003448
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003449 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003450 RunGit(['config', 'gerrit.squash-uploads',
3451 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003452
tandrii@chromium.org28253532016-04-14 13:46:56 +00003453 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003454 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003455 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3456
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003457 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003458 # should be of the form
3459 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3460 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003461 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3462 keyvals['ORIGIN_URL_CONFIG']])
3463
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003464
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003465def urlretrieve(source, destination):
3466 """urllib is broken for SSL connections via a proxy therefore we
3467 can't use urllib.urlretrieve()."""
3468 with open(destination, 'w') as f:
3469 f.write(urllib2.urlopen(source).read())
3470
3471
ukai@chromium.org712d6102013-11-27 00:52:58 +00003472def hasSheBang(fname):
3473 """Checks fname is a #! script."""
3474 with open(fname) as f:
3475 return f.read(2).startswith('#!')
3476
3477
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003478# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3479def DownloadHooks(*args, **kwargs):
3480 pass
3481
3482
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003483def DownloadGerritHook(force):
3484 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003485
3486 Args:
3487 force: True to update hooks. False to install hooks if not present.
3488 """
3489 if not settings.GetIsGerrit():
3490 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003491 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003492 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3493 if not os.access(dst, os.X_OK):
3494 if os.path.exists(dst):
3495 if not force:
3496 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003497 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003498 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003499 if not hasSheBang(dst):
3500 DieWithError('Not a script: %s\n'
3501 'You need to download from\n%s\n'
3502 'into .git/hooks/commit-msg and '
3503 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003504 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3505 except Exception:
3506 if os.path.exists(dst):
3507 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003508 DieWithError('\nFailed to download hooks.\n'
3509 'You need to download from\n%s\n'
3510 'into .git/hooks/commit-msg and '
3511 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003512
3513
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003514class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003515 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003516
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003517 _GOOGLESOURCE = 'googlesource.com'
3518
3519 def __init__(self):
3520 # Cached list of [host, identity, source], where source is either
3521 # .gitcookies or .netrc.
3522 self._all_hosts = None
3523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 def ensure_configured_gitcookies(self):
3525 """Runs checks and suggests fixes to make git use .gitcookies from default
3526 path."""
3527 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3528 configured_path = RunGitSilent(
3529 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003530 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003531 if configured_path:
3532 self._ensure_default_gitcookies_path(configured_path, default)
3533 else:
3534 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003535
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003536 @staticmethod
3537 def _ensure_default_gitcookies_path(configured_path, default_path):
3538 assert configured_path
3539 if configured_path == default_path:
3540 print('git is already configured to use your .gitcookies from %s' %
3541 configured_path)
3542 return
3543
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003544 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003545 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3546 (configured_path, default_path))
3547
3548 if not os.path.exists(configured_path):
3549 print('However, your configured .gitcookies file is missing.')
3550 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3551 action='reconfigure')
3552 RunGit(['config', '--global', 'http.cookiefile', default_path])
3553 return
3554
3555 if os.path.exists(default_path):
3556 print('WARNING: default .gitcookies file already exists %s' %
3557 default_path)
3558 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3559 default_path)
3560
3561 confirm_or_exit('Move existing .gitcookies to default location?',
3562 action='move')
3563 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003564 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003565 print('Moved and reconfigured git to use .gitcookies from %s' %
3566 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003567
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003568 @staticmethod
3569 def _configure_gitcookies_path(default_path):
3570 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3571 if os.path.exists(netrc_path):
3572 print('You seem to be using outdated .netrc for git credentials: %s' %
3573 netrc_path)
3574 print('This tool will guide you through setting up recommended '
3575 '.gitcookies store for git credentials.\n'
3576 '\n'
3577 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3578 ' git config --global --unset http.cookiefile\n'
3579 ' mv %s %s.backup\n\n' % (default_path, default_path))
3580 confirm_or_exit(action='setup .gitcookies')
3581 RunGit(['config', '--global', 'http.cookiefile', default_path])
3582 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003583
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003584 def get_hosts_with_creds(self, include_netrc=False):
3585 if self._all_hosts is None:
3586 a = gerrit_util.CookiesAuthenticator()
3587 self._all_hosts = [
3588 (h, u, s)
3589 for h, u, s in itertools.chain(
3590 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3591 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3592 )
3593 if h.endswith(self._GOOGLESOURCE)
3594 ]
3595
3596 if include_netrc:
3597 return self._all_hosts
3598 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3599
3600 def print_current_creds(self, include_netrc=False):
3601 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3602 if not hosts:
3603 print('No Git/Gerrit credentials found')
3604 return
3605 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3606 header = [('Host', 'User', 'Which file'),
3607 ['=' * l for l in lengths]]
3608 for row in (header + hosts):
3609 print('\t'.join((('%%+%ds' % l) % s)
3610 for l, s in zip(lengths, row)))
3611
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003612 @staticmethod
3613 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003614 """Parses identity "git-<username>.domain" into <username> and domain."""
3615 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003616 # distinguishable from sub-domains. But we do know typical domains:
3617 if identity.endswith('.chromium.org'):
3618 domain = 'chromium.org'
3619 username = identity[:-len('.chromium.org')]
3620 else:
3621 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003622 if username.startswith('git-'):
3623 username = username[len('git-'):]
3624 return username, domain
3625
3626 def _get_usernames_of_domain(self, domain):
3627 """Returns list of usernames referenced by .gitcookies in a given domain."""
3628 identities_by_domain = {}
3629 for _, identity, _ in self.get_hosts_with_creds():
3630 username, domain = self._parse_identity(identity)
3631 identities_by_domain.setdefault(domain, []).append(username)
3632 return identities_by_domain.get(domain)
3633
3634 def _canonical_git_googlesource_host(self, host):
3635 """Normalizes Gerrit hosts (with '-review') to Git host."""
3636 assert host.endswith(self._GOOGLESOURCE)
3637 # Prefix doesn't include '.' at the end.
3638 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3639 if prefix.endswith('-review'):
3640 prefix = prefix[:-len('-review')]
3641 return prefix + '.' + self._GOOGLESOURCE
3642
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643 def _canonical_gerrit_googlesource_host(self, host):
3644 git_host = self._canonical_git_googlesource_host(host)
3645 prefix = git_host.split('.', 1)[0]
3646 return prefix + '-review.' + self._GOOGLESOURCE
3647
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003648 def _get_counterpart_host(self, host):
3649 assert host.endswith(self._GOOGLESOURCE)
3650 git = self._canonical_git_googlesource_host(host)
3651 gerrit = self._canonical_gerrit_googlesource_host(git)
3652 return git if gerrit == host else gerrit
3653
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003654 def has_generic_host(self):
3655 """Returns whether generic .googlesource.com has been configured.
3656
3657 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3658 """
3659 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3660 if host == '.' + self._GOOGLESOURCE:
3661 return True
3662 return False
3663
3664 def _get_git_gerrit_identity_pairs(self):
3665 """Returns map from canonic host to pair of identities (Git, Gerrit).
3666
3667 One of identities might be None, meaning not configured.
3668 """
3669 host_to_identity_pairs = {}
3670 for host, identity, _ in self.get_hosts_with_creds():
3671 canonical = self._canonical_git_googlesource_host(host)
3672 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3673 idx = 0 if canonical == host else 1
3674 pair[idx] = identity
3675 return host_to_identity_pairs
3676
3677 def get_partially_configured_hosts(self):
3678 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003679 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3680 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3681 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003682
3683 def get_conflicting_hosts(self):
3684 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003685 host
3686 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003687 if None not in (i1, i2) and i1 != i2)
3688
3689 def get_duplicated_hosts(self):
3690 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3691 return set(host for host, count in counters.iteritems() if count > 1)
3692
3693 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3694 'chromium.googlesource.com': 'chromium.org',
3695 'chrome-internal.googlesource.com': 'google.com',
3696 }
3697
3698 def get_hosts_with_wrong_identities(self):
3699 """Finds hosts which **likely** reference wrong identities.
3700
3701 Note: skips hosts which have conflicting identities for Git and Gerrit.
3702 """
3703 hosts = set()
3704 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3705 pair = self._get_git_gerrit_identity_pairs().get(host)
3706 if pair and pair[0] == pair[1]:
3707 _, domain = self._parse_identity(pair[0])
3708 if domain != expected:
3709 hosts.add(host)
3710 return hosts
3711
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003712 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003713 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003714 hosts = sorted(hosts)
3715 assert hosts
3716 if extra_column_func is None:
3717 extras = [''] * len(hosts)
3718 else:
3719 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003720 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3721 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003722 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003723 lines.append(tmpl % he)
3724 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003725
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003726 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003727 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003728 yield ('.googlesource.com wildcard record detected',
3729 ['Chrome Infrastructure team recommends to list full host names '
3730 'explicitly.'],
3731 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003732
3733 dups = self.get_duplicated_hosts()
3734 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003735 yield ('The following hosts were defined twice',
3736 self._format_hosts(dups),
3737 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003738
3739 partial = self.get_partially_configured_hosts()
3740 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003741 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3742 'These hosts are missing',
3743 self._format_hosts(partial, lambda host: 'but %s defined' %
3744 self._get_counterpart_host(host)),
3745 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003746
3747 conflicting = self.get_conflicting_hosts()
3748 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003749 yield ('The following Git hosts have differing credentials from their '
3750 'Gerrit counterparts',
3751 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3752 tuple(self._get_git_gerrit_identity_pairs()[host])),
3753 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003754
3755 wrong = self.get_hosts_with_wrong_identities()
3756 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003757 yield ('These hosts likely use wrong identity',
3758 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3759 (self._get_git_gerrit_identity_pairs()[host][0],
3760 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3761 wrong)
3762
3763 def find_and_report_problems(self):
3764 """Returns True if there was at least one problem, else False."""
3765 found = False
3766 bad_hosts = set()
3767 for title, sublines, hosts in self._find_problems():
3768 if not found:
3769 found = True
3770 print('\n\n.gitcookies problem report:\n')
3771 bad_hosts.update(hosts or [])
3772 print(' %s%s' % (title , (':' if sublines else '')))
3773 if sublines:
3774 print()
3775 print(' %s' % '\n '.join(sublines))
3776 print()
3777
3778 if bad_hosts:
3779 assert found
3780 print(' You can manually remove corresponding lines in your %s file and '
3781 'visit the following URLs with correct account to generate '
3782 'correct credential lines:\n' %
3783 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3784 print(' %s' % '\n '.join(sorted(set(
3785 gerrit_util.CookiesAuthenticator().get_new_password_url(
3786 self._canonical_git_googlesource_host(host))
3787 for host in bad_hosts
3788 ))))
3789 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003790
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003791
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003792@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003793def CMDcreds_check(parser, args):
3794 """Checks credentials and suggests changes."""
3795 _, _ = parser.parse_args(args)
3796
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003797 # Code below checks .gitcookies. Abort if using something else.
3798 authn = gerrit_util.Authenticator.get()
3799 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3800 if isinstance(authn, gerrit_util.GceAuthenticator):
3801 DieWithError(
3802 'This command is not designed for GCE, are you on a bot?\n'
3803 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3804 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003805 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003806 'This command is not designed for bot environment. It checks '
3807 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003808
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003809 checker = _GitCookiesChecker()
3810 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003811
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003812 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003813 checker.print_current_creds(include_netrc=True)
3814
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003815 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003816 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003817 return 0
3818 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003819
3820
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003821@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003822def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003823 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003824 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3825 branch = ShortBranchName(branchref)
3826 _, args = parser.parse_args(args)
3827 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003828 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003829 return RunGit(['config', 'branch.%s.base-url' % branch],
3830 error_ok=False).strip()
3831 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003833 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3834 error_ok=False).strip()
3835
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003836def color_for_status(status):
3837 """Maps a Changelist status to color, for CMDstatus and other tools."""
3838 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003839 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003840 'waiting': Fore.BLUE,
3841 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003842 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003843 'lgtm': Fore.GREEN,
3844 'commit': Fore.MAGENTA,
3845 'closed': Fore.CYAN,
3846 'error': Fore.WHITE,
3847 }.get(status, Fore.WHITE)
3848
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003849
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003850def get_cl_statuses(changes, fine_grained, max_processes=None):
3851 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003852
3853 If fine_grained is true, this will fetch CL statuses from the server.
3854 Otherwise, simply indicate if there's a matching url for the given branches.
3855
3856 If max_processes is specified, it is used as the maximum number of processes
3857 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3858 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003859
3860 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003861 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003862 if not changes:
3863 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003864
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003865 if not fine_grained:
3866 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003867 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003868 for cl in changes:
3869 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003870 return
3871
3872 # First, sort out authentication issues.
3873 logging.debug('ensuring credentials exist')
3874 for cl in changes:
3875 cl.EnsureAuthenticated(force=False, refresh=True)
3876
3877 def fetch(cl):
3878 try:
3879 return (cl, cl.GetStatus())
3880 except:
3881 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003882 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003883 raise
3884
3885 threads_count = len(changes)
3886 if max_processes:
3887 threads_count = max(1, min(threads_count, max_processes))
3888 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3889
3890 pool = ThreadPool(threads_count)
3891 fetched_cls = set()
3892 try:
3893 it = pool.imap_unordered(fetch, changes).__iter__()
3894 while True:
3895 try:
3896 cl, status = it.next(timeout=5)
3897 except multiprocessing.TimeoutError:
3898 break
3899 fetched_cls.add(cl)
3900 yield cl, status
3901 finally:
3902 pool.close()
3903
3904 # Add any branches that failed to fetch.
3905 for cl in set(changes) - fetched_cls:
3906 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003907
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908
3909def upload_branch_deps(cl, args):
3910 """Uploads CLs of local branches that are dependents of the current branch.
3911
3912 If the local branch dependency tree looks like:
3913 test1 -> test2.1 -> test3.1
3914 -> test3.2
3915 -> test2.2 -> test3.3
3916
3917 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3918 run on the dependent branches in this order:
3919 test2.1, test3.1, test3.2, test2.2, test3.3
3920
3921 Note: This function does not rebase your local dependent branches. Use it when
3922 you make a change to the parent branch that will not conflict with its
3923 dependent branches, and you would like their dependencies updated in
3924 Rietveld.
3925 """
3926 if git_common.is_dirty_git_tree('upload-branch-deps'):
3927 return 1
3928
3929 root_branch = cl.GetBranch()
3930 if root_branch is None:
3931 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3932 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003933 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003934 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3935 'patchset dependencies without an uploaded CL.')
3936
3937 branches = RunGit(['for-each-ref',
3938 '--format=%(refname:short) %(upstream:short)',
3939 'refs/heads'])
3940 if not branches:
3941 print('No local branches found.')
3942 return 0
3943
3944 # Create a dictionary of all local branches to the branches that are dependent
3945 # on it.
3946 tracked_to_dependents = collections.defaultdict(list)
3947 for b in branches.splitlines():
3948 tokens = b.split()
3949 if len(tokens) == 2:
3950 branch_name, tracked = tokens
3951 tracked_to_dependents[tracked].append(branch_name)
3952
vapiera7fbd5a2016-06-16 09:17:49 -07003953 print()
3954 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003955 dependents = []
3956 def traverse_dependents_preorder(branch, padding=''):
3957 dependents_to_process = tracked_to_dependents.get(branch, [])
3958 padding += ' '
3959 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003960 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003961 dependents.append(dependent)
3962 traverse_dependents_preorder(dependent, padding)
3963 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003964 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003965
3966 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003968 return 0
3969
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003970 confirm_or_exit('This command will checkout all dependent branches and run '
3971 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003972
rmistry@google.com2dd99862015-06-22 12:22:18 +00003973 # Record all dependents that failed to upload.
3974 failures = {}
3975 # Go through all dependents, checkout the branch and upload.
3976 try:
3977 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003978 print()
3979 print('--------------------------------------')
3980 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003981 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003983 try:
3984 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003985 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003986 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003987 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003988 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003990 finally:
3991 # Swap back to the original root branch.
3992 RunGit(['checkout', '-q', root_branch])
3993
vapiera7fbd5a2016-06-16 09:17:49 -07003994 print()
3995 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003996 for dependent_branch in dependents:
3997 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003998 print(' %s : %s' % (dependent_branch, upload_status))
3999 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004000
4001 return 0
4002
4003
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004004@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004005def CMDarchive(parser, args):
4006 """Archives and deletes branches associated with closed changelists."""
4007 parser.add_option(
4008 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004009 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004010 parser.add_option(
4011 '-f', '--force', action='store_true',
4012 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004013 parser.add_option(
4014 '-d', '--dry-run', action='store_true',
4015 help='Skip the branch tagging and removal steps.')
4016 parser.add_option(
4017 '-t', '--notags', action='store_true',
4018 help='Do not tag archived branches. '
4019 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004020
4021 auth.add_auth_options(parser)
4022 options, args = parser.parse_args(args)
4023 if args:
4024 parser.error('Unsupported args: %s' % ' '.join(args))
4025 auth_config = auth.extract_auth_config_from_options(options)
4026
4027 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4028 if not branches:
4029 return 0
4030
vapiera7fbd5a2016-06-16 09:17:49 -07004031 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004032 changes = [Changelist(branchref=b, auth_config=auth_config)
4033 for b in branches.splitlines()]
4034 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4035 statuses = get_cl_statuses(changes,
4036 fine_grained=True,
4037 max_processes=options.maxjobs)
4038 proposal = [(cl.GetBranch(),
4039 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4040 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004041 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004042 proposal.sort()
4043
4044 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004045 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004046 return 0
4047
4048 current_branch = GetCurrentBranch()
4049
vapiera7fbd5a2016-06-16 09:17:49 -07004050 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004051 if options.notags:
4052 for next_item in proposal:
4053 print(' ' + next_item[0])
4054 else:
4055 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4056 for next_item in proposal:
4057 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004058
kmarshall9249e012016-08-23 12:02:16 -07004059 # Quit now on precondition failure or if instructed by the user, either
4060 # via an interactive prompt or by command line flags.
4061 if options.dry_run:
4062 print('\nNo changes were made (dry run).\n')
4063 return 0
4064 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004065 print('You are currently on a branch \'%s\' which is associated with a '
4066 'closed codereview issue, so archive cannot proceed. Please '
4067 'checkout another branch and run this command again.' %
4068 current_branch)
4069 return 1
kmarshall9249e012016-08-23 12:02:16 -07004070 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004071 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4072 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004073 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004074 return 1
4075
4076 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004077 if not options.notags:
4078 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004079 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004080
vapiera7fbd5a2016-06-16 09:17:49 -07004081 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004082
4083 return 0
4084
4085
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004086@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004087def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004088 """Show status of changelists.
4089
4090 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004091 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004092 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004093 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004094 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004095 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004096 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004097 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004098
4099 Also see 'git cl comments'.
4100 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004101 parser.add_option(
4102 '--no-branch-color',
4103 action='store_true',
4104 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004105 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004106 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004107 parser.add_option('-f', '--fast', action='store_true',
4108 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004109 parser.add_option(
4110 '-j', '--maxjobs', action='store', type=int,
4111 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004112
4113 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004114 _add_codereview_issue_select_options(
4115 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004116 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004117 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004118 if args:
4119 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004120 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121
iannuccie53c9352016-08-17 14:40:40 -07004122 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004123 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07004124
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004125 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004126 cl = Changelist(auth_config=auth_config, issue=options.issue,
4127 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004128 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004129 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004130 elif options.field == 'id':
4131 issueid = cl.GetIssue()
4132 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004133 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004134 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004135 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004136 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004137 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004138 elif options.field == 'status':
4139 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004140 elif options.field == 'url':
4141 url = cl.GetIssueURL()
4142 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004143 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004144 return 0
4145
4146 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4147 if not branches:
4148 print('No local branch found.')
4149 return 0
4150
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004151 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004152 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004153 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004155 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004156 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004157 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004158
Daniel McArdlea23bf592019-02-12 00:25:12 +00004159 current_branch = GetCurrentBranch()
4160
4161 def FormatBranchName(branch, colorize=False):
4162 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4163 an asterisk when it is the current branch."""
4164
4165 asterisk = ""
4166 color = Fore.RESET
4167 if branch == current_branch:
4168 asterisk = "* "
4169 color = Fore.GREEN
4170 branch_name = ShortBranchName(branch)
4171
4172 if colorize:
4173 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004174 return asterisk + branch_name
4175
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004176 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004177
4178 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004179 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4180 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004181 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004182 c, status = output.next()
4183 branch_statuses[c.GetBranch()] = status
4184 status = branch_statuses.pop(branch)
4185 url = cl.GetIssueURL()
4186 if url and (not status or status == 'error'):
4187 # The issue probably doesn't exist anymore.
4188 url += ' (broken)'
4189
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004190 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004191 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004192 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004193 color = ''
4194 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004195 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004196
Alan Cuttera3be9a52019-03-04 18:50:33 +00004197 branch_display = FormatBranchName(branch)
4198 padding = ' ' * (alignment - len(branch_display))
4199 if not options.no_branch_color:
4200 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004201
Alan Cuttera3be9a52019-03-04 18:50:33 +00004202 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4203 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004204
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004206 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004207 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004208 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004209 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004210 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004212 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004213 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004214 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004215 print('Issue description:')
4216 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004217 return 0
4218
4219
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004220def colorize_CMDstatus_doc():
4221 """To be called once in main() to add colors to git cl status help."""
4222 colors = [i for i in dir(Fore) if i[0].isupper()]
4223
4224 def colorize_line(line):
4225 for color in colors:
4226 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004227 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004228 indent = len(line) - len(line.lstrip(' ')) + 1
4229 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4230 return line
4231
4232 lines = CMDstatus.__doc__.splitlines()
4233 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4234
4235
phajdan.jre328cf92016-08-22 04:12:17 -07004236def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004237 if path == '-':
4238 json.dump(contents, sys.stdout)
4239 else:
4240 with open(path, 'w') as f:
4241 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004242
4243
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004244@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004245@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004247 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004248
4249 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004250 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004251 parser.add_option('-r', '--reverse', action='store_true',
4252 help='Lookup the branch(es) for the specified issues. If '
4253 'no issues are specified, all branches with mapped '
4254 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004255 parser.add_option('--json',
4256 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004257 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004258 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004259 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004260
dnj@chromium.org406c4402015-03-03 17:22:28 +00004261 if options.reverse:
4262 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004263 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004264 # Reverse issue lookup.
4265 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004266
4267 git_config = {}
4268 for config in RunGit(['config', '--get-regexp',
4269 r'branch\..*issue']).splitlines():
4270 name, _space, val = config.partition(' ')
4271 git_config[name] = val
4272
dnj@chromium.org406c4402015-03-03 17:22:28 +00004273 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004274 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4275 config_key = _git_branch_config_key(ShortBranchName(branch),
4276 cls.IssueConfigKey())
4277 issue = git_config.get(config_key)
4278 if issue:
4279 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004280 if not args:
4281 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004282 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004283 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004284 try:
4285 issue_num = int(issue)
4286 except ValueError:
4287 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004288 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004289 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004290 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004291 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004292 if options.json:
4293 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004294 return 0
4295
4296 if len(args) > 0:
4297 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4298 if not issue.valid:
4299 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4300 'or no argument to list it.\n'
4301 'Maybe you want to run git cl status?')
4302 cl = Changelist(codereview=issue.codereview)
4303 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004304 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004305 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004306 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4307 if options.json:
4308 write_json(options.json, {
4309 'issue': cl.GetIssue(),
4310 'issue_url': cl.GetIssueURL(),
4311 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004312 return 0
4313
4314
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004315@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004316def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004317 """Shows or posts review comments for any changelist."""
4318 parser.add_option('-a', '--add-comment', dest='comment',
4319 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004320 parser.add_option('-p', '--publish', action='store_true',
4321 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004322 parser.add_option('-i', '--issue', dest='issue',
4323 help='review issue id (defaults to current issue). '
4324 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004325 parser.add_option('-m', '--machine-readable', dest='readable',
4326 action='store_false', default=True,
4327 help='output comments in a format compatible with '
4328 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004329 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004330 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004331 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004332 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004333 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004334 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004335 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004336
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004337 issue = None
4338 if options.issue:
4339 try:
4340 issue = int(options.issue)
4341 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004342 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004343
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004344 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4345
4346 if not cl.IsGerrit():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004347 parser.error('Rietveld is not supported.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004348
4349 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004350 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004351 return 0
4352
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004353 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4354 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004355 for comment in summary:
4356 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004357 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004358 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004359 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004360 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004361 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004362 elif comment.autogenerated:
4363 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004364 else:
4365 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004366 print('\n%s%s %s%s\n%s' % (
4367 color,
4368 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4369 comment.sender,
4370 Fore.RESET,
4371 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4372
smut@google.comc85ac942015-09-15 16:34:43 +00004373 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004374 def pre_serialize(c):
4375 dct = c.__dict__.copy()
4376 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4377 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004378 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004379 return 0
4380
4381
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004382@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004383@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004384def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004385 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004386 parser.add_option('-d', '--display', action='store_true',
4387 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004388 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004389 help='New description to set for this issue (- for stdin, '
4390 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004391 parser.add_option('-f', '--force', action='store_true',
4392 help='Delete any unpublished Gerrit edits for this issue '
4393 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004394
4395 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004396 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004397 options, args = parser.parse_args(args)
4398 _process_codereview_select_options(parser, options)
4399
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004400 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004401 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004402 target_issue_arg = ParseIssueNumberArgument(args[0],
4403 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004404 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004405 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004406
martiniss6eda05f2016-06-30 10:18:35 -07004407 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004408 'auth_config': auth.extract_auth_config_from_options(options),
4409 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004410 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004411 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004412 if target_issue_arg:
4413 kwargs['issue'] = target_issue_arg.issue
4414 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004415 if target_issue_arg.codereview and not options.forced_codereview:
4416 detected_codereview_from_url = True
4417 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004418
4419 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004420 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004421 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004422 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004423
4424 if detected_codereview_from_url:
4425 logging.info('canonical issue/change URL: %s (type: %s)\n',
4426 cl.GetIssueURL(), target_issue_arg.codereview)
4427
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004428 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004429
smut@google.com34fb6b12015-07-13 20:03:26 +00004430 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004431 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004432 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004433
4434 if options.new_description:
4435 text = options.new_description
4436 if text == '-':
4437 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004438 elif text == '+':
4439 base_branch = cl.GetCommonAncestorWithUpstream()
4440 change = cl.GetChange(base_branch, None, local_description=True)
4441 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004442
4443 description.set_description(text)
4444 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004445 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004446
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004447 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004448 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004449 return 0
4450
4451
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004452@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004453def CMDlint(parser, args):
4454 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004455 parser.add_option('--filter', action='append', metavar='-x,+y',
4456 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004457 auth.add_auth_options(parser)
4458 options, args = parser.parse_args(args)
4459 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004460
4461 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004462 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004463 try:
4464 import cpplint
4465 import cpplint_chromium
4466 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004467 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004468 return 1
4469
4470 # Change the current working directory before calling lint so that it
4471 # shows the correct base.
4472 previous_cwd = os.getcwd()
4473 os.chdir(settings.GetRoot())
4474 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004475 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004476 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4477 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004478 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004479 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004480 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004481
4482 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004483 command = args + files
4484 if options.filter:
4485 command = ['--filter=' + ','.join(options.filter)] + command
4486 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004487
4488 white_regex = re.compile(settings.GetLintRegex())
4489 black_regex = re.compile(settings.GetLintIgnoreRegex())
4490 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4491 for filename in filenames:
4492 if white_regex.match(filename):
4493 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004494 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004495 else:
4496 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4497 extra_check_functions)
4498 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004499 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004500 finally:
4501 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004502 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004503 if cpplint._cpplint_state.error_count != 0:
4504 return 1
4505 return 0
4506
4507
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004508@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004509def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004510 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004511 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004512 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004513 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004514 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004515 parser.add_option('--all', action='store_true',
4516 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004517 parser.add_option('--parallel', action='store_true',
4518 help='Run all tests specified by input_api.RunTests in all '
4519 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004520 auth.add_auth_options(parser)
4521 options, args = parser.parse_args(args)
4522 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523
sbc@chromium.org71437c02015-04-09 19:29:40 +00004524 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004525 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004526 return 1
4527
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004528 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529 if args:
4530 base_branch = args[0]
4531 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004532 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004533 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534
Aaron Gable8076c282017-11-29 14:39:41 -08004535 if options.all:
4536 base_change = cl.GetChange(base_branch, None)
4537 files = [('M', f) for f in base_change.AllFiles()]
4538 change = presubmit_support.GitChange(
4539 base_change.Name(),
4540 base_change.FullDescriptionText(),
4541 base_change.RepositoryRoot(),
4542 files,
4543 base_change.issue,
4544 base_change.patchset,
4545 base_change.author_email,
4546 base_change._upstream)
4547 else:
4548 change = cl.GetChange(base_branch, None)
4549
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004550 cl.RunHook(
4551 committing=not options.upload,
4552 may_prompt=False,
4553 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004554 change=change,
4555 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004556 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004557
4558
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004559def GenerateGerritChangeId(message):
4560 """Returns Ixxxxxx...xxx change id.
4561
4562 Works the same way as
4563 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4564 but can be called on demand on all platforms.
4565
4566 The basic idea is to generate git hash of a state of the tree, original commit
4567 message, author/committer info and timestamps.
4568 """
4569 lines = []
4570 tree_hash = RunGitSilent(['write-tree'])
4571 lines.append('tree %s' % tree_hash.strip())
4572 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4573 if code == 0:
4574 lines.append('parent %s' % parent.strip())
4575 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4576 lines.append('author %s' % author.strip())
4577 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4578 lines.append('committer %s' % committer.strip())
4579 lines.append('')
4580 # Note: Gerrit's commit-hook actually cleans message of some lines and
4581 # whitespace. This code is not doing this, but it clearly won't decrease
4582 # entropy.
4583 lines.append(message)
4584 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004585 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004586 return 'I%s' % change_hash.strip()
4587
4588
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004589def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004590 """Computes the remote branch ref to use for the CL.
4591
4592 Args:
4593 remote (str): The git remote for the CL.
4594 remote_branch (str): The git remote branch for the CL.
4595 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004596 """
4597 if not (remote and remote_branch):
4598 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004599
wittman@chromium.org455dc922015-01-26 20:15:50 +00004600 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004601 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004602 # refs, which are then translated into the remote full symbolic refs
4603 # below.
4604 if '/' not in target_branch:
4605 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4606 else:
4607 prefix_replacements = (
4608 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4609 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4610 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4611 )
4612 match = None
4613 for regex, replacement in prefix_replacements:
4614 match = re.search(regex, target_branch)
4615 if match:
4616 remote_branch = target_branch.replace(match.group(0), replacement)
4617 break
4618 if not match:
4619 # This is a branch path but not one we recognize; use as-is.
4620 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004621 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4622 # Handle the refs that need to land in different refs.
4623 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004624
wittman@chromium.org455dc922015-01-26 20:15:50 +00004625 # Create the true path to the remote branch.
4626 # Does the following translation:
4627 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4628 # * refs/remotes/origin/master -> refs/heads/master
4629 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4630 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4631 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4632 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4633 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4634 'refs/heads/')
4635 elif remote_branch.startswith('refs/remotes/branch-heads'):
4636 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004637
wittman@chromium.org455dc922015-01-26 20:15:50 +00004638 return remote_branch
4639
4640
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004641def cleanup_list(l):
4642 """Fixes a list so that comma separated items are put as individual items.
4643
4644 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4645 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4646 """
4647 items = sum((i.split(',') for i in l), [])
4648 stripped_items = (i.strip() for i in items)
4649 return sorted(filter(None, stripped_items))
4650
4651
Aaron Gable4db38df2017-11-03 14:59:07 -07004652@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004653@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004654def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004655 """Uploads the current changelist to codereview.
4656
4657 Can skip dependency patchset uploads for a branch by running:
4658 git config branch.branch_name.skip-deps-uploads True
4659 To unset run:
4660 git config --unset branch.branch_name.skip-deps-uploads
4661 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004662
4663 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4664 a bug number, this bug number is automatically populated in the CL
4665 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004666
4667 If subject contains text in square brackets or has "<text>: " prefix, such
4668 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4669 [git-cl] add support for hashtags
4670 Foo bar: implement foo
4671 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004672 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004673 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4674 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004675 parser.add_option('--bypass-watchlists', action='store_true',
4676 dest='bypass_watchlists',
4677 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004678 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004679 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004680 parser.add_option('--message', '-m', dest='message',
4681 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004682 parser.add_option('-b', '--bug',
4683 help='pre-populate the bug number(s) for this issue. '
4684 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004685 parser.add_option('--message-file', dest='message_file',
4686 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004687 parser.add_option('--title', '-t', dest='title',
4688 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004689 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004690 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004691 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004692 parser.add_option('--tbrs',
4693 action='append', default=[],
4694 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004695 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004696 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004697 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004698 parser.add_option('--hashtag', dest='hashtags',
4699 action='append', default=[],
4700 help=('Gerrit hashtag for new CL; '
4701 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004702 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004703 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004704 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004705 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004706 metavar='TARGET',
4707 help='Apply CL to remote ref TARGET. ' +
4708 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004709 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004710 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004711 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004712 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004713 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004714 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004715 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4716 const='TBR', help='add a set of OWNERS to TBR')
4717 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4718 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004719 parser.add_option('-c', '--use-commit-queue', action='store_true',
4720 help='tell the CQ to commit this patchset; '
4721 'implies --send-mail')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004722 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4723 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004724 help='Send the patchset to do a CQ dry run right after '
4725 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004726 parser.add_option('--preserve-tryjobs', action='store_true',
4727 help='instruct the CQ to let tryjobs running even after '
4728 'new patchsets are uploaded instead of canceling '
4729 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004730 parser.add_option('--dependencies', action='store_true',
4731 help='Uploads CLs of all the local branches that depend on '
4732 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004733 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4734 help='Sends your change to the CQ after an approval. Only '
4735 'works on repos that have the Auto-Submit label '
4736 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004737 parser.add_option('--parallel', action='store_true',
4738 help='Run all tests specified by input_api.RunTests in all '
4739 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004740
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004741 parser.add_option('--no-autocc', action='store_true',
4742 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004743 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004744 help='Set the review private. This implies --no-autocc.')
4745
rmistry@google.com2dd99862015-06-22 12:22:18 +00004746 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004747 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004748 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004749 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004750 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004751 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004752
sbc@chromium.org71437c02015-04-09 19:29:40 +00004753 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004754 return 1
4755
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004756 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004757 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004758 options.cc = cleanup_list(options.cc)
4759
tandriib80458a2016-06-23 12:20:07 -07004760 if options.message_file:
4761 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004762 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004763 options.message = gclient_utils.FileRead(options.message_file)
4764 options.message_file = None
4765
tandrii4d0545a2016-07-06 03:56:49 -07004766 if options.cq_dry_run and options.use_commit_queue:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004767 parser.error('Only one of --use-commit-queue and --cq-dry-run allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004768
Aaron Gableedbc4132017-09-11 13:22:28 -07004769 if options.use_commit_queue:
4770 options.send_mail = True
4771
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004772 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4773 settings.GetIsGerrit()
4774
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004775 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004776 if not cl.IsGerrit():
4777 # Error out with instructions for repos not yet configured for Gerrit.
4778 print('=====================================')
4779 print('NOTICE: Rietveld is no longer supported. '
4780 'You can upload changes to Gerrit with')
4781 print(' git cl upload --gerrit')
4782 print('or set Gerrit to be your default code review tool with')
4783 print(' git config gerrit.host true')
4784 print('=====================================')
4785 return 1
4786
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004787 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004788
4789
Francois Dorayd42c6812017-05-30 15:10:20 -04004790@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004791@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004792def CMDsplit(parser, args):
4793 """Splits a branch into smaller branches and uploads CLs.
4794
4795 Creates a branch and uploads a CL for each group of files modified in the
4796 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004797 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004798 the shared OWNERS file.
4799 """
4800 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05004801 help="A text file containing a CL description in which "
4802 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04004803 parser.add_option("-c", "--comment", dest="comment_file",
4804 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11004805 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
4806 default=False,
4807 help="List the files and reviewers for each CL that would "
4808 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00004809 parser.add_option("--cq-dry-run", action='store_true',
4810 help="If set, will do a cq dry run for each uploaded CL. "
4811 "Please be careful when doing this; more than ~10 CLs "
4812 "has the potential to overload our build "
4813 "infrastructure. Try to upload these not during high "
4814 "load times (usually 11-3 Mountain View time). Email "
4815 "infra-dev@chromium.org with any questions.")
Takuto Ikuta51eca592019-02-14 19:40:52 +00004816 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4817 default=True,
4818 help='Sends your change to the CQ after an approval. Only '
4819 'works on repos that have the Auto-Submit label '
4820 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004821 options, _ = parser.parse_args(args)
4822
4823 if not options.description_file:
4824 parser.error('No --description flag specified.')
4825
4826 def WrappedCMDupload(args):
4827 return CMDupload(OptionParser(), args)
4828
4829 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004830 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004831 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004832
4833
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004834@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004835@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004836def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004837 """DEPRECATED: Used to commit the current changelist via git-svn."""
4838 message = ('git-cl no longer supports committing to SVN repositories via '
4839 'git-svn. You probably want to use `git cl land` instead.')
4840 print(message)
4841 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004842
4843
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004844# Two special branches used by git cl land.
4845MERGE_BRANCH = 'git-cl-commit'
4846CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4847
4848
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004849@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004850@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004851def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004852 """Commits the current changelist via git.
4853
4854 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4855 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004856 """
4857 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4858 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004859 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004860 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004861 parser.add_option('--parallel', action='store_true',
4862 help='Run all tests specified by input_api.RunTests in all '
4863 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004864 auth.add_auth_options(parser)
4865 (options, args) = parser.parse_args(args)
4866 auth_config = auth.extract_auth_config_from_options(options)
4867
4868 cl = Changelist(auth_config=auth_config)
4869
Robert Iannucci2e73d432018-03-14 01:10:47 -07004870 if not cl.IsGerrit():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004871 parser.error('Rietveld is not supported.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004872
Robert Iannucci2e73d432018-03-14 01:10:47 -07004873 if not cl.GetIssue():
4874 DieWithError('You must upload the change first to Gerrit.\n'
4875 ' If you would rather have `git cl land` upload '
4876 'automatically for you, see http://crbug.com/642759')
4877 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004878 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004879
4880
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004881@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004882@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004883def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004884 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004885 parser.add_option('-b', dest='newbranch',
4886 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004887 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004888 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004889 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07004890 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004891 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004892 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004893 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004894 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004895 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004896 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004897
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004898
4899 group = optparse.OptionGroup(
4900 parser,
4901 'Options for continuing work on the current issue uploaded from a '
4902 'different clone (e.g. different machine). Must be used independently '
4903 'from the other options. No issue number should be specified, and the '
4904 'branch must have an issue number associated with it')
4905 group.add_option('--reapply', action='store_true', dest='reapply',
4906 help='Reset the branch and reapply the issue.\n'
4907 'CAUTION: This will undo any local changes in this '
4908 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004909
4910 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004911 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004912 parser.add_option_group(group)
4913
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004914 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004915 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004916 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004917 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004918 auth_config = auth.extract_auth_config_from_options(options)
4919
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004920 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004921 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004922 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004923 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004924 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004925
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004926 cl = Changelist(auth_config=auth_config,
4927 codereview=options.forced_codereview)
4928 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004929 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004930
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004931 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004932 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004933 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004934
4935 RunGit(['reset', '--hard', upstream])
4936 if options.pull:
4937 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004938
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004939 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4940 options.directory)
4941
4942 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004943 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004944
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004945 target_issue_arg = ParseIssueNumberArgument(args[0],
4946 options.forced_codereview)
4947 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004948 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004949
4950 cl_kwargs = {
4951 'auth_config': auth_config,
4952 'codereview_host': target_issue_arg.hostname,
4953 'codereview': options.forced_codereview,
4954 }
4955 detected_codereview_from_url = False
4956 if target_issue_arg.codereview and not options.forced_codereview:
4957 detected_codereview_from_url = True
4958 cl_kwargs['codereview'] = target_issue_arg.codereview
4959 cl_kwargs['issue'] = target_issue_arg.issue
4960
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004961 # We don't want uncommitted changes mixed up with the patch.
4962 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004963 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004964
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004965 if options.newbranch:
4966 if options.force:
4967 RunGit(['branch', '-D', options.newbranch],
4968 stderr=subprocess2.PIPE, error_ok=True)
4969 RunGit(['new-branch', options.newbranch])
4970
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004971 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004972
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004973 if cl.IsGerrit():
4974 if options.reject:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004975 parser.error('--reject is not supported with Gerrit code review.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004976 if options.directory:
4977 parser.error('--directory is not supported with Gerrit codereview.')
4978
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004979 if detected_codereview_from_url:
4980 print('canonical issue/change URL: %s (type: %s)\n' %
4981 (cl.GetIssueURL(), target_issue_arg.codereview))
4982
4983 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07004984 options.nocommit, options.directory,
4985 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004986
4987
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004988def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004989 """Fetches the tree status and returns either 'open', 'closed',
4990 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004991 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004992 if url:
4993 status = urllib2.urlopen(url).read().lower()
4994 if status.find('closed') != -1 or status == '0':
4995 return 'closed'
4996 elif status.find('open') != -1 or status == '1':
4997 return 'open'
4998 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004999 return 'unset'
5000
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005002def GetTreeStatusReason():
5003 """Fetches the tree status from a json url and returns the message
5004 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005005 url = settings.GetTreeStatusUrl()
5006 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005007 connection = urllib2.urlopen(json_url)
5008 status = json.loads(connection.read())
5009 connection.close()
5010 return status['message']
5011
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005012
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005013@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005014def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005015 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005016 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005017 status = GetTreeStatus()
5018 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005019 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005020 return 2
5021
vapiera7fbd5a2016-06-16 09:17:49 -07005022 print('The tree is %s' % status)
5023 print()
5024 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005025 if status != 'open':
5026 return 1
5027 return 0
5028
5029
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005030@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005031def CMDtry(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005032 """Triggers tryjobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005033 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005034 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005035 '-b', '--bot', action='append',
5036 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5037 'times to specify multiple builders. ex: '
5038 '"-b win_rel -b win_layout". See '
5039 'the try server waterfall for the builders name and the tests '
5040 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005041 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005042 '-B', '--bucket', default='',
5043 help=('Buildbucket bucket to send the try requests.'))
5044 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005045 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005046 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005047 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005048 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005049 help='Revision to use for the try job; default: the revision will '
5050 'be determined by the try recipe that builder runs, which usually '
5051 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005052 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005053 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005054 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005055 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005056 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005057 '--category', default='git_cl_try', help='Specify custom build category.')
5058 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005059 '--project',
5060 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005061 'in recipe to determine to which repository or directory to '
5062 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005063 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005064 '-p', '--property', dest='properties', action='append', default=[],
5065 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005066 'key2=value2 etc. The value will be treated as '
5067 'json if decodable, or as string otherwise. '
5068 'NOTE: using this may make your try job not usable for CQ, '
5069 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005070 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005071 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5072 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005073 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005074 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005075 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005076 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005077 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005078 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005079
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005080 if options.master and options.master.startswith('luci.'):
5081 parser.error(
5082 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005083 # Make sure that all properties are prop=value pairs.
5084 bad_params = [x for x in options.properties if '=' not in x]
5085 if bad_params:
5086 parser.error('Got properties with missing "=": %s' % bad_params)
5087
maruel@chromium.org15192402012-09-06 12:38:29 +00005088 if args:
5089 parser.error('Unknown arguments: %s' % args)
5090
Koji Ishii31c14782018-01-08 17:17:33 +09005091 cl = Changelist(auth_config=auth_config, issue=options.issue,
5092 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005093 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005094 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005095
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005096 if cl.IsGerrit():
5097 # HACK: warm up Gerrit change detail cache to save on RPCs.
5098 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5099
tandriie113dfd2016-10-11 10:20:12 -07005100 error_message = cl.CannotTriggerTryJobReason()
5101 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005102 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005103
borenet6c0efe62016-10-19 08:13:29 -07005104 if options.bucket and options.master:
5105 parser.error('Only one of --bucket and --master may be used.')
5106
qyearsley1fdfcb62016-10-24 13:22:03 -07005107 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005108
qyearsleydd49f942016-10-28 11:57:22 -07005109 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5110 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005111 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005112 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005113 print('git cl try with no bots now defaults to CQ dry run.')
5114 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5115 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005116
borenet6c0efe62016-10-19 08:13:29 -07005117 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005118 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005119 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005120 'of bot requires an initial job from a parent (usually a builder). '
5121 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005122 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005123 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005124
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005125 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005126 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005127 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005128 except BuildbucketResponseException as ex:
5129 print('ERROR: %s' % ex)
5130 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005131 return 0
5132
5133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005134@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005135def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005136 """Prints info about results for tryjobs associated with the current CL."""
tandrii1838bad2016-10-06 00:10:52 -07005137 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005138 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005139 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005140 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005141 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005142 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005143 '--color', action='store_true', default=setup_color.IS_TTY,
5144 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005145 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005146 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5147 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005148 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005149 '--json', help=('Path of JSON output file to write try job results to,'
5150 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005151 parser.add_option_group(group)
5152 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005153 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005154 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005155 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005156 if args:
5157 parser.error('Unrecognized args: %s' % ' '.join(args))
5158
5159 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005160 cl = Changelist(
5161 issue=options.issue, codereview=options.forced_codereview,
5162 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005163 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005164 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005165
tandrii221ab252016-10-06 08:12:04 -07005166 patchset = options.patchset
5167 if not patchset:
5168 patchset = cl.GetMostRecentPatchset()
5169 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005170 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005171 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005172 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005173 cl.GetIssue())
5174
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005175 try:
tandrii221ab252016-10-06 08:12:04 -07005176 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005177 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005178 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005179 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005180 if options.json:
5181 write_try_results_json(options.json, jobs)
5182 else:
5183 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005184 return 0
5185
5186
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005187@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005188@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005189def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005190 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005191 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005192 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005193 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005196 if args:
5197 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005198 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005199 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005200 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005201 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005202
5203 # Clear configured merge-base, if there is one.
5204 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005205 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005206 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207 return 0
5208
5209
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005210@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005211def CMDweb(parser, args):
5212 """Opens the current CL in the web browser."""
5213 _, args = parser.parse_args(args)
5214 if args:
5215 parser.error('Unrecognized args: %s' % ' '.join(args))
5216
5217 issue_url = Changelist().GetIssueURL()
5218 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005219 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005220 return 1
5221
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005222 # Redirect I/O before invoking browser to hide its output. For example, this
5223 # allows to hide "Created new window in existing browser session." message
5224 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5225 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005226 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005227 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005228 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005229 os.open(os.devnull, os.O_RDWR)
5230 try:
5231 webbrowser.open(issue_url)
5232 finally:
5233 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005234 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005235 return 0
5236
5237
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005238@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005239def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005240 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005241 parser.add_option('-d', '--dry-run', action='store_true',
5242 help='trigger in dry run mode')
5243 parser.add_option('-c', '--clear', action='store_true',
5244 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005245 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005246 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005247 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005248 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005249 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005250 if args:
5251 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005252 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005253 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005254
iannuccie53c9352016-08-17 14:40:40 -07005255 cl = Changelist(auth_config=auth_config, issue=options.issue,
5256 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005257 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005258 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005259 elif options.dry_run:
5260 state = _CQState.DRY_RUN
5261 else:
5262 state = _CQState.COMMIT
5263 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005264 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07005265 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005266 return 0
5267
5268
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005269@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005270def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005271 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005272 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005273 auth.add_auth_options(parser)
5274 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005275 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005276 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005277 if args:
5278 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005279 cl = Changelist(auth_config=auth_config, issue=options.issue,
5280 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005281 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005282 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005283 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005284 cl.CloseIssue()
5285 return 0
5286
5287
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005288@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005289def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005290 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005291 parser.add_option(
5292 '--stat',
5293 action='store_true',
5294 dest='stat',
5295 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005296 auth.add_auth_options(parser)
5297 options, args = parser.parse_args(args)
5298 auth_config = auth.extract_auth_config_from_options(options)
5299 if args:
5300 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005301
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005302 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005303 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005304 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005305 if not issue:
5306 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005307
Aaron Gablea718c3e2017-08-28 17:47:28 -07005308 base = cl._GitGetBranchConfigValue('last-upload-hash')
5309 if not base:
5310 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5311 if not base:
5312 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5313 revision_info = detail['revisions'][detail['current_revision']]
5314 fetch_info = revision_info['fetch']['http']
5315 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5316 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005317
Aaron Gablea718c3e2017-08-28 17:47:28 -07005318 cmd = ['git', 'diff']
5319 if options.stat:
5320 cmd.append('--stat')
5321 cmd.append(base)
5322 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005323
5324 return 0
5325
5326
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005327@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005328def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005329 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005330 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005331 '--ignore-current',
5332 action='store_true',
5333 help='Ignore the CL\'s current reviewers and start from scratch.')
5334 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005335 '--ignore-self',
5336 action='store_true',
5337 help='Do not consider CL\'s author as an owners.')
5338 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005339 '--no-color',
5340 action='store_true',
5341 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005342 parser.add_option(
5343 '--batch',
5344 action='store_true',
5345 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005346 # TODO: Consider moving this to another command, since other
5347 # git-cl owners commands deal with owners for a given CL.
5348 parser.add_option(
5349 '--show-all',
5350 action='store_true',
5351 help='Show all owners for a particular file')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005352 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005353 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005354 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005355
5356 author = RunGit(['config', 'user.email']).strip() or None
5357
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005358 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005359
Yang Guo6e269a02019-06-26 11:17:02 +00005360 if options.show_all:
5361 for arg in args:
5362 base_branch = cl.GetCommonAncestorWithUpstream()
5363 change = cl.GetChange(base_branch, None)
5364 database = owners.Database(change.RepositoryRoot(), file, os.path)
5365 database.load_data_needed_for([arg])
5366 print('Owners for %s:' % arg)
5367 for owner in sorted(database.all_possible_owners([arg], None)):
5368 print(' - %s' % owner)
5369 return 0
5370
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005371 if args:
5372 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005373 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005374 base_branch = args[0]
5375 else:
5376 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005377 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005378
5379 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005380 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5381
5382 if options.batch:
5383 db = owners.Database(change.RepositoryRoot(), file, os.path)
5384 print('\n'.join(db.reviewers_for(affected_files, author)))
5385 return 0
5386
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005387 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005388 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005389 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005390 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005391 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005392 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005393 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005394 override_files=change.OriginalOwnersFiles(),
5395 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005396
5397
Aiden Bennerc08566e2018-10-03 17:52:42 +00005398def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005399 """Generates a diff command."""
5400 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005401 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5402
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005403 if allow_prefix:
5404 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5405 # case that diff.noprefix is set in the user's git config.
5406 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5407 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005408 diff_cmd += ['--no-prefix']
5409
5410 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005411
5412 if args:
5413 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005414 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005415 diff_cmd.append(arg)
5416 else:
5417 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005418
5419 return diff_cmd
5420
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005421
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005422def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005423 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005424 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005425
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005426
enne@chromium.org555cfe42014-01-29 18:21:39 +00005427@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005428@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005429def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005430 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005431 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005432 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005433 parser.add_option('--full', action='store_true',
5434 help='Reformat the full content of all touched files')
5435 parser.add_option('--dry-run', action='store_true',
5436 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005437 parser.add_option(
5438 '--python',
5439 action='store_true',
5440 default=None,
5441 help='Enables python formatting on all python files.')
5442 parser.add_option(
5443 '--no-python',
5444 action='store_true',
5445 dest='python',
5446 help='Disables python formatting on all python files. '
5447 'Takes precedence over --python. '
5448 'If neither --python or --no-python are set, python '
5449 'files that have a .style.yapf file in an ancestor '
5450 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005451 parser.add_option('--js', action='store_true',
5452 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005453 parser.add_option('--diff', action='store_true',
5454 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005455 parser.add_option('--presubmit', action='store_true',
5456 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005457 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005458
Daniel Chengc55eecf2016-12-30 03:11:02 -08005459 # Normalize any remaining args against the current path, so paths relative to
5460 # the current directory are still resolved as expected.
5461 args = [os.path.join(os.getcwd(), arg) for arg in args]
5462
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005463 # git diff generates paths against the root of the repository. Change
5464 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005465 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005466 if rel_base_path:
5467 os.chdir(rel_base_path)
5468
digit@chromium.org29e47272013-05-17 17:01:46 +00005469 # Grab the merge-base commit, i.e. the upstream commit of the current
5470 # branch when it was created or the last time it was rebased. This is
5471 # to cover the case where the user may have called "git fetch origin",
5472 # moving the origin branch to a newer commit, but hasn't rebased yet.
5473 upstream_commit = None
5474 cl = Changelist()
5475 upstream_branch = cl.GetUpstreamBranch()
5476 if upstream_branch:
5477 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5478 upstream_commit = upstream_commit.strip()
5479
5480 if not upstream_commit:
5481 DieWithError('Could not find base commit for this branch. '
5482 'Are you in detached state?')
5483
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005484 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5485 diff_output = RunGit(changed_files_cmd)
5486 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005487 # Filter out files deleted by this CL
5488 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005489
Christopher Lamc5ba6922017-01-24 11:19:14 +11005490 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005491 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005492
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005493 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5494 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5495 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005496 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005497
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005498 top_dir = os.path.normpath(
5499 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5500
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005501 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5502 # formatted. This is used to block during the presubmit.
5503 return_value = 0
5504
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005505 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005506 # Locate the clang-format binary in the checkout
5507 try:
5508 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005509 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005510 DieWithError(e)
5511
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005512 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005513 cmd = [clang_format_tool]
5514 if not opts.dry_run and not opts.diff:
5515 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005516 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005517 if opts.diff:
5518 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005519 else:
5520 env = os.environ.copy()
5521 env['PATH'] = str(os.path.dirname(clang_format_tool))
5522 try:
5523 script = clang_format.FindClangFormatScriptInChromiumTree(
5524 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005525 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005526 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005527
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005528 cmd = [sys.executable, script, '-p0']
5529 if not opts.dry_run and not opts.diff:
5530 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005531
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005532 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5533 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005534
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005535 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5536 if opts.diff:
5537 sys.stdout.write(stdout)
5538 if opts.dry_run and len(stdout) > 0:
5539 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005540
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005541 # Similar code to above, but using yapf on .py files rather than clang-format
5542 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005543 py_explicitly_disabled = opts.python is not None and not opts.python
5544 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005545 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5546 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5547 if sys.platform.startswith('win'):
5548 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005549
Aiden Bennerc08566e2018-10-03 17:52:42 +00005550 # If we couldn't find a yapf file we'll default to the chromium style
5551 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005552 chromium_default_yapf_style = os.path.join(depot_tools_path,
5553 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005554 # Used for caching.
5555 yapf_configs = {}
5556 for f in python_diff_files:
5557 # Find the yapf style config for the current file, defaults to depot
5558 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005559 _FindYapfConfigFile(f, yapf_configs, top_dir)
5560
5561 # Turn on python formatting by default if a yapf config is specified.
5562 # This breaks in the case of this repo though since the specified
5563 # style file is also the global default.
5564 if opts.python is None:
5565 filtered_py_files = []
5566 for f in python_diff_files:
5567 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5568 filtered_py_files.append(f)
5569 else:
5570 filtered_py_files = python_diff_files
5571
5572 # Note: yapf still seems to fix indentation of the entire file
5573 # even if line ranges are specified.
5574 # See https://github.com/google/yapf/issues/499
5575 if not opts.full and filtered_py_files:
5576 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5577
5578 for f in filtered_py_files:
5579 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5580 if yapf_config is None:
5581 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005582
5583 cmd = [yapf_tool, '--style', yapf_config, f]
5584
5585 has_formattable_lines = False
5586 if not opts.full:
5587 # Only run yapf over changed line ranges.
5588 for diff_start, diff_len in py_line_diffs[f]:
5589 diff_end = diff_start + diff_len - 1
5590 # Yapf errors out if diff_end < diff_start but this
5591 # is a valid line range diff for a removal.
5592 if diff_end >= diff_start:
5593 has_formattable_lines = True
5594 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5595 # If all line diffs were removals we have nothing to format.
5596 if not has_formattable_lines:
5597 continue
5598
5599 if opts.diff or opts.dry_run:
5600 cmd += ['--diff']
5601 # Will return non-zero exit code if non-empty diff.
5602 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5603 if opts.diff:
5604 sys.stdout.write(stdout)
5605 elif len(stdout) > 0:
5606 return_value = 2
5607 else:
5608 cmd += ['-i']
5609 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005610
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005611 # Dart's formatter does not have the nice property of only operating on
5612 # modified chunks, so hard code full.
5613 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005614 try:
5615 command = [dart_format.FindDartFmtToolInChromiumTree()]
5616 if not opts.dry_run and not opts.diff:
5617 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005618 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005619
ppi@chromium.org6593d932016-03-03 15:41:15 +00005620 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005621 if opts.dry_run and stdout:
5622 return_value = 2
5623 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005624 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5625 'found in this checkout. Files in other languages are still '
5626 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005627
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005628 # Format GN build files. Always run on full build files for canonical form.
5629 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005630 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005631 if opts.dry_run or opts.diff:
5632 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005633 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005634 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5635 shell=sys.platform == 'win32',
5636 cwd=top_dir)
5637 if opts.dry_run and gn_ret == 2:
5638 return_value = 2 # Not formatted.
5639 elif opts.diff and gn_ret == 2:
5640 # TODO this should compute and print the actual diff.
5641 print("This change has GN build file diff for " + gn_diff_file)
5642 elif gn_ret != 0:
5643 # For non-dry run cases (and non-2 return values for dry-run), a
5644 # nonzero error code indicates a failure, probably because the file
5645 # doesn't parse.
5646 DieWithError("gn format failed on " + gn_diff_file +
5647 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005648
Ilya Shermane081cbe2017-08-15 17:51:04 -07005649 # Skip the metrics formatting from the global presubmit hook. These files have
5650 # a separate presubmit hook that issues an error if the files need formatting,
5651 # whereas the top-level presubmit script merely issues a warning. Formatting
5652 # these files is somewhat slow, so it's important not to duplicate the work.
5653 if not opts.presubmit:
5654 for xml_dir in GetDirtyMetricsDirs(diff_files):
5655 tool_dir = os.path.join(top_dir, xml_dir)
5656 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5657 if opts.dry_run or opts.diff:
5658 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005659 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005660 if opts.diff:
5661 sys.stdout.write(stdout)
5662 if opts.dry_run and stdout:
5663 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005664
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005665 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005666
Steven Holte2e664bf2017-04-21 13:10:47 -07005667def GetDirtyMetricsDirs(diff_files):
5668 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5669 metrics_xml_dirs = [
5670 os.path.join('tools', 'metrics', 'actions'),
5671 os.path.join('tools', 'metrics', 'histograms'),
5672 os.path.join('tools', 'metrics', 'rappor'),
5673 os.path.join('tools', 'metrics', 'ukm')]
5674 for xml_dir in metrics_xml_dirs:
5675 if any(file.startswith(xml_dir) for file in xml_diff_files):
5676 yield xml_dir
5677
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005678
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005679@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005680@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005681def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005682 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005683 _, args = parser.parse_args(args)
5684
5685 if len(args) != 1:
5686 parser.print_help()
5687 return 1
5688
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005689 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005690 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005691 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005692
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005693 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005694
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005695 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005696 output = RunGit(['config', '--local', '--get-regexp',
5697 r'branch\..*\.%s' % issueprefix],
5698 error_ok=True)
5699 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005700 if issue == target_issue:
5701 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005702
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005703 branches = []
5704 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005705 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005706 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005707 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005708 return 1
5709 if len(branches) == 1:
5710 RunGit(['checkout', branches[0]])
5711 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005712 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005713 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005714 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005715 which = raw_input('Choose by index: ')
5716 try:
5717 RunGit(['checkout', branches[int(which)]])
5718 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005719 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005720 return 1
5721
5722 return 0
5723
5724
maruel@chromium.org29404b52014-09-08 22:58:00 +00005725def CMDlol(parser, args):
5726 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005727 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005728 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5729 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5730 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005731 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005732 return 0
5733
5734
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005735class OptionParser(optparse.OptionParser):
5736 """Creates the option parse and add --verbose support."""
5737 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005738 optparse.OptionParser.__init__(
5739 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005740 self.add_option(
5741 '-v', '--verbose', action='count', default=0,
5742 help='Use 2 times for more debugging info')
5743
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005744 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005745 try:
5746 return self._parse_args(args)
5747 finally:
5748 # Regardless of success or failure of args parsing, we want to report
5749 # metrics, but only after logging has been initialized (if parsing
5750 # succeeded).
5751 global settings
5752 settings = Settings()
5753
5754 if not metrics.DISABLE_METRICS_COLLECTION:
5755 # GetViewVCUrl ultimately calls logging method.
5756 project_url = settings.GetViewVCUrl().strip('/+')
5757 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5758 metrics.collector.add('project_urls', [project_url])
5759
5760 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005761 # Create an optparse.Values object that will store only the actual passed
5762 # options, without the defaults.
5763 actual_options = optparse.Values()
5764 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5765 # Create an optparse.Values object with the default options.
5766 options = optparse.Values(self.get_default_values().__dict__)
5767 # Update it with the options passed by the user.
5768 options._update_careful(actual_options.__dict__)
5769 # Store the options passed by the user in an _actual_options attribute.
5770 # We store only the keys, and not the values, since the values can contain
5771 # arbitrary information, which might be PII.
5772 metrics.collector.add('arguments', actual_options.__dict__.keys())
5773
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005774 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005775 logging.basicConfig(
5776 level=levels[min(options.verbose, len(levels) - 1)],
5777 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5778 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005779
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005780 return options, args
5781
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005782
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005783def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005784 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005785 print('\nYour python version %s is unsupported, please upgrade.\n' %
5786 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005787 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005788
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005789 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005790 dispatcher = subcommand.CommandDispatcher(__name__)
5791 try:
5792 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005793 except auth.AuthenticationError as e:
5794 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005795 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005796 if e.code != 500:
5797 raise
5798 DieWithError(
5799 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005800 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005801 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005802
5803
5804if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005805 # These affect sys.stdout so do it outside of main() to simplify mocks in
5806 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005807 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005808 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005809 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005810 sys.exit(main(sys.argv[1:]))