blob: f5b27d8d45cb0f082ed364a557ac8bb23b0c71e1 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +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
40try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080041 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000042except ImportError:
43 pass
44
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000045from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000046from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000058import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000059import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000060import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000061import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062import presubmit_support
63import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040064import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000065import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000066import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067import watchlists
68
tandrii7400cf02016-06-21 08:48:07 -070069__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000070
Edward Lemur0f58ae42019-04-30 17:24:12 +000071# Traces for git push will be stored in a traces directory inside the
72# depot_tools checkout.
73DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
74TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
75
76# When collecting traces, Git hashes will be reduced to 6 characters to reduce
77# the size after compression.
78GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
79# Used to redact the cookies from the gitcookies file.
80GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
85# Message to display to the user after git-cl has run, to inform them of the
86# traces we just collected.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur75391d42019-05-14 23:35:56 +000089'A trace of this git-cl execution has been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur75391d42019-05-14 23:35:56 +000091'A redacted copy of your gitcookies file and git config has been recorded at:\n'
92' %(trace_name)s-git-info.zip\n'
93'If git-cl is not working correctly, please file a bug under the Infra>SDK\n'
94'component, include the files above, and set the Restrict-View-Google label\n'
95'so that they\'re not publicly accessible.\n'
96'Review the files before upload. They might contain sensitive information\n'
97'like reviewer emails, patchset titles, and the local path to your checkout.\n'
98)
Edward Lemur1b52d872019-05-09 21:12:12 +000099# Format of the message to be stored as part of the traces to give developers a
100# better context when they go through traces.
101TRACES_README_FORMAT = (
102'Date: %(now)s\n'
103'\n'
104'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
105'Title: %(title)s\n'
106'\n'
107'%(description)s\n'
108'\n'
109'Execution time: %(execution_time)s\n'
110'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000111
tandrii9d2c7a32016-06-22 03:42:45 -0700112COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800113POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000114DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000115REFS_THAT_ALIAS_TO_OTHER_REFS = {
116 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
117 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
118}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000119
thestig@chromium.org44202a22014-03-11 19:22:18 +0000120# Valid extensions for files we want to lint.
121DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
122DEFAULT_LINT_IGNORE_REGEX = r"$^"
123
Aiden Bennerc08566e2018-10-03 17:52:42 +0000124# File name for yapf style config files.
125YAPF_CONFIG_FILENAME = '.style.yapf'
126
borenet6c0efe62016-10-19 08:13:29 -0700127# Buildbucket master name prefix.
128MASTER_PREFIX = 'master.'
129
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000130# Shortcut since it quickly becomes redundant.
131Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000132
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000133# Initialized in main()
134settings = None
135
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100136# Used by tests/git_cl_test.py to add extra logging.
137# Inside the weirdly failing test, add this:
138# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700139# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100140_IS_BEING_TESTED = False
141
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000142
Christopher Lamf732cd52017-01-24 12:40:11 +1100143def DieWithError(message, change_desc=None):
144 if change_desc:
145 SaveDescriptionBackup(change_desc)
146
vapiera7fbd5a2016-06-16 09:17:49 -0700147 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000148 sys.exit(1)
149
150
Christopher Lamf732cd52017-01-24 12:40:11 +1100151def SaveDescriptionBackup(change_desc):
152 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000153 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100154 backup_file = open(backup_path, 'w')
155 backup_file.write(change_desc.description)
156 backup_file.close()
157
158
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000159def GetNoGitPagerEnv():
160 env = os.environ.copy()
161 # 'cat' is a magical git string that disables pagers on all platforms.
162 env['GIT_PAGER'] = 'cat'
163 return env
164
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000165
bsep@chromium.org627d9002016-04-29 00:00:52 +0000166def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000167 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000168 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000169 except subprocess2.CalledProcessError as e:
170 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000171 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000172 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 'Command "%s" failed.\n%s' % (
174 ' '.join(args), error_message or e.stdout or ''))
175 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000176
177
178def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000179 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000180 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000181
182
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000183def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700185 if suppress_stderr:
186 stderr = subprocess2.VOID
187 else:
188 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000189 try:
tandrii5d48c322016-08-18 16:19:37 -0700190 (out, _), code = subprocess2.communicate(['git'] + args,
191 env=GetNoGitPagerEnv(),
192 stdout=subprocess2.PIPE,
193 stderr=stderr)
194 return code, out
195 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900196 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700197 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000198
199
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000200def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000201 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000202 return RunGitWithCode(args, suppress_stderr=True)[1]
203
204
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000205def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000206 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000207 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000208 return (version.startswith(prefix) and
209 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000210
211
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000212def BranchExists(branch):
213 """Return True if specified branch exists."""
214 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
215 suppress_stderr=True)
216 return not code
217
218
tandrii2a16b952016-10-19 07:09:44 -0700219def time_sleep(seconds):
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700222 return time.sleep(seconds)
223
224
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000225def time_time():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return time.time()
229
230
Edward Lemur1b52d872019-05-09 21:12:12 +0000231def datetime_now():
232 # Use this so that it can be mocked in tests without interfering with python
233 # system machinery.
234 return datetime.datetime.now()
235
236
maruel@chromium.org90541732011-04-01 17:54:18 +0000237def ask_for_data(prompt):
238 try:
239 return raw_input(prompt)
240 except KeyboardInterrupt:
241 # Hide the exception.
242 sys.exit(1)
243
244
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245def confirm_or_exit(prefix='', action='confirm'):
246 """Asks user to press enter to continue or press Ctrl+C to abort."""
247 if not prefix or prefix.endswith('\n'):
248 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100249 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100250 mid = ' Press'
251 elif prefix.endswith(' '):
252 mid = 'press'
253 else:
254 mid = ' press'
255 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
256
257
258def ask_for_explicit_yes(prompt):
259 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
260 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
261 while True:
262 if 'yes'.startswith(result):
263 return True
264 if 'no'.startswith(result):
265 return False
266 result = ask_for_data('Please, type yes or no: ').lower()
267
268
tandrii5d48c322016-08-18 16:19:37 -0700269def _git_branch_config_key(branch, key):
270 """Helper method to return Git config key for a branch."""
271 assert branch, 'branch name is required to set git config for it'
272 return 'branch.%s.%s' % (branch, key)
273
274
275def _git_get_branch_config_value(key, default=None, value_type=str,
276 branch=False):
277 """Returns git config value of given or current branch if any.
278
279 Returns default in all other cases.
280 """
281 assert value_type in (int, str, bool)
282 if branch is False: # Distinguishing default arg value from None.
283 branch = GetCurrentBranch()
284
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000285 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700286 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000287
tandrii5d48c322016-08-18 16:19:37 -0700288 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700289 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700290 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700291 # git config also has --int, but apparently git config suffers from integer
292 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700293 args.append(_git_branch_config_key(branch, key))
294 code, out = RunGitWithCode(args)
295 if code == 0:
296 value = out.strip()
297 if value_type == int:
298 return int(value)
299 if value_type == bool:
300 return bool(value.lower() == 'true')
301 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000302 return default
303
304
tandrii5d48c322016-08-18 16:19:37 -0700305def _git_set_branch_config_value(key, value, branch=None, **kwargs):
306 """Sets the value or unsets if it's None of a git branch config.
307
308 Valid, though not necessarily existing, branch must be provided,
309 otherwise currently checked out branch is used.
310 """
311 if not branch:
312 branch = GetCurrentBranch()
313 assert branch, 'a branch name OR currently checked out branch is required'
314 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700315 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700316 if value is None:
317 args.append('--unset')
318 elif isinstance(value, bool):
319 args.append('--bool')
320 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700321 else:
tandrii33a46ff2016-08-23 05:53:40 -0700322 # git config also has --int, but apparently git config suffers from integer
323 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700324 value = str(value)
325 args.append(_git_branch_config_key(branch, key))
326 if value is not None:
327 args.append(value)
328 RunGit(args, **kwargs)
329
330
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100331def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700332 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100333
334 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
335 """
336 # Git also stores timezone offset, but it only affects visual display,
337 # actual point in time is defined by this timestamp only.
338 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
339
340
341def _git_amend_head(message, committer_timestamp):
342 """Amends commit with new message and desired committer_timestamp.
343
344 Sets committer timezone to UTC.
345 """
346 env = os.environ.copy()
347 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
348 return RunGit(['commit', '--amend', '-m', message], env=env)
349
350
machenbach@chromium.org45453142015-09-15 08:45:22 +0000351def _get_properties_from_options(options):
352 properties = dict(x.split('=', 1) for x in options.properties)
353 for key, val in properties.iteritems():
354 try:
355 properties[key] = json.loads(val)
356 except ValueError:
357 pass # If a value couldn't be evaluated, treat it as a string.
358 return properties
359
360
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000361def _prefix_master(master):
362 """Convert user-specified master name to full master name.
363
364 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
365 name, while the developers always use shortened master name
366 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
367 function does the conversion for buildbucket migration.
368 """
borenet6c0efe62016-10-19 08:13:29 -0700369 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000370 return master
borenet6c0efe62016-10-19 08:13:29 -0700371 return '%s%s' % (MASTER_PREFIX, master)
372
373
374def _unprefix_master(bucket):
375 """Convert bucket name to shortened master name.
376
377 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
378 name, while the developers always use shortened master name
379 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
380 function does the conversion for buildbucket migration.
381 """
382 if bucket.startswith(MASTER_PREFIX):
383 return bucket[len(MASTER_PREFIX):]
384 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000385
386
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000387def _buildbucket_retry(operation_name, http, *args, **kwargs):
388 """Retries requests to buildbucket service and returns parsed json content."""
389 try_count = 0
390 while True:
391 response, content = http.request(*args, **kwargs)
392 try:
393 content_json = json.loads(content)
394 except ValueError:
395 content_json = None
396
397 # Buildbucket could return an error even if status==200.
398 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000399 error = content_json.get('error')
400 if error.get('code') == 403:
401 raise BuildbucketResponseException(
402 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000404 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000405 raise BuildbucketResponseException(msg)
406
407 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700408 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000409 raise BuildbucketResponseException(
410 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700411 'Please file bugs at http://crbug.com, '
412 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000413 content)
414 return content_json
415 if response.status < 500 or try_count >= 2:
416 raise httplib2.HttpLib2Error(content)
417
418 # status >= 500 means transient failures.
419 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700420 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000421 try_count += 1
422 assert False, 'unreachable'
423
424
qyearsley1fdfcb62016-10-24 13:22:03 -0700425def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700426 """Returns a dict mapping bucket names to builders and tests,
427 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700428 """
qyearsleydd49f942016-10-28 11:57:22 -0700429 # If no bots are listed, we try to get a set of builders and tests based
430 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700431 if not options.bot:
432 change = changelist.GetChange(
433 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700434 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700435 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700436 change=change,
437 changed_files=change.LocalPaths(),
438 repository_root=settings.GetRoot(),
439 default_presubmit=None,
440 project=None,
441 verbose=options.verbose,
442 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700443 if masters is None:
444 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100445 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700446
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 if options.bucket:
448 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700449 if options.master:
450 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700451
qyearsleydd49f942016-10-28 11:57:22 -0700452 # If bots are listed but no master or bucket, then we need to find out
453 # the corresponding master for each bot.
454 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
455 if error_message:
456 option_parser.error(
457 'Tryserver master cannot be found because: %s\n'
458 'Please manually specify the tryserver master, e.g. '
459 '"-m tryserver.chromium.linux".' % error_message)
460 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700461
462
qyearsley123a4682016-10-26 09:12:17 -0700463def _get_bucket_map_for_builders(builders):
464 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700465 map_url = 'https://builders-map.appspot.com/'
466 try:
qyearsley123a4682016-10-26 09:12:17 -0700467 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700468 except urllib2.URLError as e:
469 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
470 (map_url, e))
471 except ValueError as e:
472 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700473 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 return None, 'Failed to build master map.'
475
qyearsley123a4682016-10-26 09:12:17 -0700476 bucket_map = {}
477 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800478 bucket = builders_map.get(builder, {}).get('bucket')
479 if bucket:
480 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700481 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700482
483
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800484def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700485 """Sends a request to Buildbucket to trigger try jobs for a changelist.
486
487 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700488 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700489 changelist: Changelist that the try jobs are associated with.
490 buckets: A nested dict mapping bucket names to builders to tests.
491 options: Command-line options.
492 """
tandriide281ae2016-10-12 06:02:30 -0700493 assert changelist.GetIssue(), 'CL must be uploaded first'
494 codereview_url = changelist.GetCodereviewServer()
495 assert codereview_url, 'CL must be uploaded first'
496 patchset = patchset or changelist.GetMostRecentPatchset()
497 assert patchset, 'CL must be uploaded first'
498
499 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700500 # Cache the buildbucket credentials under the codereview host key, so that
501 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700502 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000503 http = authenticator.authorize(httplib2.Http())
504 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700505
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000506 buildbucket_put_url = (
507 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000508 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000509 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700510 hostname=codereview_host,
511 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000512 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700513
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700514 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800515 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700516 if options.clobber:
517 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700518 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700519 if extra_properties:
520 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000521
522 batch_req_body = {'builds': []}
523 print_text = []
524 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700525 for bucket, builders_and_tests in sorted(buckets.iteritems()):
526 print_text.append('Bucket: %s' % bucket)
527 master = None
528 if bucket.startswith(MASTER_PREFIX):
529 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000530 for builder, tests in sorted(builders_and_tests.iteritems()):
531 print_text.append(' %s: %s' % (builder, tests))
532 parameters = {
533 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000534 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100535 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000536 'revision': options.revision,
537 }],
tandrii8c5a3532016-11-04 07:52:02 -0700538 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000539 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000540 if 'presubmit' in builder.lower():
541 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000542 if tests:
543 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700544
545 tags = [
546 'builder:%s' % builder,
547 'buildset:%s' % buildset,
548 'user_agent:git_cl_try',
549 ]
550 if master:
551 parameters['properties']['master'] = master
552 tags.append('master:%s' % master)
553
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000554 batch_req_body['builds'].append(
555 {
556 'bucket': bucket,
557 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700559 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000560 }
561 )
562
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700564 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 http,
566 buildbucket_put_url,
567 'PUT',
568 body=json.dumps(batch_req_body),
569 headers={'Content-Type': 'application/json'}
570 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000571 print_text.append('To see results here, run: git cl try-results')
572 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700573 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000574
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000575
tandrii221ab252016-10-06 08:12:04 -0700576def fetch_try_jobs(auth_config, changelist, buildbucket_host,
577 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700578 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579
qyearsley53f48a12016-09-01 10:45:13 -0700580 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """
tandrii221ab252016-10-06 08:12:04 -0700582 assert buildbucket_host
583 assert changelist.GetIssue(), 'CL must be uploaded first'
584 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
585 patchset = patchset or changelist.GetMostRecentPatchset()
586 assert patchset, 'CL must be uploaded first'
587
588 codereview_url = changelist.GetCodereviewServer()
589 codereview_host = urlparse.urlparse(codereview_url).hostname
590 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 if authenticator.has_cached_credentials():
592 http = authenticator.authorize(httplib2.Http())
593 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700594 print('Warning: Some results might be missing because %s' %
595 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700596 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597 http = httplib2.Http()
598
599 http.force_exception_to_status_code = True
600
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000601 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700602 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700604 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605 params = {'tag': 'buildset:%s' % buildset}
606
607 builds = {}
608 while True:
609 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700610 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000611 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700612 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 for build in content.get('builds', []):
614 builds[build['id']] = build
615 if 'next_cursor' in content:
616 params['start_cursor'] = content['next_cursor']
617 else:
618 break
619 return builds
620
621
qyearsleyeab3c042016-08-24 09:18:28 -0700622def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000623 """Prints nicely result of fetch_try_jobs."""
624 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700625 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000626 return
627
628 # Make a copy, because we'll be modifying builds dictionary.
629 builds = builds.copy()
630 builder_names_cache = {}
631
632 def get_builder(b):
633 try:
634 return builder_names_cache[b['id']]
635 except KeyError:
636 try:
637 parameters = json.loads(b['parameters_json'])
638 name = parameters['builder_name']
639 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700640 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700641 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000642 name = None
643 builder_names_cache[b['id']] = name
644 return name
645
646 def get_bucket(b):
647 bucket = b['bucket']
648 if bucket.startswith('master.'):
649 return bucket[len('master.'):]
650 return bucket
651
652 if options.print_master:
653 name_fmt = '%%-%ds %%-%ds' % (
654 max(len(str(get_bucket(b))) for b in builds.itervalues()),
655 max(len(str(get_builder(b))) for b in builds.itervalues()))
656 def get_name(b):
657 return name_fmt % (get_bucket(b), get_builder(b))
658 else:
659 name_fmt = '%%-%ds' % (
660 max(len(str(get_builder(b))) for b in builds.itervalues()))
661 def get_name(b):
662 return name_fmt % get_builder(b)
663
664 def sort_key(b):
665 return b['status'], b.get('result'), get_name(b), b.get('url')
666
667 def pop(title, f, color=None, **kwargs):
668 """Pop matching builds from `builds` dict and print them."""
669
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000670 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 colorize = str
672 else:
673 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
674
675 result = []
676 for b in builds.values():
677 if all(b.get(k) == v for k, v in kwargs.iteritems()):
678 builds.pop(b['id'])
679 result.append(b)
680 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700681 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000682 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700683 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000684
685 total = len(builds)
686 pop(status='COMPLETED', result='SUCCESS',
687 title='Successes:', color=Fore.GREEN,
688 f=lambda b: (get_name(b), b.get('url')))
689 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
690 title='Infra Failures:', color=Fore.MAGENTA,
691 f=lambda b: (get_name(b), b.get('url')))
692 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
693 title='Failures:', color=Fore.RED,
694 f=lambda b: (get_name(b), b.get('url')))
695 pop(status='COMPLETED', result='CANCELED',
696 title='Canceled:', color=Fore.MAGENTA,
697 f=lambda b: (get_name(b),))
698 pop(status='COMPLETED', result='FAILURE',
699 failure_reason='INVALID_BUILD_DEFINITION',
700 title='Wrong master/builder name:', color=Fore.MAGENTA,
701 f=lambda b: (get_name(b),))
702 pop(status='COMPLETED', result='FAILURE',
703 title='Other failures:',
704 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
705 pop(status='COMPLETED',
706 title='Other finished:',
707 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
708 pop(status='STARTED',
709 title='Started:', color=Fore.YELLOW,
710 f=lambda b: (get_name(b), b.get('url')))
711 pop(status='SCHEDULED',
712 title='Scheduled:',
713 f=lambda b: (get_name(b), 'id=%s' % b['id']))
714 # The last section is just in case buildbucket API changes OR there is a bug.
715 pop(title='Other:',
716 f=lambda b: (get_name(b), 'id=%s' % b['id']))
717 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700718 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000719
720
Aiden Bennerc08566e2018-10-03 17:52:42 +0000721def _ComputeDiffLineRanges(files, upstream_commit):
722 """Gets the changed line ranges for each file since upstream_commit.
723
724 Parses a git diff on provided files and returns a dict that maps a file name
725 to an ordered list of range tuples in the form (start_line, count).
726 Ranges are in the same format as a git diff.
727 """
728 # If files is empty then diff_output will be a full diff.
729 if len(files) == 0:
730 return {}
731
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000732 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000733 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
734 diff_output = RunGit(diff_cmd)
735
736 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
737 # 2 capture groups
738 # 0 == fname of diff file
739 # 1 == 'diff_start,diff_count' or 'diff_start'
740 # will match each of
741 # diff --git a/foo.foo b/foo.py
742 # @@ -12,2 +14,3 @@
743 # @@ -12,2 +17 @@
744 # running re.findall on the above string with pattern will give
745 # [('foo.py', ''), ('', '14,3'), ('', '17')]
746
747 curr_file = None
748 line_diffs = {}
749 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
750 if match[0] != '':
751 # Will match the second filename in diff --git a/a.py b/b.py.
752 curr_file = match[0]
753 line_diffs[curr_file] = []
754 else:
755 # Matches +14,3
756 if ',' in match[1]:
757 diff_start, diff_count = match[1].split(',')
758 else:
759 # Single line changes are of the form +12 instead of +12,1.
760 diff_start = match[1]
761 diff_count = 1
762
763 diff_start = int(diff_start)
764 diff_count = int(diff_count)
765
766 # If diff_count == 0 this is a removal we can ignore.
767 line_diffs[curr_file].append((diff_start, diff_count))
768
769 return line_diffs
770
771
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000772def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000773 """Checks if a yapf file is in any parent directory of fpath until top_dir.
774
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000775 Recursively checks parent directories to find yapf file and if no yapf file
776 is found returns None. Uses yapf_config_cache as a cache for
777 previously found configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000778 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000779 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000780 # Return result if we've already computed it.
781 if fpath in yapf_config_cache:
782 return yapf_config_cache[fpath]
783
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000784 parent_dir = os.path.dirname(fpath)
785 if os.path.isfile(fpath):
786 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000787 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000788 # Otherwise fpath is a directory
789 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
790 if os.path.isfile(yapf_file):
791 ret = yapf_file
792 elif fpath == top_dir or parent_dir == fpath:
793 # If we're at the top level directory, or if we're at root
794 # there is no provided style.
795 ret = None
796 else:
797 # Otherwise recurse on the current directory.
798 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000799 yapf_config_cache[fpath] = ret
800 return ret
801
802
qyearsley53f48a12016-09-01 10:45:13 -0700803def write_try_results_json(output_file, builds):
804 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
805
806 The input |builds| dict is assumed to be generated by Buildbucket.
807 Buildbucket documentation: http://goo.gl/G0s101
808 """
809
810 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800811 """Extracts some of the information from one build dict."""
812 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700813 return {
814 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700815 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800816 'builder_name': parameters.get('builder_name'),
817 'created_ts': build.get('created_ts'),
818 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700819 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800820 'result': build.get('result'),
821 'status': build.get('status'),
822 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700823 'url': build.get('url'),
824 }
825
826 converted = []
827 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000828 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700829 write_json(output_file, converted)
830
831
Aaron Gable13101a62018-02-09 13:20:41 -0800832def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000833 """Prints statistics about the change to the user."""
834 # --no-ext-diff is broken in some versions of Git, so try to work around
835 # this by overriding the environment (but there is still a problem if the
836 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000837 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000838 if 'GIT_EXTERNAL_DIFF' in env:
839 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000840
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000841 try:
842 stdout = sys.stdout.fileno()
843 except AttributeError:
844 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000845 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800846 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000847 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000848
849
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000850class BuildbucketResponseException(Exception):
851 pass
852
853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854class Settings(object):
855 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000857 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000858 self.tree_status_url = None
859 self.viewvc_url = None
860 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000861 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000862 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000863 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000864 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000865
866 def LazyUpdateIfNeeded(self):
867 """Updates the settings from a codereview.settings file, if available."""
868 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000869 # The only value that actually changes the behavior is
870 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000871 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000872 error_ok=True
873 ).strip().lower()
874
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000876 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000877 LoadCodereviewSettingsFromFile(cr_settings_file)
878 self.updated = True
879
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000880 @staticmethod
881 def GetRelativeRoot():
882 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000883
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000884 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000885 if self.root is None:
886 self.root = os.path.abspath(self.GetRelativeRoot())
887 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000888
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000889 def GetTreeStatusUrl(self, error_ok=False):
890 if not self.tree_status_url:
891 error_message = ('You must configure your tree status URL by running '
892 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000893 self.tree_status_url = self._GetConfig(
894 'rietveld.tree-status-url', error_ok=error_ok,
895 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000896 return self.tree_status_url
897
898 def GetViewVCUrl(self):
899 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000900 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000901 return self.viewvc_url
902
rmistry@google.com90752582014-01-14 21:04:50 +0000903 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000904 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000905
rmistry@google.com5626a922015-02-26 14:03:30 +0000906 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000907 run_post_upload_hook = self._GetConfig(
908 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000909 return run_post_upload_hook == "True"
910
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000911 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000912 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000913
ukai@chromium.orge8077812012-02-03 03:41:46 +0000914 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700915 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000916 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700917 self.is_gerrit = (
918 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000919 return self.is_gerrit
920
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000921 def GetSquashGerritUploads(self):
922 """Return true if uploads to Gerrit should be squashed by default."""
923 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700924 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
925 if self.squash_gerrit_uploads is None:
926 # Default is squash now (http://crbug.com/611892#c23).
927 self.squash_gerrit_uploads = not (
928 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
929 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000930 return self.squash_gerrit_uploads
931
tandriia60502f2016-06-20 02:01:53 -0700932 def GetSquashGerritUploadsOverride(self):
933 """Return True or False if codereview.settings should be overridden.
934
935 Returns None if no override has been defined.
936 """
937 # See also http://crbug.com/611892#c23
938 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
939 error_ok=True).strip()
940 if result == 'true':
941 return True
942 if result == 'false':
943 return False
944 return None
945
tandrii@chromium.org28253532016-04-14 13:46:56 +0000946 def GetGerritSkipEnsureAuthenticated(self):
947 """Return True if EnsureAuthenticated should not be done for Gerrit
948 uploads."""
949 if self.gerrit_skip_ensure_authenticated is None:
950 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000951 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000952 error_ok=True).strip() == 'true')
953 return self.gerrit_skip_ensure_authenticated
954
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000955 def GetGitEditor(self):
956 """Return the editor specified in the git config, or None if none is."""
957 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000958 # Git requires single quotes for paths with spaces. We need to replace
959 # them with double quotes for Windows to treat such paths as a single
960 # path.
961 self.git_editor = self._GetConfig(
962 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000963 return self.git_editor or None
964
thestig@chromium.org44202a22014-03-11 19:22:18 +0000965 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000966 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000967 DEFAULT_LINT_REGEX)
968
969 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000970 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000971 DEFAULT_LINT_IGNORE_REGEX)
972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973 def _GetConfig(self, param, **kwargs):
974 self.LazyUpdateIfNeeded()
975 return RunGit(['config', param], **kwargs).strip()
976
977
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100978@contextlib.contextmanager
979def _get_gerrit_project_config_file(remote_url):
980 """Context manager to fetch and store Gerrit's project.config from
981 refs/meta/config branch and store it in temp file.
982
983 Provides a temporary filename or None if there was error.
984 """
985 error, _ = RunGitWithCode([
986 'fetch', remote_url,
987 '+refs/meta/config:refs/git_cl/meta/config'])
988 if error:
989 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700990 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100991 (remote_url, error))
992 yield None
993 return
994
995 error, project_config_data = RunGitWithCode(
996 ['show', 'refs/git_cl/meta/config:project.config'])
997 if error:
998 print('WARNING: project.config file not found')
999 yield None
1000 return
1001
1002 with gclient_utils.temporary_directory() as tempdir:
1003 project_config_file = os.path.join(tempdir, 'project.config')
1004 gclient_utils.FileWrite(project_config_file, project_config_data)
1005 yield project_config_file
1006
1007
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008def ShortBranchName(branch):
1009 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001010 return branch.replace('refs/heads/', '', 1)
1011
1012
1013def GetCurrentBranchRef():
1014 """Returns branch ref (e.g., refs/heads/master) or None."""
1015 return RunGit(['symbolic-ref', 'HEAD'],
1016 stderr=subprocess2.VOID, error_ok=True).strip() or None
1017
1018
1019def GetCurrentBranch():
1020 """Returns current branch or None.
1021
1022 For refs/heads/* branches, returns just last part. For others, full ref.
1023 """
1024 branchref = GetCurrentBranchRef()
1025 if branchref:
1026 return ShortBranchName(branchref)
1027 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028
1029
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001030class _CQState(object):
1031 """Enum for states of CL with respect to Commit Queue."""
1032 NONE = 'none'
1033 DRY_RUN = 'dry_run'
1034 COMMIT = 'commit'
1035
1036 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1037
1038
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001039class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001040 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001041 self.issue = issue
1042 self.patchset = patchset
1043 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001044 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001046
1047 @property
1048 def valid(self):
1049 return self.issue is not None
1050
1051
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001052def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001053 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1054 fail_result = _ParsedIssueNumberArgument()
1055
1056 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001057 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001058 if not arg.startswith('http'):
1059 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001060
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001061 url = gclient_utils.UpgradeToHttps(arg)
1062 try:
1063 parsed_url = urlparse.urlparse(url)
1064 except ValueError:
1065 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001066
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001067 if codereview is not None:
1068 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1069 return parsed or fail_result
1070
Andrii Shyshkalov0a264d82018-11-21 00:36:16 +00001071 return _GerritChangelistImpl.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001072
1073
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001074def _create_description_from_log(args):
1075 """Pulls out the commit log to use as a base for the CL description."""
1076 log_args = []
1077 if len(args) == 1 and not args[0].endswith('.'):
1078 log_args = [args[0] + '..']
1079 elif len(args) == 1 and args[0].endswith('...'):
1080 log_args = [args[0][:-1]]
1081 elif len(args) == 2:
1082 log_args = [args[0] + '..' + args[1]]
1083 else:
1084 log_args = args[:] # Hope for the best!
1085 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1086
1087
Aaron Gablea45ee112016-11-22 15:14:38 -08001088class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001089 def __init__(self, issue, url):
1090 self.issue = issue
1091 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001092 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001093
1094 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001095 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001096 self.issue, self.url)
1097
1098
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001099_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001100 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001101 # TODO(tandrii): these two aren't known in Gerrit.
1102 'approval', 'disapproval'])
1103
1104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001106 """Changelist works with one changelist in local branch.
1107
1108 Supports two codereview backends: Rietveld or Gerrit, selected at object
1109 creation.
1110
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001111 Notes:
1112 * Not safe for concurrent multi-{thread,process} use.
1113 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001114 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001115 """
1116
1117 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1118 """Create a new ChangeList instance.
1119
1120 If issue is given, the codereview must be given too.
1121
1122 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1123 Otherwise, it's decided based on current configuration of the local branch,
1124 with default being 'rietveld' for backwards compatibility.
1125 See _load_codereview_impl for more details.
1126
1127 **kwargs will be passed directly to codereview implementation.
1128 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001130 global settings
1131 if not settings:
1132 # Happens when git_cl.py is used as a utility library.
1133 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001134
1135 if issue:
1136 assert codereview, 'codereview must be known, if issue is known'
1137
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.branchref = branchref
1139 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001140 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.branch = ShortBranchName(self.branchref)
1142 else:
1143 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001145 self.lookedup_issue = False
1146 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.has_description = False
1148 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001149 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001151 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001152 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001153 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001154 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001155
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001156 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001157 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 assert self._codereview_impl
1160 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161
1162 def _load_codereview_impl(self, codereview=None, **kwargs):
1163 if codereview:
Joe Masond87b0962018-12-03 21:04:46 +00001164 assert codereview in _CODEREVIEW_IMPLEMENTATIONS, (
1165 'codereview {} not in {}'.format(codereview,
1166 _CODEREVIEW_IMPLEMENTATIONS))
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001167 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1168 self._codereview = codereview
1169 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170 return
1171
1172 # Automatic selection based on issue number set for a current branch.
1173 # Rietveld takes precedence over Gerrit.
1174 assert not self.issue
1175 # Whether we find issue or not, we are doing the lookup.
1176 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001177 if self.GetBranch():
1178 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1179 issue = _git_get_branch_config_value(
1180 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1181 if issue:
1182 self._codereview = codereview
1183 self._codereview_impl = cls(self, **kwargs)
1184 self.issue = int(issue)
1185 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001186
Bryce Thomascfc97122018-12-13 20:21:47 +00001187 # No issue is set for this branch, so default to gerrit.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001188 return self._load_codereview_impl(
Bryce Thomascfc97122018-12-13 20:21:47 +00001189 codereview='gerrit',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001190 **kwargs)
1191
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001192 def IsGerrit(self):
1193 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001194
1195 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001196 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001198 The return value is a string suitable for passing to git cl with the --cc
1199 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 """
1201 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001202 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001203 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001204 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1205 return self.cc
1206
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001207 def GetCCListWithoutDefault(self):
1208 """Return the users cc'd on this CL excluding default ones."""
1209 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001210 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001211 return self.cc
1212
Daniel Cheng7227d212017-11-17 08:12:37 -08001213 def ExtendCC(self, more_cc):
1214 """Extends the list of users to cc on this CL based on the changed files."""
1215 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001216
1217 def GetBranch(self):
1218 """Returns the short branch name, e.g. 'master'."""
1219 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001220 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001221 if not branchref:
1222 return None
1223 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001224 self.branch = ShortBranchName(self.branchref)
1225 return self.branch
1226
1227 def GetBranchRef(self):
1228 """Returns the full branch name, e.g. 'refs/heads/master'."""
1229 self.GetBranch() # Poke the lazy loader.
1230 return self.branchref
1231
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001232 def ClearBranch(self):
1233 """Clears cached branch data of this object."""
1234 self.branch = self.branchref = None
1235
tandrii5d48c322016-08-18 16:19:37 -07001236 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1237 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1238 kwargs['branch'] = self.GetBranch()
1239 return _git_get_branch_config_value(key, default, **kwargs)
1240
1241 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1242 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1243 assert self.GetBranch(), (
1244 'this CL must have an associated branch to %sset %s%s' %
1245 ('un' if value is None else '',
1246 key,
1247 '' if value is None else ' to %r' % value))
1248 kwargs['branch'] = self.GetBranch()
1249 return _git_set_branch_config_value(key, value, **kwargs)
1250
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001251 @staticmethod
1252 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001253 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254 e.g. 'origin', 'refs/heads/master'
1255 """
1256 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001257 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1258
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001260 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001262 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1263 error_ok=True).strip()
1264 if upstream_branch:
1265 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001267 # Else, try to guess the origin remote.
1268 remote_branches = RunGit(['branch', '-r']).split()
1269 if 'origin/master' in remote_branches:
1270 # Fall back on origin/master if it exits.
1271 remote = 'origin'
1272 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001274 DieWithError(
1275 'Unable to determine default branch to diff against.\n'
1276 'Either pass complete "git diff"-style arguments, like\n'
1277 ' git cl upload origin/master\n'
1278 'or verify this branch is set up to track another \n'
1279 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280
1281 return remote, upstream_branch
1282
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001283 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001284 upstream_branch = self.GetUpstreamBranch()
1285 if not BranchExists(upstream_branch):
1286 DieWithError('The upstream for the current branch (%s) does not exist '
1287 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001288 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001289 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001290
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 def GetUpstreamBranch(self):
1292 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001294 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001295 upstream_branch = upstream_branch.replace('refs/heads/',
1296 'refs/remotes/%s/' % remote)
1297 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1298 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 self.upstream_branch = upstream_branch
1300 return self.upstream_branch
1301
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001302 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001303 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 remote, branch = None, self.GetBranch()
1305 seen_branches = set()
1306 while branch not in seen_branches:
1307 seen_branches.add(branch)
1308 remote, branch = self.FetchUpstreamTuple(branch)
1309 branch = ShortBranchName(branch)
1310 if remote != '.' or branch.startswith('refs/remotes'):
1311 break
1312 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001313 remotes = RunGit(['remote'], error_ok=True).split()
1314 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001315 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001316 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001318 logging.warn('Could not determine which remote this change is '
1319 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001320 else:
1321 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001322 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001323 branch = 'HEAD'
1324 if branch.startswith('refs/remotes'):
1325 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001326 elif branch.startswith('refs/branch-heads/'):
1327 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001328 else:
1329 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001330 return self._remote
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 def GitSanityChecks(self, upstream_git_obj):
1333 """Checks git repo status and ensures diff is from local commits."""
1334
sbc@chromium.org79706062015-01-14 21:18:12 +00001335 if upstream_git_obj is None:
1336 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001337 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001338 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001339 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001340 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001341 return False
1342
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001343 # Verify the commit we're diffing against is in our current branch.
1344 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1345 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1346 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001347 print('ERROR: %s is not in the current branch. You may need to rebase '
1348 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001349 return False
1350
1351 # List the commits inside the diff, and verify they are all local.
1352 commits_in_diff = RunGit(
1353 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1354 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1355 remote_branch = remote_branch.strip()
1356 if code != 0:
1357 _, remote_branch = self.GetRemoteBranch()
1358
1359 commits_in_remote = RunGit(
1360 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1361
1362 common_commits = set(commits_in_diff) & set(commits_in_remote)
1363 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001364 print('ERROR: Your diff contains %d commits already in %s.\n'
1365 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1366 'the diff. If you are using a custom git flow, you can override'
1367 ' the reference used for this check with "git config '
1368 'gitcl.remotebranch <git-ref>".' % (
1369 len(common_commits), remote_branch, upstream_git_obj),
1370 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001371 return False
1372 return True
1373
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001374 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001375 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001376
1377 Returns None if it is not set.
1378 """
tandrii5d48c322016-08-18 16:19:37 -07001379 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001380
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001381 def GetRemoteUrl(self):
1382 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1383
1384 Returns None if there is no remote.
1385 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001386 is_cached, value = self._cached_remote_url
1387 if is_cached:
1388 return value
1389
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001390 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001391 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1392
Edward Lemur298f2cf2019-02-22 21:40:39 +00001393 # Check if the remote url can be parsed as an URL.
1394 host = urlparse.urlparse(url).netloc
1395 if host:
1396 self._cached_remote_url = (True, url)
1397 return url
1398
1399 # If it cannot be parsed as an url, assume it is a local directory, probably
1400 # a git cache.
1401 logging.warning('"%s" doesn\'t appear to point to a git host. '
1402 'Interpreting it as a local directory.', url)
1403 if not os.path.isdir(url):
1404 logging.error(
1405 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
1406 remote, url, self.GetBranch())
1407 return None
1408
1409 cache_path = url
1410 url = RunGit(['config', 'remote.%s.url' % remote],
1411 error_ok=True,
1412 cwd=url).strip()
1413
1414 host = urlparse.urlparse(url).netloc
1415 if not host:
1416 logging.error(
1417 'Remote "%(remote)s" for branch "%(branch)s" points to '
1418 '"%(cache_path)s", but it is misconfigured.\n'
1419 '"%(cache_path)s" must be a git repo and must have a remote named '
1420 '"%(remote)s" pointing to the git host.', {
1421 'remote': remote,
1422 'cache_path': cache_path,
1423 'branch': self.GetBranch()})
1424 return None
1425
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001426 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001427 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001428
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001429 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001430 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001431 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001432 self.issue = self._GitGetBranchConfigValue(
1433 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001434 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001435 return self.issue
1436
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437 def GetIssueURL(self):
1438 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439 issue = self.GetIssue()
1440 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001441 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001442 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001443
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001444 def GetDescription(self, pretty=False, force=False):
1445 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001447 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448 self.has_description = True
1449 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001450 # Set width to 72 columns + 2 space indent.
1451 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001453 lines = self.description.splitlines()
1454 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001455 return self.description
1456
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001457 def GetDescriptionFooters(self):
1458 """Returns (non_footer_lines, footers) for the commit message.
1459
1460 Returns:
1461 non_footer_lines (list(str)) - Simple list of description lines without
1462 any footer. The lines do not contain newlines, nor does the list contain
1463 the empty line between the message and the footers.
1464 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1465 [("Change-Id", "Ideadbeef...."), ...]
1466 """
1467 raw_description = self.GetDescription()
1468 msg_lines, _, footers = git_footers.split_footers(raw_description)
1469 if footers:
1470 msg_lines = msg_lines[:len(msg_lines)-1]
1471 return msg_lines, footers
1472
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001473 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001474 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001475 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001476 self.patchset = self._GitGetBranchConfigValue(
1477 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001478 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001479 return self.patchset
1480
1481 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001482 """Set this branch's patchset. If patchset=0, clears the patchset."""
1483 assert self.GetBranch()
1484 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001485 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001486 else:
1487 self.patchset = int(patchset)
1488 self._GitSetBranchConfigValue(
1489 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001490
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001491 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001492 """Set this branch's issue. If issue isn't given, clears the issue."""
1493 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001494 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001495 issue = int(issue)
1496 self._GitSetBranchConfigValue(
1497 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001498 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001499 codereview_server = self._codereview_impl.GetCodereviewServer()
1500 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001501 self._GitSetBranchConfigValue(
1502 self._codereview_impl.CodereviewServerConfigKey(),
1503 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001504 else:
tandrii5d48c322016-08-18 16:19:37 -07001505 # Reset all of these just to be clean.
1506 reset_suffixes = [
1507 'last-upload-hash',
1508 self._codereview_impl.IssueConfigKey(),
1509 self._codereview_impl.PatchsetConfigKey(),
1510 self._codereview_impl.CodereviewServerConfigKey(),
1511 ] + self._PostUnsetIssueProperties()
1512 for prop in reset_suffixes:
1513 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001514 msg = RunGit(['log', '-1', '--format=%B']).strip()
1515 if msg and git_footers.get_footer_change_id(msg):
1516 print('WARNING: The change patched into this branch has a Change-Id. '
1517 'Removing it.')
1518 RunGit(['commit', '--amend', '-m',
1519 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001520 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001521 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001522
dnjba1b0f32016-09-02 12:37:42 -07001523 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001524 if not self.GitSanityChecks(upstream_branch):
1525 DieWithError('\nGit sanity check failure')
1526
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001527 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001528 if not root:
1529 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001530 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001531
1532 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001533 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001534 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001535 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001536 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001537 except subprocess2.CalledProcessError:
1538 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001539 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001540 'This branch probably doesn\'t exist anymore. To reset the\n'
1541 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001542 ' git branch --set-upstream-to origin/master %s\n'
1543 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001544 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001545
maruel@chromium.org52424302012-08-29 15:14:30 +00001546 issue = self.GetIssue()
1547 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001548 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001549 description = self.GetDescription()
1550 else:
1551 # If the change was never uploaded, use the log messages of all commits
1552 # up to the branch point, as git cl upload will prefill the description
1553 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001554 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1555 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001556
1557 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001558 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001559 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001560 name,
1561 description,
1562 absroot,
1563 files,
1564 issue,
1565 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001566 author,
1567 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001568
dsansomee2d6fd92016-09-08 00:10:47 -07001569 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001570 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001571 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001572 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001573
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001574 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1575 """Sets the description for this CL remotely.
1576
1577 You can get description_lines and footers with GetDescriptionFooters.
1578
1579 Args:
1580 description_lines (list(str)) - List of CL description lines without
1581 newline characters.
1582 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1583 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1584 `List-Of-Tokens`). It will be case-normalized so that each token is
1585 title-cased.
1586 """
1587 new_description = '\n'.join(description_lines)
1588 if footers:
1589 new_description += '\n'
1590 for k, v in footers:
1591 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1592 if not git_footers.FOOTER_PATTERN.match(foot):
1593 raise ValueError('Invalid footer %r' % foot)
1594 new_description += foot + '\n'
1595 self.UpdateDescription(new_description, force)
1596
Edward Lesmes8e282792018-04-03 18:50:29 -04001597 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001598 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1599 try:
1600 return presubmit_support.DoPresubmitChecks(change, committing,
1601 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1602 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001603 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1604 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001605 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001606 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001608 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1609 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001610 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1611 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001612 else:
1613 # Assume url.
1614 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1615 urlparse.urlparse(issue_arg))
1616 if not parsed_issue_arg or not parsed_issue_arg.valid:
1617 DieWithError('Failed to parse issue argument "%s". '
1618 'Must be an issue number or a valid URL.' % issue_arg)
1619 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001620 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001621
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 def CMDUpload(self, options, git_diff_args, orig_args):
1623 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001624 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001625 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001626 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001627 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001628 else:
1629 if self.GetBranch() is None:
1630 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1631
1632 # Default to diffing against common ancestor of upstream branch
1633 base_branch = self.GetCommonAncestorWithUpstream()
1634 git_diff_args = [base_branch, 'HEAD']
1635
Aaron Gablec4c40d12017-05-22 11:49:53 -07001636
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001637 # Fast best-effort checks to abort before running potentially
1638 # expensive hooks if uploading is likely to fail anyway. Passing these
1639 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001640 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001641 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001642
1643 # Apply watchlists on upload.
1644 change = self.GetChange(base_branch, None)
1645 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1646 files = [f.LocalPath() for f in change.AffectedFiles()]
1647 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001648 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001649
1650 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001651 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652 # Set the reviewer list now so that presubmit checks can access it.
1653 change_description = ChangeDescription(change.FullDescriptionText())
1654 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001655 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001656 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001657 change)
1658 change.SetDescriptionText(change_description.description)
1659 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001660 may_prompt=not options.force,
1661 verbose=options.verbose,
1662 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001663 if not hook_results.should_continue():
1664 return 1
1665 if not options.reviewers and hook_results.reviewers:
1666 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001667 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001668
Aaron Gable13101a62018-02-09 13:20:41 -08001669 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001670 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001671 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001672 _git_set_branch_config_value('last-upload-hash',
1673 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001674 # Run post upload hooks, if specified.
1675 if settings.GetRunPostUploadHook():
1676 presubmit_support.DoPostUploadExecuter(
1677 change,
1678 self,
1679 settings.GetRoot(),
1680 options.verbose,
1681 sys.stdout)
1682
1683 # Upload all dependencies if specified.
1684 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001685 print()
1686 print('--dependencies has been specified.')
1687 print('All dependent local branches will be re-uploaded.')
1688 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001689 # Remove the dependencies flag from args so that we do not end up in a
1690 # loop.
1691 orig_args.remove('--dependencies')
1692 ret = upload_branch_deps(self, orig_args)
1693 return ret
1694
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001695 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001696 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001697
1698 Issue must have been already uploaded and known.
1699 """
1700 assert new_state in _CQState.ALL_STATES
1701 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001702 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001703 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001704 return 0
1705 except KeyboardInterrupt:
1706 raise
1707 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001708 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001709 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001710 ' * Your project has no CQ,\n'
1711 ' * You don\'t have permission to change the CQ state,\n'
1712 ' * There\'s a bug in this code (see stack trace below).\n'
1713 'Consider specifying which bots to trigger manually or asking your '
1714 'project owners for permissions or contacting Chrome Infra at:\n'
1715 'https://www.chromium.org/infra\n\n' %
1716 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001717 # Still raise exception so that stack trace is printed.
1718 raise
1719
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 # Forward methods to codereview specific implementation.
1721
Aaron Gable636b13f2017-07-14 10:42:48 -07001722 def AddComment(self, message, publish=None):
1723 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001724
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001726 """Returns list of _CommentSummary for each comment.
1727
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 args:
1729 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001731 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 def CloseIssue(self):
1734 return self._codereview_impl.CloseIssue()
1735
1736 def GetStatus(self):
1737 return self._codereview_impl.GetStatus()
1738
1739 def GetCodereviewServer(self):
1740 return self._codereview_impl.GetCodereviewServer()
1741
tandriide281ae2016-10-12 06:02:30 -07001742 def GetIssueOwner(self):
1743 """Get owner from codereview, which may differ from this checkout."""
1744 return self._codereview_impl.GetIssueOwner()
1745
Edward Lemur707d70b2018-02-07 00:50:14 +01001746 def GetReviewers(self):
1747 return self._codereview_impl.GetReviewers()
1748
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749 def GetMostRecentPatchset(self):
1750 return self._codereview_impl.GetMostRecentPatchset()
1751
tandriide281ae2016-10-12 06:02:30 -07001752 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001753 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001754 return self._codereview_impl.CannotTriggerTryJobReason()
1755
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001756 def GetTryJobProperties(self, patchset=None):
1757 """Returns dictionary of properties to launch try job."""
1758 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001759
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001760 def __getattr__(self, attr):
1761 # This is because lots of untested code accesses Rietveld-specific stuff
1762 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001763 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001764 # Note that child method defines __getattr__ as well, and forwards it here,
1765 # because _RietveldChangelistImpl is not cleaned up yet, and given
1766 # deprecation of Rietveld, it should probably be just removed.
1767 # Until that time, avoid infinite recursion by bypassing __getattr__
1768 # of implementation class.
1769 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770
1771
1772class _ChangelistCodereviewBase(object):
1773 """Abstract base class encapsulating codereview specifics of a changelist."""
1774 def __init__(self, changelist):
1775 self._changelist = changelist # instance of Changelist
1776
1777 def __getattr__(self, attr):
1778 # Forward methods to changelist.
1779 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1780 # _RietveldChangelistImpl to avoid this hack?
1781 return getattr(self._changelist, attr)
1782
1783 def GetStatus(self):
1784 """Apply a rough heuristic to give a simple summary of an issue's review
1785 or CQ status, assuming adherence to a common workflow.
1786
1787 Returns None if no issue for this branch, or specific string keywords.
1788 """
1789 raise NotImplementedError()
1790
1791 def GetCodereviewServer(self):
1792 """Returns server URL without end slash, like "https://codereview.com"."""
1793 raise NotImplementedError()
1794
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001795 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 """Fetches and returns description from the codereview server."""
1797 raise NotImplementedError()
1798
tandrii5d48c322016-08-18 16:19:37 -07001799 @classmethod
1800 def IssueConfigKey(cls):
1801 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001802 raise NotImplementedError()
1803
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001804 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001805 def PatchsetConfigKey(cls):
1806 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 raise NotImplementedError()
1808
tandrii5d48c322016-08-18 16:19:37 -07001809 @classmethod
1810 def CodereviewServerConfigKey(cls):
1811 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812 raise NotImplementedError()
1813
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001814 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001815 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001816 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001817
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001818 def GetGerritObjForPresubmit(self):
1819 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1820 return None
1821
dsansomee2d6fd92016-09-08 00:10:47 -07001822 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 """Update the description on codereview site."""
1824 raise NotImplementedError()
1825
Aaron Gable636b13f2017-07-14 10:42:48 -07001826 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001827 """Posts a comment to the codereview site."""
1828 raise NotImplementedError()
1829
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001831 raise NotImplementedError()
1832
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 def CloseIssue(self):
1834 """Closes the issue."""
1835 raise NotImplementedError()
1836
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837 def GetMostRecentPatchset(self):
1838 """Returns the most recent patchset number from the codereview site."""
1839 raise NotImplementedError()
1840
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001841 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001842 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 """Fetches and applies the issue.
1844
1845 Arguments:
1846 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1847 reject: if True, reject the failed patch instead of switching to 3-way
1848 merge. Rietveld only.
1849 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1850 only.
1851 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001852 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001853 """
1854 raise NotImplementedError()
1855
1856 @staticmethod
1857 def ParseIssueURL(parsed_url):
1858 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1859 failed."""
1860 raise NotImplementedError()
1861
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001862 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001863 """Best effort check that user is authenticated with codereview server.
1864
1865 Arguments:
1866 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001867 refresh: whether to attempt to refresh credentials. Ignored if not
1868 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001869 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001870 raise NotImplementedError()
1871
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001873 """Best effort check that uploading isn't supposed to fail for predictable
1874 reasons.
1875
1876 This method should raise informative exception if uploading shouldn't
1877 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001878
1879 Arguments:
1880 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001881 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001882 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001883
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001884 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001885 """Uploads a change to codereview."""
1886 raise NotImplementedError()
1887
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001888 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001889 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001890
1891 Issue must have been already uploaded and known.
1892 """
1893 raise NotImplementedError()
1894
tandriie113dfd2016-10-11 10:20:12 -07001895 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001897 raise NotImplementedError()
1898
tandriide281ae2016-10-12 06:02:30 -07001899 def GetIssueOwner(self):
1900 raise NotImplementedError()
1901
Edward Lemur707d70b2018-02-07 00:50:14 +01001902 def GetReviewers(self):
1903 raise NotImplementedError()
1904
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001905 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001906 raise NotImplementedError()
1907
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001909class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 # auth_config is Rietveld thing, kept here to preserve interface only.
1912 super(_GerritChangelistImpl, self).__init__(changelist)
1913 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001914 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001915 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001916 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001917 # Map from change number (issue) to its detail cache.
1918 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001920 if codereview_host is not None:
1921 assert not codereview_host.startswith('https://'), codereview_host
1922 self._gerrit_host = codereview_host
1923 self._gerrit_server = 'https://%s' % codereview_host
1924
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 def _GetGerritHost(self):
1926 # Lazy load of configs.
1927 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001928 if self._gerrit_host and '.' not in self._gerrit_host:
1929 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1930 # This happens for internal stuff http://crbug.com/614312.
1931 parsed = urlparse.urlparse(self.GetRemoteUrl())
1932 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001933 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07001934 ' Your current remote is: %s' % self.GetRemoteUrl())
1935 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1936 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 return self._gerrit_host
1938
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001939 def _GetGitHost(self):
1940 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001941 remote_url = self.GetRemoteUrl()
1942 if not remote_url:
1943 return None
1944 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001945
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001946 def GetCodereviewServer(self):
1947 if not self._gerrit_server:
1948 # If we're on a branch then get the server potentially associated
1949 # with that branch.
1950 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001951 self._gerrit_server = self._GitGetBranchConfigValue(
1952 self.CodereviewServerConfigKey())
1953 if self._gerrit_server:
1954 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001955 if not self._gerrit_server:
1956 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1957 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001958 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959 parts[0] = parts[0] + '-review'
1960 self._gerrit_host = '.'.join(parts)
1961 self._gerrit_server = 'https://%s' % self._gerrit_host
1962 return self._gerrit_server
1963
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001964 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001965 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001966 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001967 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001968 logging.warn('can\'t detect Gerrit project.')
1969 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001970 project = urlparse.urlparse(remote_url).path.strip('/')
1971 if project.endswith('.git'):
1972 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001973 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1974 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1975 # gitiles/git-over-https protocol. E.g.,
1976 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1977 # as
1978 # https://chromium.googlesource.com/v8/v8
1979 if project.startswith('a/'):
1980 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001981 return project
1982
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001983 def _GerritChangeIdentifier(self):
1984 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1985
1986 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001987 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001988 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001989 project = self._GetGerritProject()
1990 if project:
1991 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1992 # Fall back on still unique, but less efficient change number.
1993 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001994
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001995 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001996 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001997 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001998
tandrii5d48c322016-08-18 16:19:37 -07001999 @classmethod
2000 def PatchsetConfigKey(cls):
2001 return 'gerritpatchset'
2002
2003 @classmethod
2004 def CodereviewServerConfigKey(cls):
2005 return 'gerritserver'
2006
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002007 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002008 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002009 if settings.GetGerritSkipEnsureAuthenticated():
2010 # For projects with unusual authentication schemes.
2011 # See http://crbug.com/603378.
2012 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002013
2014 # Check presence of cookies only if using cookies-based auth method.
2015 cookie_auth = gerrit_util.Authenticator.get()
2016 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002017 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002018
2019 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002020 self.GetCodereviewServer()
2021 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002022 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002023
2024 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2025 git_auth = cookie_auth.get_auth_header(git_host)
2026 if gerrit_auth and git_auth:
2027 if gerrit_auth == git_auth:
2028 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002029 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002030 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002031 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032 ' %s\n'
2033 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002034 ' Consider running the following command:\n'
2035 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002036 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002037 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002038 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002039 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002040 cookie_auth.get_new_password_message(git_host)))
2041 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002042 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002043 return
2044 else:
2045 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002046 ([] if gerrit_auth else [self._gerrit_host]) +
2047 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002048 DieWithError('Credentials for the following hosts are required:\n'
2049 ' %s\n'
2050 'These are read from %s (or legacy %s)\n'
2051 '%s' % (
2052 '\n '.join(missing),
2053 cookie_auth.get_gitcookies_path(),
2054 cookie_auth.get_netrc_path(),
2055 cookie_auth.get_new_password_message(git_host)))
2056
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002057 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002058 if not self.GetIssue():
2059 return
2060
2061 # Warm change details cache now to avoid RPCs later, reducing latency for
2062 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002063 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002064 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002065
2066 status = self._GetChangeDetail()['status']
2067 if status in ('MERGED', 'ABANDONED'):
2068 DieWithError('Change %s has been %s, new uploads are not allowed' %
2069 (self.GetIssueURL(),
2070 'submitted' if status == 'MERGED' else 'abandoned'))
2071
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002072 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2073 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2074 # Apparently this check is not very important? Otherwise get_auth_email
2075 # could have been added to other implementations of Authenticator.
2076 cookies_auth = gerrit_util.Authenticator.get()
2077 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002078 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002079
2080 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002081 if self.GetIssueOwner() == cookies_user:
2082 return
2083 logging.debug('change %s owner is %s, cookies user is %s',
2084 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002085 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002086 # so ask what Gerrit thinks of this user.
2087 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2088 if details['email'] == self.GetIssueOwner():
2089 return
2090 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002091 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002092 'as %s.\n'
2093 'Uploading may fail due to lack of permissions.' %
2094 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2095 confirm_or_exit(action='upload')
2096
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002097 def _PostUnsetIssueProperties(self):
2098 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002099 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002100
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002101 def GetGerritObjForPresubmit(self):
2102 return presubmit_support.GerritAccessor(self._GetGerritHost())
2103
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002104 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002105 """Apply a rough heuristic to give a simple summary of an issue's review
2106 or CQ status, assuming adherence to a common workflow.
2107
2108 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002109 * 'error' - error from review tool (including deleted issues)
2110 * 'unsent' - no reviewers added
2111 * 'waiting' - waiting for review
2112 * 'reply' - waiting for uploader to reply to review
2113 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002114 * 'dry-run' - dry-running in the commit queue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002115 * 'commit' - in the commit queue
2116 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002117 """
2118 if not self.GetIssue():
2119 return None
2120
2121 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002122 data = self._GetChangeDetail([
2123 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002124 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002125 return 'error'
2126
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002127 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002128 return 'closed'
2129
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002130 cq_label = data['labels'].get('Commit-Queue', {})
2131 max_cq_vote = 0
2132 for vote in cq_label.get('all', []):
2133 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2134 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002135 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002136 if max_cq_vote == 1:
2137 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002138
Aaron Gable9ab38c62017-04-06 14:36:33 -07002139 if data['labels'].get('Code-Review', {}).get('approved'):
2140 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002141
2142 if not data.get('reviewers', {}).get('REVIEWER', []):
2143 return 'unsent'
2144
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002145 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002146 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2147 last_message_author = messages.pop().get('author', {})
2148 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002149 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2150 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002151 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002152 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002153 if last_message_author.get('_account_id') == owner:
2154 # Most recent message was by owner.
2155 return 'waiting'
2156 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002157 # Some reply from non-owner.
2158 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002159
2160 # Somehow there are no messages even though there are reviewers.
2161 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002162
2163 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002164 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002165 patchset = data['revisions'][data['current_revision']]['_number']
2166 self.SetPatchset(patchset)
2167 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002168
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002169 def FetchDescription(self, force=False):
2170 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2171 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002172 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00002173 return data['revisions'][current_rev]['commit']['message'].encode(
2174 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002175
dsansomee2d6fd92016-09-08 00:10:47 -07002176 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002177 if gerrit_util.HasPendingChangeEdit(
2178 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002179 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002180 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002181 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002182 'unpublished edit. Either publish the edit in the Gerrit web UI '
2183 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002184
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002185 gerrit_util.DeletePendingChangeEdit(
2186 self._GetGerritHost(), self._GerritChangeIdentifier())
2187 gerrit_util.SetCommitMessage(
2188 self._GetGerritHost(), self._GerritChangeIdentifier(),
2189 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002190
Aaron Gable636b13f2017-07-14 10:42:48 -07002191 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002192 gerrit_util.SetReview(
2193 self._GetGerritHost(), self._GerritChangeIdentifier(),
2194 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002195
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002196 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002197 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002198 # CURRENT_REVISION is included to get the latest patchset so that
2199 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002200 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002201 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2202 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002203 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002204 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002205 robot_file_comments = gerrit_util.GetChangeRobotComments(
2206 self._GetGerritHost(), self._GerritChangeIdentifier())
2207
2208 # Add the robot comments onto the list of comments, but only
2209 # keep those that are from the latest pachset.
2210 latest_patch_set = self.GetMostRecentPatchset()
2211 for path, robot_comments in robot_file_comments.iteritems():
2212 line_comments = file_comments.setdefault(path, [])
2213 line_comments.extend(
2214 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002215
2216 # Build dictionary of file comments for easy access and sorting later.
2217 # {author+date: {path: {patchset: {line: url+message}}}}
2218 comments = collections.defaultdict(
2219 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2220 for path, line_comments in file_comments.iteritems():
2221 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002222 tag = comment.get('tag', '')
2223 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002224 continue
2225 key = (comment['author']['email'], comment['updated'])
2226 if comment.get('side', 'REVISION') == 'PARENT':
2227 patchset = 'Base'
2228 else:
2229 patchset = 'PS%d' % comment['patch_set']
2230 line = comment.get('line', 0)
2231 url = ('https://%s/c/%s/%s/%s#%s%s' %
2232 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2233 'b' if comment.get('side') == 'PARENT' else '',
2234 str(line) if line else ''))
2235 comments[key][path][patchset][line] = (url, comment['message'])
2236
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002237 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002238 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002239 summary = self._BuildCommentSummary(msg, comments, readable)
2240 if summary:
2241 summaries.append(summary)
2242 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002243
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244 @staticmethod
2245 def _BuildCommentSummary(msg, comments, readable):
2246 key = (msg['author']['email'], msg['date'])
2247 # Don't bother showing autogenerated messages that don't have associated
2248 # file or line comments. this will filter out most autogenerated
2249 # messages, but will keep robot comments like those from Tricium.
2250 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2251 if is_autogenerated and not comments.get(key):
2252 return None
2253 message = msg['message']
2254 # Gerrit spits out nanoseconds.
2255 assert len(msg['date'].split('.')[-1]) == 9
2256 date = datetime.datetime.strptime(msg['date'][:-3],
2257 '%Y-%m-%d %H:%M:%S.%f')
2258 if key in comments:
2259 message += '\n'
2260 for path, patchsets in sorted(comments.get(key, {}).items()):
2261 if readable:
2262 message += '\n%s' % path
2263 for patchset, lines in sorted(patchsets.items()):
2264 for line, (url, content) in sorted(lines.items()):
2265 if line:
2266 line_str = 'Line %d' % line
2267 path_str = '%s:%d:' % (path, line)
2268 else:
2269 line_str = 'File comment'
2270 path_str = '%s:0:' % path
2271 if readable:
2272 message += '\n %s, %s: %s' % (patchset, line_str, url)
2273 message += '\n %s\n' % content
2274 else:
2275 message += '\n%s ' % path_str
2276 message += '\n%s\n' % content
2277
2278 return _CommentSummary(
2279 date=date,
2280 message=message,
2281 sender=msg['author']['email'],
2282 autogenerated=is_autogenerated,
2283 # These could be inferred from the text messages and correlated with
2284 # Code-Review label maximum, however this is not reliable.
2285 # Leaving as is until the need arises.
2286 approval=False,
2287 disapproval=False,
2288 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002289
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002290 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002291 gerrit_util.AbandonChange(
2292 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002293
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002294 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002295 gerrit_util.SubmitChange(
2296 self._GetGerritHost(), self._GerritChangeIdentifier(),
2297 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002298
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002299 def _GetChangeDetail(self, options=None, no_cache=False):
2300 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002301
2302 If fresh data is needed, set no_cache=True which will clear cache and
2303 thus new data will be fetched from Gerrit.
2304 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002305 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002306 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002307
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002308 # Optimization to avoid multiple RPCs:
2309 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2310 'CURRENT_COMMIT' not in options):
2311 options.append('CURRENT_COMMIT')
2312
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002313 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002314 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002315 options = [o.upper() for o in options]
2316
2317 # Check in cache first unless no_cache is True.
2318 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002319 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002320 else:
2321 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002322 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002323 # Assumption: data fetched before with extra options is suitable
2324 # for return for a smaller set of options.
2325 # For example, if we cached data for
2326 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2327 # and request is for options=[CURRENT_REVISION],
2328 # THEN we can return prior cached data.
2329 if options_set.issubset(cached_options_set):
2330 return data
2331
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002332 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002333 data = gerrit_util.GetChangeDetail(
2334 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002335 except gerrit_util.GerritError as e:
2336 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002337 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002338 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002339
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002340 self._detail_cache.setdefault(cache_key, []).append(
2341 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002342 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002343
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002344 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002345 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002346 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002347 data = gerrit_util.GetChangeCommit(
2348 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002349 except gerrit_util.GerritError as e:
2350 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002351 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002352 raise
agable32978d92016-11-01 12:55:02 -07002353 return data
2354
Karen Qian40c19422019-03-13 21:28:29 +00002355 def _IsCqConfigured(self):
2356 detail = self._GetChangeDetail(['LABELS'])
2357 if not u'Commit-Queue' in detail.get('labels', {}):
2358 return False
2359 # TODO(crbug/753213): Remove temporary hack
2360 if ('https://chromium.googlesource.com/chromium/src' ==
2361 self._changelist.GetRemoteUrl() and
2362 detail['branch'].startswith('refs/branch-heads/')):
2363 return False
2364 return True
2365
Olivier Robin75ee7252018-04-13 10:02:56 +02002366 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002367 if git_common.is_dirty_git_tree('land'):
2368 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002369
tandriid60367b2016-06-22 05:25:12 -07002370 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002371 if not force and self._IsCqConfigured():
2372 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002373 'which can test and land changes for you. '
2374 'Are you sure you wish to bypass it?\n',
2375 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002376 differs = True
tandriic4344b52016-08-29 06:04:54 -07002377 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002378 # Note: git diff outputs nothing if there is no diff.
2379 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002380 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002381 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002382 if detail['current_revision'] == last_upload:
2383 differs = False
2384 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002385 print('WARNING: Local branch contents differ from latest uploaded '
2386 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002387 if differs:
2388 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002389 confirm_or_exit(
2390 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2391 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002392 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002393 elif not bypass_hooks:
2394 hook_results = self.RunHook(
2395 committing=True,
2396 may_prompt=not force,
2397 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002398 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2399 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 if not hook_results.should_continue():
2401 return 1
2402
2403 self.SubmitIssue(wait_for_merge=True)
2404 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002405 links = self._GetChangeCommit().get('web_links', [])
2406 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002407 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002408 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002409 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002410 return 0
2411
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002412 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002413 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002414 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002415 assert not directory
2416 assert parsed_issue_arg.valid
2417
2418 self._changelist.issue = parsed_issue_arg.issue
2419
2420 if parsed_issue_arg.hostname:
2421 self._gerrit_host = parsed_issue_arg.hostname
2422 self._gerrit_server = 'https://%s' % self._gerrit_host
2423
tandriic2405f52016-10-10 08:13:15 -07002424 try:
2425 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002426 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002427 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002428
2429 if not parsed_issue_arg.patchset:
2430 # Use current revision by default.
2431 revision_info = detail['revisions'][detail['current_revision']]
2432 patchset = int(revision_info['_number'])
2433 else:
2434 patchset = parsed_issue_arg.patchset
2435 for revision_info in detail['revisions'].itervalues():
2436 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2437 break
2438 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002439 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002440 (parsed_issue_arg.patchset, self.GetIssue()))
2441
Aaron Gable697a91b2018-01-19 15:20:15 -08002442 remote_url = self._changelist.GetRemoteUrl()
2443 if remote_url.endswith('.git'):
2444 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002445 remote_url = remote_url.rstrip('/')
2446
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002447 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002448 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002449
2450 if remote_url != fetch_info['url']:
2451 DieWithError('Trying to patch a change from %s but this repo appears '
2452 'to be %s.' % (fetch_info['url'], remote_url))
2453
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002454 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002455
Aaron Gable62619a32017-06-16 08:22:09 -07002456 if force:
2457 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2458 print('Checked out commit for change %i patchset %i locally' %
2459 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002460 elif nocommit:
2461 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2462 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002463 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002464 RunGit(['cherry-pick', 'FETCH_HEAD'])
2465 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002466 (parsed_issue_arg.issue, patchset))
2467 print('Note: this created a local commit which does not have '
2468 'the same hash as the one uploaded for review. This will make '
2469 'uploading changes based on top of this branch difficult.\n'
2470 'If you want to do that, use "git cl patch --force" instead.')
2471
Stefan Zagerd08043c2017-10-12 12:07:02 -07002472 if self.GetBranch():
2473 self.SetIssue(parsed_issue_arg.issue)
2474 self.SetPatchset(patchset)
2475 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2476 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2477 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2478 else:
2479 print('WARNING: You are in detached HEAD state.\n'
2480 'The patch has been applied to your checkout, but you will not be '
2481 'able to upload a new patch set to the gerrit issue.\n'
2482 'Try using the \'-b\' option if you would like to work on a '
2483 'branch and/or upload a new patch set.')
2484
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002485 return 0
2486
2487 @staticmethod
2488 def ParseIssueURL(parsed_url):
2489 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2490 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002491 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2492 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002493 # Short urls like https://domain/<issue_number> can be used, but don't allow
2494 # specifying the patchset (you'd 404), but we allow that here.
2495 if parsed_url.path == '/':
2496 part = parsed_url.fragment
2497 else:
2498 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002499 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002500 if match:
2501 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002502 issue=int(match.group(3)),
2503 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002504 hostname=parsed_url.netloc,
2505 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002506 return None
2507
tandrii16e0b4e2016-06-07 10:34:28 -07002508 def _GerritCommitMsgHookCheck(self, offer_removal):
2509 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2510 if not os.path.exists(hook):
2511 return
2512 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2513 # custom developer made one.
2514 data = gclient_utils.FileRead(hook)
2515 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2516 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002517 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002518 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002519 'and may interfere with it in subtle ways.\n'
2520 'We recommend you remove the commit-msg hook.')
2521 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002522 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002523 gclient_utils.rm_file_or_tree(hook)
2524 print('Gerrit commit-msg hook removed.')
2525 else:
2526 print('OK, will keep Gerrit commit-msg hook in place.')
2527
Edward Lemur1b52d872019-05-09 21:12:12 +00002528 def _CleanUpOldTraces(self):
2529 """Keep only the last |MAX_TRACES| traces."""
2530 try:
2531 traces = sorted([
2532 os.path.join(TRACES_DIR, f)
2533 for f in os.listdir(TRACES_DIR)
2534 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2535 and not f.startswith('tmp'))
2536 ])
2537 traces_to_delete = traces[:-MAX_TRACES]
2538 for trace in traces_to_delete:
2539 os.remove(trace)
2540 except OSError:
2541 print('WARNING: Failed to remove old git traces from\n'
2542 ' %s'
2543 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002544
Edward Lemur1b52d872019-05-09 21:12:12 +00002545 def _WriteGitPushTraces(self, traces_dir, git_push_metadata):
2546 """Zip and write the git push traces stored in traces_dir."""
2547 gclient_utils.safe_makedirs(TRACES_DIR)
2548 now = datetime_now()
2549 trace_name = os.path.join(TRACES_DIR, now.strftime('%Y%m%dT%H%M%S.%f'))
2550 traces_zip = trace_name + '-traces'
2551 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002552 # Create a temporary dir to store git config and gitcookies in. It will be
2553 # compressed and stored next to the traces.
2554 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002555 git_info_zip = trace_name + '-git-info'
2556
2557 git_push_metadata['now'] = now.strftime('%c')
2558 git_push_metadata['trace_name'] = trace_name
2559 gclient_utils.FileWrite(
2560 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2561
2562 # Keep only the first 6 characters of the git hashes on the packet
2563 # trace. This greatly decreases size after compression.
2564 packet_traces = os.path.join(traces_dir, 'trace-packet')
2565 if os.path.isfile(packet_traces):
2566 contents = gclient_utils.FileRead(packet_traces)
2567 gclient_utils.FileWrite(
2568 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2569 shutil.make_archive(traces_zip, 'zip', traces_dir)
2570
2571 # Collect and compress the git config and gitcookies.
2572 git_config = RunGit(['config', '-l'])
2573 gclient_utils.FileWrite(
2574 os.path.join(git_info_dir, 'git-config'),
2575 git_config)
2576
2577 cookie_auth = gerrit_util.Authenticator.get()
2578 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2579 gitcookies_path = cookie_auth.get_gitcookies_path()
2580 if os.path.isfile(gitcookies_path):
2581 gitcookies = gclient_utils.FileRead(gitcookies_path)
2582 gclient_utils.FileWrite(
2583 os.path.join(git_info_dir, 'gitcookies'),
2584 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2585 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2586
2587 print(TRACES_MESSAGE % {'trace_name': trace_name})
2588
2589 gclient_utils.rmtree(git_info_dir)
2590
2591 def _RunGitPushWithTraces(
2592 self, change_desc, refspec, refspec_opts, git_push_metadata):
2593 """Run git push and collect the traces resulting from the execution."""
2594 # Create a temporary directory to store traces in. Traces will be compressed
2595 # and stored in a 'traces' dir inside depot_tools.
2596 traces_dir = tempfile.mkdtemp()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002597
2598 env = os.environ.copy()
2599 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2600 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
2601 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2602 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2603 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2604
2605 try:
2606 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002607 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002608 before_push = time_time()
2609 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002610 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002611 env=env,
2612 print_stdout=True,
2613 # Flush after every line: useful for seeing progress when running as
2614 # recipe.
2615 filter_fn=lambda _: sys.stdout.flush())
2616 except subprocess2.CalledProcessError as e:
2617 push_returncode = e.returncode
2618 DieWithError('Failed to create a change. Please examine output above '
2619 'for the reason of the failure.\n'
2620 'Hint: run command below to diagnose common Git/Gerrit '
2621 'credential problems:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +00002622 ' git cl creds-check',
Edward Lemur0f58ae42019-04-30 17:24:12 +00002623 change_desc)
2624 finally:
2625 execution_time = time_time() - before_push
2626 metrics.collector.add_repeated('sub_commands', {
2627 'command': 'git push',
2628 'execution_time': execution_time,
2629 'exit_code': push_returncode,
2630 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2631 })
2632
Edward Lemur1b52d872019-05-09 21:12:12 +00002633 git_push_metadata['execution_time'] = execution_time
2634 git_push_metadata['exit_code'] = push_returncode
2635 self._WriteGitPushTraces(traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002636
Edward Lemur1b52d872019-05-09 21:12:12 +00002637 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002638 gclient_utils.rmtree(traces_dir)
2639
2640 return push_stdout
2641
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002642 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002643 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002644 if options.squash and options.no_squash:
2645 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002646
2647 if not options.squash and not options.no_squash:
2648 # Load default for user, repo, squash=true, in this order.
2649 options.squash = settings.GetSquashGerritUploads()
2650 elif options.no_squash:
2651 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002652
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002653 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002654 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002655 # This may be None; default fallback value is determined in logic below.
2656 title = options.title
2657
Dominic Battre7d1c4842017-10-27 09:17:28 +02002658 # Extract bug number from branch name.
2659 bug = options.bug
2660 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2661 if not bug and match:
2662 bug = match.group(1)
2663
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002664 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002665 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002666 if self.GetIssue():
2667 # Try to get the message from a previous upload.
2668 message = self.GetDescription()
2669 if not message:
2670 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002671 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002672 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002673 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002674 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002675 # When uploading a subsequent patchset, -m|--message is taken
2676 # as the patchset title if --title was not provided.
2677 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002678 else:
2679 default_title = RunGit(
2680 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002681 if options.force:
2682 title = default_title
2683 else:
2684 title = ask_for_data(
2685 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002686 change_id = self._GetChangeDetail()['change_id']
2687 while True:
2688 footer_change_ids = git_footers.get_footer_change_id(message)
2689 if footer_change_ids == [change_id]:
2690 break
2691 if not footer_change_ids:
2692 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002693 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002694 continue
2695 # There is already a valid footer but with different or several ids.
2696 # Doing this automatically is non-trivial as we don't want to lose
2697 # existing other footers, yet we want to append just 1 desired
2698 # Change-Id. Thus, just create a new footer, but let user verify the
2699 # new description.
2700 message = '%s\n\nChange-Id: %s' % (message, change_id)
2701 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002702 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002703 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002704 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002705 'Please, check the proposed correction to the description, '
2706 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2707 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2708 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002709 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002710 if not options.force:
2711 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002712 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002713 message = change_desc.description
2714 if not message:
2715 DieWithError("Description is empty. Aborting...")
2716 # Continue the while loop.
2717 # Sanity check of this code - we should end up with proper message
2718 # footer.
2719 assert [change_id] == git_footers.get_footer_change_id(message)
2720 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002721 else: # if not self.GetIssue()
2722 if options.message:
2723 message = options.message
2724 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002725 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002726 if options.title:
2727 message = options.title + '\n\n' + message
2728 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002729
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002731 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002732 # On first upload, patchset title is always this string, while
2733 # --title flag gets converted to first line of message.
2734 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735 if not change_desc.description:
2736 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002737 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002738 if len(change_ids) > 1:
2739 DieWithError('too many Change-Id footers, at most 1 allowed.')
2740 if not change_ids:
2741 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002742 change_desc.set_description(git_footers.add_footer_change_id(
2743 change_desc.description,
2744 GenerateGerritChangeId(change_desc.description)))
2745 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 assert len(change_ids) == 1
2747 change_id = change_ids[0]
2748
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002749 if options.reviewers or options.tbrs or options.add_owners_to:
2750 change_desc.update_reviewers(options.reviewers, options.tbrs,
2751 options.add_owners_to, change)
2752
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002753 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002754 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2755 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002757 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2758 desc_tempfile.write(change_desc.description)
2759 desc_tempfile.close()
2760 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2761 '-F', desc_tempfile.name]).strip()
2762 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 else:
2764 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002765 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 if not change_desc.description:
2767 DieWithError("Description is empty. Aborting...")
2768
2769 if not git_footers.get_footer_change_id(change_desc.description):
2770 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002771 change_desc.set_description(
2772 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002773 if options.reviewers or options.tbrs or options.add_owners_to:
2774 change_desc.update_reviewers(options.reviewers, options.tbrs,
2775 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002777 # For no-squash mode, we assume the remote called "origin" is the one we
2778 # want. It is not worthwhile to support different workflows for
2779 # no-squash mode.
2780 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002781 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2782
2783 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002784 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002785 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2786 ref_to_push)]).splitlines()
2787 if len(commits) > 1:
2788 print('WARNING: This will upload %d commits. Run the following command '
2789 'to see which commits will be uploaded: ' % len(commits))
2790 print('git log %s..%s' % (parent, ref_to_push))
2791 print('You can also use `git squash-branch` to squash these into a '
2792 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002793 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002794
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002795 if options.reviewers or options.tbrs or options.add_owners_to:
2796 change_desc.update_reviewers(options.reviewers, options.tbrs,
2797 options.add_owners_to, change)
2798
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002799 reviewers = sorted(change_desc.get_reviewers())
2800 # Add cc's from the CC_LIST and --cc flag (if any).
2801 if not options.private and not options.no_autocc:
2802 cc = self.GetCCList().split(',')
2803 else:
2804 cc = []
2805 if options.cc:
2806 cc.extend(options.cc)
2807 cc = filter(None, [email.strip() for email in cc])
2808 if change_desc.get_cced():
2809 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002810 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2811 valid_accounts = set(reviewers + cc)
2812 # TODO(crbug/877717): relax this for all hosts.
2813 else:
2814 valid_accounts = gerrit_util.ValidAccounts(
2815 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002816 logging.info('accounts %s are recognized, %s invalid',
2817 sorted(valid_accounts),
2818 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002819
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002820 # Extra options that can be specified at push time. Doc:
2821 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002822 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002823
Aaron Gable844cf292017-06-28 11:32:59 -07002824 # By default, new changes are started in WIP mode, and subsequent patchsets
2825 # don't send email. At any time, passing --send-mail will mark the change
2826 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002827 if options.send_mail:
2828 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002829 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002830 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002831 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002832 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002833 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002834
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002835 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002836 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002837
Aaron Gable9b713dd2016-12-14 16:04:21 -08002838 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002839 # Punctuation and whitespace in |title| must be percent-encoded.
2840 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002841
agablec6787972016-09-09 16:13:34 -07002842 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002843 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002844
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002845 for r in sorted(reviewers):
2846 if r in valid_accounts:
2847 refspec_opts.append('r=%s' % r)
2848 reviewers.remove(r)
2849 else:
2850 # TODO(tandrii): this should probably be a hard failure.
2851 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2852 % r)
2853 for c in sorted(cc):
2854 # refspec option will be rejected if cc doesn't correspond to an
2855 # account, even though REST call to add such arbitrary cc may succeed.
2856 if c in valid_accounts:
2857 refspec_opts.append('cc=%s' % c)
2858 cc.remove(c)
2859
rmistry9eadede2016-09-19 11:22:43 -07002860 if options.topic:
2861 # Documentation on Gerrit topics is here:
2862 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002863 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002864
Edward Lemur687ca902018-12-05 02:30:30 +00002865 if options.enable_auto_submit:
2866 refspec_opts.append('l=Auto-Submit+1')
2867 if options.use_commit_queue:
2868 refspec_opts.append('l=Commit-Queue+2')
2869 elif options.cq_dry_run:
2870 refspec_opts.append('l=Commit-Queue+1')
2871
2872 if change_desc.get_reviewers(tbr_only=True):
2873 score = gerrit_util.GetCodeReviewTbrScore(
2874 self._GetGerritHost(),
2875 self._GetGerritProject())
2876 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002877
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002878 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002879 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002880 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002881 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002882 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2883
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002884 refspec_suffix = ''
2885 if refspec_opts:
2886 refspec_suffix = '%' + ','.join(refspec_opts)
2887 assert ' ' not in refspec_suffix, (
2888 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2889 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2890
Edward Lemur1b52d872019-05-09 21:12:12 +00002891 git_push_metadata = {
2892 'gerrit_host': self._GetGerritHost(),
2893 'title': title or '<untitled>',
2894 'change_id': change_id,
2895 'description': change_desc.description,
2896 }
2897 push_stdout = self._RunGitPushWithTraces(
2898 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899
2900 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002901 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902 change_numbers = [m.group(1)
2903 for m in map(regex.match, push_stdout.splitlines())
2904 if m]
2905 if len(change_numbers) != 1:
2906 DieWithError(
2907 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002908 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002909 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002910 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002911
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002912 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002913 # GetIssue() is not set in case of non-squash uploads according to tests.
2914 # TODO(agable): non-squash uploads in git cl should be removed.
2915 gerrit_util.AddReviewers(
2916 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002917 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002918 reviewers, cc,
2919 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002920
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002921 return 0
2922
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002923 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2924 change_desc):
2925 """Computes parent of the generated commit to be uploaded to Gerrit.
2926
2927 Returns revision or a ref name.
2928 """
2929 if custom_cl_base:
2930 # Try to avoid creating additional unintended CLs when uploading, unless
2931 # user wants to take this risk.
2932 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2933 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2934 local_ref_of_target_remote])
2935 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002936 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002937 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2938 'If you proceed with upload, more than 1 CL may be created by '
2939 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2940 'If you are certain that specified base `%s` has already been '
2941 'uploaded to Gerrit as another CL, you may proceed.\n' %
2942 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2943 if not force:
2944 confirm_or_exit(
2945 'Do you take responsibility for cleaning up potential mess '
2946 'resulting from proceeding with upload?',
2947 action='upload')
2948 return custom_cl_base
2949
Aaron Gablef97e33d2017-03-30 15:44:27 -07002950 if remote != '.':
2951 return self.GetCommonAncestorWithUpstream()
2952
2953 # If our upstream branch is local, we base our squashed commit on its
2954 # squashed version.
2955 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2956
Aaron Gablef97e33d2017-03-30 15:44:27 -07002957 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002958 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002959
2960 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002961 # TODO(tandrii): consider checking parent change in Gerrit and using its
2962 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2963 # the tree hash of the parent branch. The upside is less likely bogus
2964 # requests to reupload parent change just because it's uploadhash is
2965 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002966 parent = RunGit(['config',
2967 'branch.%s.gerritsquashhash' % upstream_branch_name],
2968 error_ok=True).strip()
2969 # Verify that the upstream branch has been uploaded too, otherwise
2970 # Gerrit will create additional CLs when uploading.
2971 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2972 RunGitSilent(['rev-parse', parent + ':'])):
2973 DieWithError(
2974 '\nUpload upstream branch %s first.\n'
2975 'It is likely that this branch has been rebased since its last '
2976 'upload, so you just need to upload it again.\n'
2977 '(If you uploaded it with --no-squash, then branch dependencies '
2978 'are not supported, and you should reupload with --squash.)'
2979 % upstream_branch_name,
2980 change_desc)
2981 return parent
2982
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002983 def _AddChangeIdToCommitMessage(self, options, args):
2984 """Re-commits using the current message, assumes the commit hook is in
2985 place.
2986 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002987 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002988 git_command = ['commit', '--amend', '-m', log_desc]
2989 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002990 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002991 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002992 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002993 return new_log_desc
2994 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002995 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002996
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002997 def SetCQState(self, new_state):
2998 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002999 vote_map = {
3000 _CQState.NONE: 0,
3001 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003002 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003003 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003004 labels = {'Commit-Queue': vote_map[new_state]}
3005 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003006 gerrit_util.SetReview(
3007 self._GetGerritHost(), self._GerritChangeIdentifier(),
3008 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003009
tandriie113dfd2016-10-11 10:20:12 -07003010 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003011 try:
3012 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003013 except GerritChangeNotExists:
3014 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003015
3016 if data['status'] in ('ABANDONED', 'MERGED'):
3017 return 'CL %s is closed' % self.GetIssue()
3018
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003019 def GetTryJobProperties(self, patchset=None):
3020 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003021 data = self._GetChangeDetail(['ALL_REVISIONS'])
3022 patchset = int(patchset or self.GetPatchset())
3023 assert patchset
3024 revision_data = None # Pylint wants it to be defined.
3025 for revision_data in data['revisions'].itervalues():
3026 if int(revision_data['_number']) == patchset:
3027 break
3028 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003029 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003030 (patchset, self.GetIssue()))
3031 return {
3032 'patch_issue': self.GetIssue(),
3033 'patch_set': patchset or self.GetPatchset(),
3034 'patch_project': data['project'],
3035 'patch_storage': 'gerrit',
3036 'patch_ref': revision_data['fetch']['http']['ref'],
3037 'patch_repository_url': revision_data['fetch']['http']['url'],
3038 'patch_gerrit_url': self.GetCodereviewServer(),
3039 }
tandriie113dfd2016-10-11 10:20:12 -07003040
tandriide281ae2016-10-12 06:02:30 -07003041 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003042 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003043
Edward Lemur707d70b2018-02-07 00:50:14 +01003044 def GetReviewers(self):
3045 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003046 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003047
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003048
3049_CODEREVIEW_IMPLEMENTATIONS = {
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003050 'gerrit': _GerritChangelistImpl,
3051}
3052
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003053
iannuccie53c9352016-08-17 14:40:40 -07003054def _add_codereview_issue_select_options(parser, extra=""):
3055 _add_codereview_select_options(parser)
3056
3057 text = ('Operate on this issue number instead of the current branch\'s '
3058 'implicit issue.')
3059 if extra:
3060 text += ' '+extra
3061 parser.add_option('-i', '--issue', type=int, help=text)
3062
3063
3064def _process_codereview_issue_select_options(parser, options):
3065 _process_codereview_select_options(parser, options)
3066 if options.issue is not None and not options.forced_codereview:
3067 parser.error('--issue must be specified with either --rietveld or --gerrit')
3068
3069
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003070def _add_codereview_select_options(parser):
3071 """Appends --gerrit and --rietveld options to force specific codereview."""
3072 parser.codereview_group = optparse.OptionGroup(
3073 parser, 'EXPERIMENTAL! Codereview override options')
3074 parser.add_option_group(parser.codereview_group)
3075 parser.codereview_group.add_option(
3076 '--gerrit', action='store_true',
3077 help='Force the use of Gerrit for codereview')
3078 parser.codereview_group.add_option(
3079 '--rietveld', action='store_true',
3080 help='Force the use of Rietveld for codereview')
3081
3082
3083def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003084 if options.rietveld:
3085 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003086 options.forced_codereview = None
3087 if options.gerrit:
3088 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003089
3090
tandriif9aefb72016-07-01 09:06:51 -07003091def _get_bug_line_values(default_project, bugs):
3092 """Given default_project and comma separated list of bugs, yields bug line
3093 values.
3094
3095 Each bug can be either:
3096 * a number, which is combined with default_project
3097 * string, which is left as is.
3098
3099 This function may produce more than one line, because bugdroid expects one
3100 project per line.
3101
3102 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3103 ['v8:123', 'chromium:789']
3104 """
3105 default_bugs = []
3106 others = []
3107 for bug in bugs.split(','):
3108 bug = bug.strip()
3109 if bug:
3110 try:
3111 default_bugs.append(int(bug))
3112 except ValueError:
3113 others.append(bug)
3114
3115 if default_bugs:
3116 default_bugs = ','.join(map(str, default_bugs))
3117 if default_project:
3118 yield '%s:%s' % (default_project, default_bugs)
3119 else:
3120 yield default_bugs
3121 for other in sorted(others):
3122 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3123 yield other
3124
3125
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003126class ChangeDescription(object):
3127 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003128 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003129 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003130 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003131 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003132 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3133 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3134 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3135 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003136
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003137 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003138 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003139
agable@chromium.org42c20792013-09-12 17:34:49 +00003140 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003141 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003142 return '\n'.join(self._description_lines)
3143
3144 def set_description(self, desc):
3145 if isinstance(desc, basestring):
3146 lines = desc.splitlines()
3147 else:
3148 lines = [line.rstrip() for line in desc]
3149 while lines and not lines[0]:
3150 lines.pop(0)
3151 while lines and not lines[-1]:
3152 lines.pop(-1)
3153 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003154
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003155 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3156 """Rewrites the R=/TBR= line(s) as a single line each.
3157
3158 Args:
3159 reviewers (list(str)) - list of additional emails to use for reviewers.
3160 tbrs (list(str)) - list of additional emails to use for TBRs.
3161 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3162 the change that are missing OWNER coverage. If this is not None, you
3163 must also pass a value for `change`.
3164 change (Change) - The Change that should be used for OWNERS lookups.
3165 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003166 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003167 assert isinstance(tbrs, list), tbrs
3168
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003169 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003170 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003171
3172 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003173 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003174
3175 reviewers = set(reviewers)
3176 tbrs = set(tbrs)
3177 LOOKUP = {
3178 'TBR': tbrs,
3179 'R': reviewers,
3180 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003181
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003182 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003183 regexp = re.compile(self.R_LINE)
3184 matches = [regexp.match(line) for line in self._description_lines]
3185 new_desc = [l for i, l in enumerate(self._description_lines)
3186 if not matches[i]]
3187 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003188
agable@chromium.org42c20792013-09-12 17:34:49 +00003189 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003190
3191 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003192 for match in matches:
3193 if not match:
3194 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003195 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3196
3197 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003198 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003199 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003200 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003201 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003202 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003203 LOOKUP[add_owners_to].update(
3204 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003205
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206 # If any folks ended up in both groups, remove them from tbrs.
3207 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003208
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003209 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3210 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003211
3212 # Put the new lines in the description where the old first R= line was.
3213 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3214 if 0 <= line_loc < len(self._description_lines):
3215 if new_tbr_line:
3216 self._description_lines.insert(line_loc, new_tbr_line)
3217 if new_r_line:
3218 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003219 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003220 if new_r_line:
3221 self.append_footer(new_r_line)
3222 if new_tbr_line:
3223 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003224
Aaron Gable3a16ed12017-03-23 10:51:55 -07003225 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003226 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003227 self.set_description([
3228 '# Enter a description of the change.',
3229 '# This will be displayed on the codereview site.',
3230 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003231 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003232 '--------------------',
3233 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234
agable@chromium.org42c20792013-09-12 17:34:49 +00003235 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003236 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003238 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003239 if git_footer:
3240 self.append_footer('Bug: %s' % ', '.join(values))
3241 else:
3242 for value in values:
3243 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003244
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003246 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003247 if not content:
3248 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003249 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003250
Bruce Dawson2377b012018-01-11 16:46:49 -08003251 # Strip off comments and default inserted "Bug:" line.
3252 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003253 (line.startswith('#') or
3254 line.rstrip() == "Bug:" or
3255 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003256 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003257 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003258 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003259
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003260 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003261 """Adds a footer line to the description.
3262
3263 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3264 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3265 that Gerrit footers are always at the end.
3266 """
3267 parsed_footer_line = git_footers.parse_footer(line)
3268 if parsed_footer_line:
3269 # Line is a gerrit footer in the form: Footer-Key: any value.
3270 # Thus, must be appended observing Gerrit footer rules.
3271 self.set_description(
3272 git_footers.add_footer(self.description,
3273 key=parsed_footer_line[0],
3274 value=parsed_footer_line[1]))
3275 return
3276
3277 if not self._description_lines:
3278 self._description_lines.append(line)
3279 return
3280
3281 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3282 if gerrit_footers:
3283 # git_footers.split_footers ensures that there is an empty line before
3284 # actual (gerrit) footers, if any. We have to keep it that way.
3285 assert top_lines and top_lines[-1] == ''
3286 top_lines, separator = top_lines[:-1], top_lines[-1:]
3287 else:
3288 separator = [] # No need for separator if there are no gerrit_footers.
3289
3290 prev_line = top_lines[-1] if top_lines else ''
3291 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3292 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3293 top_lines.append('')
3294 top_lines.append(line)
3295 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003296
tandrii99a72f22016-08-17 14:33:24 -07003297 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003298 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003299 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003300 reviewers = [match.group(2).strip()
3301 for match in matches
3302 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003303 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003304
bradnelsond975b302016-10-23 12:20:23 -07003305 def get_cced(self):
3306 """Retrieves the list of reviewers."""
3307 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3308 cced = [match.group(2).strip() for match in matches if match]
3309 return cleanup_list(cced)
3310
Nodir Turakulov23b82142017-11-16 11:04:25 -08003311 def get_hash_tags(self):
3312 """Extracts and sanitizes a list of Gerrit hashtags."""
3313 subject = (self._description_lines or ('',))[0]
3314 subject = re.sub(
3315 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3316
3317 tags = []
3318 start = 0
3319 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3320 while True:
3321 m = bracket_exp.match(subject, start)
3322 if not m:
3323 break
3324 tags.append(self.sanitize_hash_tag(m.group(1)))
3325 start = m.end()
3326
3327 if not tags:
3328 # Try "Tag: " prefix.
3329 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3330 if m:
3331 tags.append(self.sanitize_hash_tag(m.group(1)))
3332 return tags
3333
3334 @classmethod
3335 def sanitize_hash_tag(cls, tag):
3336 """Returns a sanitized Gerrit hash tag.
3337
3338 A sanitized hashtag can be used as a git push refspec parameter value.
3339 """
3340 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3341
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003342 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3343 """Updates this commit description given the parent.
3344
3345 This is essentially what Gnumbd used to do.
3346 Consult https://goo.gl/WMmpDe for more details.
3347 """
3348 assert parent_msg # No, orphan branch creation isn't supported.
3349 assert parent_hash
3350 assert dest_ref
3351 parent_footer_map = git_footers.parse_footers(parent_msg)
3352 # This will also happily parse svn-position, which GnumbD is no longer
3353 # supporting. While we'd generate correct footers, the verifier plugin
3354 # installed in Gerrit will block such commit (ie git push below will fail).
3355 parent_position = git_footers.get_position(parent_footer_map)
3356
3357 # Cherry-picks may have last line obscuring their prior footers,
3358 # from git_footers perspective. This is also what Gnumbd did.
3359 cp_line = None
3360 if (self._description_lines and
3361 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3362 cp_line = self._description_lines.pop()
3363
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003364 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003365
3366 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3367 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003368 for i, line in enumerate(footer_lines):
3369 k, v = git_footers.parse_footer(line) or (None, None)
3370 if k and k.startswith('Cr-'):
3371 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003372
3373 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003374 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003375 if parent_position[0] == dest_ref:
3376 # Same branch as parent.
3377 number = int(parent_position[1]) + 1
3378 else:
3379 number = 1 # New branch, and extra lineage.
3380 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3381 int(parent_position[1])))
3382
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003383 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3384 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003385
3386 self._description_lines = top_lines
3387 if cp_line:
3388 self._description_lines.append(cp_line)
3389 if self._description_lines[-1] != '':
3390 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003391 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003392
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003393
Aaron Gablea1bab272017-04-11 16:38:18 -07003394def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003395 """Retrieves the reviewers that approved a CL from the issue properties with
3396 messages.
3397
3398 Note that the list may contain reviewers that are not committer, thus are not
3399 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003400
3401 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003402 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003403 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003404 return sorted(
3405 set(
3406 message['sender']
3407 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003408 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003409 )
3410 )
3411
3412
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003413def FindCodereviewSettingsFile(filename='codereview.settings'):
3414 """Finds the given file starting in the cwd and going up.
3415
3416 Only looks up to the top of the repository unless an
3417 'inherit-review-settings-ok' file exists in the root of the repository.
3418 """
3419 inherit_ok_file = 'inherit-review-settings-ok'
3420 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003421 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003422 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3423 root = '/'
3424 while True:
3425 if filename in os.listdir(cwd):
3426 if os.path.isfile(os.path.join(cwd, filename)):
3427 return open(os.path.join(cwd, filename))
3428 if cwd == root:
3429 break
3430 cwd = os.path.dirname(cwd)
3431
3432
3433def LoadCodereviewSettingsFromFile(fileobj):
3434 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003435 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003436
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003437 def SetProperty(name, setting, unset_error_ok=False):
3438 fullname = 'rietveld.' + name
3439 if setting in keyvals:
3440 RunGit(['config', fullname, keyvals[setting]])
3441 else:
3442 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3443
tandrii48df5812016-10-17 03:55:37 -07003444 if not keyvals.get('GERRIT_HOST', False):
3445 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003446 # Only server setting is required. Other settings can be absent.
3447 # In that case, we ignore errors raised during option deletion attempt.
3448 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3449 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3450 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003451 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003452 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3453 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003454 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3455 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003457 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003458 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003459
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003460 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003461 RunGit(['config', 'gerrit.squash-uploads',
3462 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003463
tandrii@chromium.org28253532016-04-14 13:46:56 +00003464 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003465 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003466 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3467
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003468 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003469 # should be of the form
3470 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3471 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003472 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3473 keyvals['ORIGIN_URL_CONFIG']])
3474
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003475
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003476def urlretrieve(source, destination):
3477 """urllib is broken for SSL connections via a proxy therefore we
3478 can't use urllib.urlretrieve()."""
3479 with open(destination, 'w') as f:
3480 f.write(urllib2.urlopen(source).read())
3481
3482
ukai@chromium.org712d6102013-11-27 00:52:58 +00003483def hasSheBang(fname):
3484 """Checks fname is a #! script."""
3485 with open(fname) as f:
3486 return f.read(2).startswith('#!')
3487
3488
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003489# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3490def DownloadHooks(*args, **kwargs):
3491 pass
3492
3493
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003494def DownloadGerritHook(force):
3495 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003496
3497 Args:
3498 force: True to update hooks. False to install hooks if not present.
3499 """
3500 if not settings.GetIsGerrit():
3501 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003502 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003503 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3504 if not os.access(dst, os.X_OK):
3505 if os.path.exists(dst):
3506 if not force:
3507 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003508 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003509 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003510 if not hasSheBang(dst):
3511 DieWithError('Not a script: %s\n'
3512 'You need to download from\n%s\n'
3513 'into .git/hooks/commit-msg and '
3514 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003515 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3516 except Exception:
3517 if os.path.exists(dst):
3518 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003519 DieWithError('\nFailed to download hooks.\n'
3520 'You need to download from\n%s\n'
3521 'into .git/hooks/commit-msg and '
3522 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003523
3524
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003525class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003526 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003527
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003528 _GOOGLESOURCE = 'googlesource.com'
3529
3530 def __init__(self):
3531 # Cached list of [host, identity, source], where source is either
3532 # .gitcookies or .netrc.
3533 self._all_hosts = None
3534
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003535 def ensure_configured_gitcookies(self):
3536 """Runs checks and suggests fixes to make git use .gitcookies from default
3537 path."""
3538 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3539 configured_path = RunGitSilent(
3540 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003541 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003542 if configured_path:
3543 self._ensure_default_gitcookies_path(configured_path, default)
3544 else:
3545 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003546
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003547 @staticmethod
3548 def _ensure_default_gitcookies_path(configured_path, default_path):
3549 assert configured_path
3550 if configured_path == default_path:
3551 print('git is already configured to use your .gitcookies from %s' %
3552 configured_path)
3553 return
3554
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003555 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003556 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3557 (configured_path, default_path))
3558
3559 if not os.path.exists(configured_path):
3560 print('However, your configured .gitcookies file is missing.')
3561 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3562 action='reconfigure')
3563 RunGit(['config', '--global', 'http.cookiefile', default_path])
3564 return
3565
3566 if os.path.exists(default_path):
3567 print('WARNING: default .gitcookies file already exists %s' %
3568 default_path)
3569 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3570 default_path)
3571
3572 confirm_or_exit('Move existing .gitcookies to default location?',
3573 action='move')
3574 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003575 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003576 print('Moved and reconfigured git to use .gitcookies from %s' %
3577 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003578
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003579 @staticmethod
3580 def _configure_gitcookies_path(default_path):
3581 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3582 if os.path.exists(netrc_path):
3583 print('You seem to be using outdated .netrc for git credentials: %s' %
3584 netrc_path)
3585 print('This tool will guide you through setting up recommended '
3586 '.gitcookies store for git credentials.\n'
3587 '\n'
3588 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3589 ' git config --global --unset http.cookiefile\n'
3590 ' mv %s %s.backup\n\n' % (default_path, default_path))
3591 confirm_or_exit(action='setup .gitcookies')
3592 RunGit(['config', '--global', 'http.cookiefile', default_path])
3593 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003594
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003595 def get_hosts_with_creds(self, include_netrc=False):
3596 if self._all_hosts is None:
3597 a = gerrit_util.CookiesAuthenticator()
3598 self._all_hosts = [
3599 (h, u, s)
3600 for h, u, s in itertools.chain(
3601 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3602 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3603 )
3604 if h.endswith(self._GOOGLESOURCE)
3605 ]
3606
3607 if include_netrc:
3608 return self._all_hosts
3609 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3610
3611 def print_current_creds(self, include_netrc=False):
3612 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3613 if not hosts:
3614 print('No Git/Gerrit credentials found')
3615 return
3616 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3617 header = [('Host', 'User', 'Which file'),
3618 ['=' * l for l in lengths]]
3619 for row in (header + hosts):
3620 print('\t'.join((('%%+%ds' % l) % s)
3621 for l, s in zip(lengths, row)))
3622
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003623 @staticmethod
3624 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003625 """Parses identity "git-<username>.domain" into <username> and domain."""
3626 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003627 # distinguishable from sub-domains. But we do know typical domains:
3628 if identity.endswith('.chromium.org'):
3629 domain = 'chromium.org'
3630 username = identity[:-len('.chromium.org')]
3631 else:
3632 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003633 if username.startswith('git-'):
3634 username = username[len('git-'):]
3635 return username, domain
3636
3637 def _get_usernames_of_domain(self, domain):
3638 """Returns list of usernames referenced by .gitcookies in a given domain."""
3639 identities_by_domain = {}
3640 for _, identity, _ in self.get_hosts_with_creds():
3641 username, domain = self._parse_identity(identity)
3642 identities_by_domain.setdefault(domain, []).append(username)
3643 return identities_by_domain.get(domain)
3644
3645 def _canonical_git_googlesource_host(self, host):
3646 """Normalizes Gerrit hosts (with '-review') to Git host."""
3647 assert host.endswith(self._GOOGLESOURCE)
3648 # Prefix doesn't include '.' at the end.
3649 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3650 if prefix.endswith('-review'):
3651 prefix = prefix[:-len('-review')]
3652 return prefix + '.' + self._GOOGLESOURCE
3653
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003654 def _canonical_gerrit_googlesource_host(self, host):
3655 git_host = self._canonical_git_googlesource_host(host)
3656 prefix = git_host.split('.', 1)[0]
3657 return prefix + '-review.' + self._GOOGLESOURCE
3658
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 def _get_counterpart_host(self, host):
3660 assert host.endswith(self._GOOGLESOURCE)
3661 git = self._canonical_git_googlesource_host(host)
3662 gerrit = self._canonical_gerrit_googlesource_host(git)
3663 return git if gerrit == host else gerrit
3664
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003665 def has_generic_host(self):
3666 """Returns whether generic .googlesource.com has been configured.
3667
3668 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3669 """
3670 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3671 if host == '.' + self._GOOGLESOURCE:
3672 return True
3673 return False
3674
3675 def _get_git_gerrit_identity_pairs(self):
3676 """Returns map from canonic host to pair of identities (Git, Gerrit).
3677
3678 One of identities might be None, meaning not configured.
3679 """
3680 host_to_identity_pairs = {}
3681 for host, identity, _ in self.get_hosts_with_creds():
3682 canonical = self._canonical_git_googlesource_host(host)
3683 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3684 idx = 0 if canonical == host else 1
3685 pair[idx] = identity
3686 return host_to_identity_pairs
3687
3688 def get_partially_configured_hosts(self):
3689 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003690 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3691 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3692 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003693
3694 def get_conflicting_hosts(self):
3695 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003696 host
3697 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003698 if None not in (i1, i2) and i1 != i2)
3699
3700 def get_duplicated_hosts(self):
3701 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3702 return set(host for host, count in counters.iteritems() if count > 1)
3703
3704 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3705 'chromium.googlesource.com': 'chromium.org',
3706 'chrome-internal.googlesource.com': 'google.com',
3707 }
3708
3709 def get_hosts_with_wrong_identities(self):
3710 """Finds hosts which **likely** reference wrong identities.
3711
3712 Note: skips hosts which have conflicting identities for Git and Gerrit.
3713 """
3714 hosts = set()
3715 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3716 pair = self._get_git_gerrit_identity_pairs().get(host)
3717 if pair and pair[0] == pair[1]:
3718 _, domain = self._parse_identity(pair[0])
3719 if domain != expected:
3720 hosts.add(host)
3721 return hosts
3722
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003723 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003724 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003725 hosts = sorted(hosts)
3726 assert hosts
3727 if extra_column_func is None:
3728 extras = [''] * len(hosts)
3729 else:
3730 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003731 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3732 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003733 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003734 lines.append(tmpl % he)
3735 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003736
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003737 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003738 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003739 yield ('.googlesource.com wildcard record detected',
3740 ['Chrome Infrastructure team recommends to list full host names '
3741 'explicitly.'],
3742 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003743
3744 dups = self.get_duplicated_hosts()
3745 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003746 yield ('The following hosts were defined twice',
3747 self._format_hosts(dups),
3748 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003749
3750 partial = self.get_partially_configured_hosts()
3751 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003752 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3753 'These hosts are missing',
3754 self._format_hosts(partial, lambda host: 'but %s defined' %
3755 self._get_counterpart_host(host)),
3756 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003757
3758 conflicting = self.get_conflicting_hosts()
3759 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003760 yield ('The following Git hosts have differing credentials from their '
3761 'Gerrit counterparts',
3762 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3763 tuple(self._get_git_gerrit_identity_pairs()[host])),
3764 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003765
3766 wrong = self.get_hosts_with_wrong_identities()
3767 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003768 yield ('These hosts likely use wrong identity',
3769 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3770 (self._get_git_gerrit_identity_pairs()[host][0],
3771 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3772 wrong)
3773
3774 def find_and_report_problems(self):
3775 """Returns True if there was at least one problem, else False."""
3776 found = False
3777 bad_hosts = set()
3778 for title, sublines, hosts in self._find_problems():
3779 if not found:
3780 found = True
3781 print('\n\n.gitcookies problem report:\n')
3782 bad_hosts.update(hosts or [])
3783 print(' %s%s' % (title , (':' if sublines else '')))
3784 if sublines:
3785 print()
3786 print(' %s' % '\n '.join(sublines))
3787 print()
3788
3789 if bad_hosts:
3790 assert found
3791 print(' You can manually remove corresponding lines in your %s file and '
3792 'visit the following URLs with correct account to generate '
3793 'correct credential lines:\n' %
3794 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3795 print(' %s' % '\n '.join(sorted(set(
3796 gerrit_util.CookiesAuthenticator().get_new_password_url(
3797 self._canonical_git_googlesource_host(host))
3798 for host in bad_hosts
3799 ))))
3800 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003801
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003802
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003803@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003804def CMDcreds_check(parser, args):
3805 """Checks credentials and suggests changes."""
3806 _, _ = parser.parse_args(args)
3807
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003808 # Code below checks .gitcookies. Abort if using something else.
3809 authn = gerrit_util.Authenticator.get()
3810 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3811 if isinstance(authn, gerrit_util.GceAuthenticator):
3812 DieWithError(
3813 'This command is not designed for GCE, are you on a bot?\n'
3814 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3815 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003816 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003817 'This command is not designed for bot environment. It checks '
3818 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003819
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003820 checker = _GitCookiesChecker()
3821 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003822
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003823 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003824 checker.print_current_creds(include_netrc=True)
3825
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003826 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003827 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003828 return 0
3829 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003830
3831
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003832@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003833def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003834 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003835 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3836 branch = ShortBranchName(branchref)
3837 _, args = parser.parse_args(args)
3838 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003839 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003840 return RunGit(['config', 'branch.%s.base-url' % branch],
3841 error_ok=False).strip()
3842 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003844 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3845 error_ok=False).strip()
3846
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003847def color_for_status(status):
3848 """Maps a Changelist status to color, for CMDstatus and other tools."""
3849 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003850 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003851 'waiting': Fore.BLUE,
3852 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003853 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003854 'lgtm': Fore.GREEN,
3855 'commit': Fore.MAGENTA,
3856 'closed': Fore.CYAN,
3857 'error': Fore.WHITE,
3858 }.get(status, Fore.WHITE)
3859
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003860
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003861def get_cl_statuses(changes, fine_grained, max_processes=None):
3862 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003863
3864 If fine_grained is true, this will fetch CL statuses from the server.
3865 Otherwise, simply indicate if there's a matching url for the given branches.
3866
3867 If max_processes is specified, it is used as the maximum number of processes
3868 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3869 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003870
3871 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003872 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003873 if not changes:
3874 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003875
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003876 if not fine_grained:
3877 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003878 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003879 for cl in changes:
3880 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003881 return
3882
3883 # First, sort out authentication issues.
3884 logging.debug('ensuring credentials exist')
3885 for cl in changes:
3886 cl.EnsureAuthenticated(force=False, refresh=True)
3887
3888 def fetch(cl):
3889 try:
3890 return (cl, cl.GetStatus())
3891 except:
3892 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003893 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003894 raise
3895
3896 threads_count = len(changes)
3897 if max_processes:
3898 threads_count = max(1, min(threads_count, max_processes))
3899 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3900
3901 pool = ThreadPool(threads_count)
3902 fetched_cls = set()
3903 try:
3904 it = pool.imap_unordered(fetch, changes).__iter__()
3905 while True:
3906 try:
3907 cl, status = it.next(timeout=5)
3908 except multiprocessing.TimeoutError:
3909 break
3910 fetched_cls.add(cl)
3911 yield cl, status
3912 finally:
3913 pool.close()
3914
3915 # Add any branches that failed to fetch.
3916 for cl in set(changes) - fetched_cls:
3917 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003918
rmistry@google.com2dd99862015-06-22 12:22:18 +00003919
3920def upload_branch_deps(cl, args):
3921 """Uploads CLs of local branches that are dependents of the current branch.
3922
3923 If the local branch dependency tree looks like:
3924 test1 -> test2.1 -> test3.1
3925 -> test3.2
3926 -> test2.2 -> test3.3
3927
3928 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3929 run on the dependent branches in this order:
3930 test2.1, test3.1, test3.2, test2.2, test3.3
3931
3932 Note: This function does not rebase your local dependent branches. Use it when
3933 you make a change to the parent branch that will not conflict with its
3934 dependent branches, and you would like their dependencies updated in
3935 Rietveld.
3936 """
3937 if git_common.is_dirty_git_tree('upload-branch-deps'):
3938 return 1
3939
3940 root_branch = cl.GetBranch()
3941 if root_branch is None:
3942 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3943 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003944 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003945 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3946 'patchset dependencies without an uploaded CL.')
3947
3948 branches = RunGit(['for-each-ref',
3949 '--format=%(refname:short) %(upstream:short)',
3950 'refs/heads'])
3951 if not branches:
3952 print('No local branches found.')
3953 return 0
3954
3955 # Create a dictionary of all local branches to the branches that are dependent
3956 # on it.
3957 tracked_to_dependents = collections.defaultdict(list)
3958 for b in branches.splitlines():
3959 tokens = b.split()
3960 if len(tokens) == 2:
3961 branch_name, tracked = tokens
3962 tracked_to_dependents[tracked].append(branch_name)
3963
vapiera7fbd5a2016-06-16 09:17:49 -07003964 print()
3965 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003966 dependents = []
3967 def traverse_dependents_preorder(branch, padding=''):
3968 dependents_to_process = tracked_to_dependents.get(branch, [])
3969 padding += ' '
3970 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003971 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003972 dependents.append(dependent)
3973 traverse_dependents_preorder(dependent, padding)
3974 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003975 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003976
3977 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003978 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003979 return 0
3980
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003981 confirm_or_exit('This command will checkout all dependent branches and run '
3982 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003983
rmistry@google.com2dd99862015-06-22 12:22:18 +00003984 # Record all dependents that failed to upload.
3985 failures = {}
3986 # Go through all dependents, checkout the branch and upload.
3987 try:
3988 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print()
3990 print('--------------------------------------')
3991 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003992 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003993 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003994 try:
3995 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003996 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003997 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003998 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003999 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004000 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004001 finally:
4002 # Swap back to the original root branch.
4003 RunGit(['checkout', '-q', root_branch])
4004
vapiera7fbd5a2016-06-16 09:17:49 -07004005 print()
4006 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004007 for dependent_branch in dependents:
4008 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004009 print(' %s : %s' % (dependent_branch, upload_status))
4010 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004011
4012 return 0
4013
4014
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004015@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004016def CMDarchive(parser, args):
4017 """Archives and deletes branches associated with closed changelists."""
4018 parser.add_option(
4019 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004020 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004021 parser.add_option(
4022 '-f', '--force', action='store_true',
4023 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004024 parser.add_option(
4025 '-d', '--dry-run', action='store_true',
4026 help='Skip the branch tagging and removal steps.')
4027 parser.add_option(
4028 '-t', '--notags', action='store_true',
4029 help='Do not tag archived branches. '
4030 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004031
4032 auth.add_auth_options(parser)
4033 options, args = parser.parse_args(args)
4034 if args:
4035 parser.error('Unsupported args: %s' % ' '.join(args))
4036 auth_config = auth.extract_auth_config_from_options(options)
4037
4038 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4039 if not branches:
4040 return 0
4041
vapiera7fbd5a2016-06-16 09:17:49 -07004042 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004043 changes = [Changelist(branchref=b, auth_config=auth_config)
4044 for b in branches.splitlines()]
4045 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4046 statuses = get_cl_statuses(changes,
4047 fine_grained=True,
4048 max_processes=options.maxjobs)
4049 proposal = [(cl.GetBranch(),
4050 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4051 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004052 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004053 proposal.sort()
4054
4055 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004056 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004057 return 0
4058
4059 current_branch = GetCurrentBranch()
4060
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004062 if options.notags:
4063 for next_item in proposal:
4064 print(' ' + next_item[0])
4065 else:
4066 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4067 for next_item in proposal:
4068 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004069
kmarshall9249e012016-08-23 12:02:16 -07004070 # Quit now on precondition failure or if instructed by the user, either
4071 # via an interactive prompt or by command line flags.
4072 if options.dry_run:
4073 print('\nNo changes were made (dry run).\n')
4074 return 0
4075 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004076 print('You are currently on a branch \'%s\' which is associated with a '
4077 'closed codereview issue, so archive cannot proceed. Please '
4078 'checkout another branch and run this command again.' %
4079 current_branch)
4080 return 1
kmarshall9249e012016-08-23 12:02:16 -07004081 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004082 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4083 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004084 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004085 return 1
4086
4087 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004088 if not options.notags:
4089 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004090 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004091
vapiera7fbd5a2016-06-16 09:17:49 -07004092 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004093
4094 return 0
4095
4096
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004097@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004098def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004099 """Show status of changelists.
4100
4101 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004102 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004103 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004104 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004105 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004106 - Magenta in the commit queue
4107 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004108 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004109
4110 Also see 'git cl comments'.
4111 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004112 parser.add_option(
4113 '--no-branch-color',
4114 action='store_true',
4115 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004116 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004117 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004118 parser.add_option('-f', '--fast', action='store_true',
4119 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004120 parser.add_option(
4121 '-j', '--maxjobs', action='store', type=int,
4122 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004123
4124 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004125 _add_codereview_issue_select_options(
4126 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004127 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004128 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004129 if args:
4130 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004131 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004132
iannuccie53c9352016-08-17 14:40:40 -07004133 if options.issue is not None and not options.field:
4134 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004135
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004136 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004137 cl = Changelist(auth_config=auth_config, issue=options.issue,
4138 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004139 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004140 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004141 elif options.field == 'id':
4142 issueid = cl.GetIssue()
4143 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004144 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004145 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004146 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004147 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004148 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004149 elif options.field == 'status':
4150 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004151 elif options.field == 'url':
4152 url = cl.GetIssueURL()
4153 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004155 return 0
4156
4157 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4158 if not branches:
4159 print('No local branch found.')
4160 return 0
4161
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004162 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004163 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004164 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004165 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004166 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004167 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004168 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004169
Daniel McArdlea23bf592019-02-12 00:25:12 +00004170 current_branch = GetCurrentBranch()
4171
4172 def FormatBranchName(branch, colorize=False):
4173 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4174 an asterisk when it is the current branch."""
4175
4176 asterisk = ""
4177 color = Fore.RESET
4178 if branch == current_branch:
4179 asterisk = "* "
4180 color = Fore.GREEN
4181 branch_name = ShortBranchName(branch)
4182
4183 if colorize:
4184 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004185 return asterisk + branch_name
4186
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004187 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004188
4189 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004190 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4191 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004192 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004193 c, status = output.next()
4194 branch_statuses[c.GetBranch()] = status
4195 status = branch_statuses.pop(branch)
4196 url = cl.GetIssueURL()
4197 if url and (not status or status == 'error'):
4198 # The issue probably doesn't exist anymore.
4199 url += ' (broken)'
4200
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004201 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004202 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004203 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004204 color = ''
4205 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004206 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004207
Alan Cuttera3be9a52019-03-04 18:50:33 +00004208 branch_display = FormatBranchName(branch)
4209 padding = ' ' * (alignment - len(branch_display))
4210 if not options.no_branch_color:
4211 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004212
Alan Cuttera3be9a52019-03-04 18:50:33 +00004213 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4214 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004215
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004217 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004218 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004219 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004220 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004221 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004223 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004224 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004225 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004226 print('Issue description:')
4227 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004228 return 0
4229
4230
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004231def colorize_CMDstatus_doc():
4232 """To be called once in main() to add colors to git cl status help."""
4233 colors = [i for i in dir(Fore) if i[0].isupper()]
4234
4235 def colorize_line(line):
4236 for color in colors:
4237 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004238 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004239 indent = len(line) - len(line.lstrip(' ')) + 1
4240 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4241 return line
4242
4243 lines = CMDstatus.__doc__.splitlines()
4244 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4245
4246
phajdan.jre328cf92016-08-22 04:12:17 -07004247def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004248 if path == '-':
4249 json.dump(contents, sys.stdout)
4250 else:
4251 with open(path, 'w') as f:
4252 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004253
4254
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004255@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004256@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004257def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004258 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004259
4260 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004261 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004262 parser.add_option('-r', '--reverse', action='store_true',
4263 help='Lookup the branch(es) for the specified issues. If '
4264 'no issues are specified, all branches with mapped '
4265 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004266 parser.add_option('--json',
4267 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004268 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004269 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004270 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004271
dnj@chromium.org406c4402015-03-03 17:22:28 +00004272 if options.reverse:
4273 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004274 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004275 # Reverse issue lookup.
4276 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004277
4278 git_config = {}
4279 for config in RunGit(['config', '--get-regexp',
4280 r'branch\..*issue']).splitlines():
4281 name, _space, val = config.partition(' ')
4282 git_config[name] = val
4283
dnj@chromium.org406c4402015-03-03 17:22:28 +00004284 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004285 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4286 config_key = _git_branch_config_key(ShortBranchName(branch),
4287 cls.IssueConfigKey())
4288 issue = git_config.get(config_key)
4289 if issue:
4290 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004291 if not args:
4292 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004293 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004294 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004295 try:
4296 issue_num = int(issue)
4297 except ValueError:
4298 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004299 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004300 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004301 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004302 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004303 if options.json:
4304 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004305 return 0
4306
4307 if len(args) > 0:
4308 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4309 if not issue.valid:
4310 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4311 'or no argument to list it.\n'
4312 'Maybe you want to run git cl status?')
4313 cl = Changelist(codereview=issue.codereview)
4314 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004315 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004316 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004317 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4318 if options.json:
4319 write_json(options.json, {
4320 'issue': cl.GetIssue(),
4321 'issue_url': cl.GetIssueURL(),
4322 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323 return 0
4324
4325
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004326@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004327def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004328 """Shows or posts review comments for any changelist."""
4329 parser.add_option('-a', '--add-comment', dest='comment',
4330 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004331 parser.add_option('-p', '--publish', action='store_true',
4332 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004333 parser.add_option('-i', '--issue', dest='issue',
4334 help='review issue id (defaults to current issue). '
4335 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004336 parser.add_option('-m', '--machine-readable', dest='readable',
4337 action='store_false', default=True,
4338 help='output comments in a format compatible with '
4339 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004340 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004341 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004342 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004343 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004344 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004345 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004346 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004347
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004348 issue = None
4349 if options.issue:
4350 try:
4351 issue = int(options.issue)
4352 except ValueError:
4353 DieWithError('A review issue id is expected to be a number')
4354
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004355 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4356
4357 if not cl.IsGerrit():
4358 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004359
4360 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004361 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004362 return 0
4363
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004364 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4365 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004366 for comment in summary:
4367 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004368 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004369 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004370 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004371 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004372 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004373 elif comment.autogenerated:
4374 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004375 else:
4376 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004377 print('\n%s%s %s%s\n%s' % (
4378 color,
4379 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4380 comment.sender,
4381 Fore.RESET,
4382 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4383
smut@google.comc85ac942015-09-15 16:34:43 +00004384 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004385 def pre_serialize(c):
4386 dct = c.__dict__.copy()
4387 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4388 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004389 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004390 return 0
4391
4392
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004393@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004394@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004395def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004396 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004397 parser.add_option('-d', '--display', action='store_true',
4398 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004399 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004400 help='New description to set for this issue (- for stdin, '
4401 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004402 parser.add_option('-f', '--force', action='store_true',
4403 help='Delete any unpublished Gerrit edits for this issue '
4404 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004405
4406 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004407 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004408 options, args = parser.parse_args(args)
4409 _process_codereview_select_options(parser, options)
4410
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004411 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004412 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004413 target_issue_arg = ParseIssueNumberArgument(args[0],
4414 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004415 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004416 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004417
martiniss6eda05f2016-06-30 10:18:35 -07004418 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004419 'auth_config': auth.extract_auth_config_from_options(options),
4420 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004421 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004422 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004423 if target_issue_arg:
4424 kwargs['issue'] = target_issue_arg.issue
4425 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004426 if target_issue_arg.codereview and not options.forced_codereview:
4427 detected_codereview_from_url = True
4428 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004429
4430 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004431 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004432 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004433 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004434
4435 if detected_codereview_from_url:
4436 logging.info('canonical issue/change URL: %s (type: %s)\n',
4437 cl.GetIssueURL(), target_issue_arg.codereview)
4438
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004439 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004440
smut@google.com34fb6b12015-07-13 20:03:26 +00004441 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004442 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004443 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004444
4445 if options.new_description:
4446 text = options.new_description
4447 if text == '-':
4448 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004449 elif text == '+':
4450 base_branch = cl.GetCommonAncestorWithUpstream()
4451 change = cl.GetChange(base_branch, None, local_description=True)
4452 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004453
4454 description.set_description(text)
4455 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004456 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004457
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004458 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004459 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004460 return 0
4461
4462
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004463@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004464def CMDlint(parser, args):
4465 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004466 parser.add_option('--filter', action='append', metavar='-x,+y',
4467 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004468 auth.add_auth_options(parser)
4469 options, args = parser.parse_args(args)
4470 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004471
4472 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004473 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004474 try:
4475 import cpplint
4476 import cpplint_chromium
4477 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004478 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004479 return 1
4480
4481 # Change the current working directory before calling lint so that it
4482 # shows the correct base.
4483 previous_cwd = os.getcwd()
4484 os.chdir(settings.GetRoot())
4485 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004486 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004487 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4488 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004489 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004490 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004491 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004492
4493 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004494 command = args + files
4495 if options.filter:
4496 command = ['--filter=' + ','.join(options.filter)] + command
4497 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004498
4499 white_regex = re.compile(settings.GetLintRegex())
4500 black_regex = re.compile(settings.GetLintIgnoreRegex())
4501 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4502 for filename in filenames:
4503 if white_regex.match(filename):
4504 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004505 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004506 else:
4507 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4508 extra_check_functions)
4509 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004510 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004511 finally:
4512 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004513 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004514 if cpplint._cpplint_state.error_count != 0:
4515 return 1
4516 return 0
4517
4518
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004519@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004520def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004521 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004522 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004523 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004524 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004525 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004526 parser.add_option('--all', action='store_true',
4527 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004528 parser.add_option('--parallel', action='store_true',
4529 help='Run all tests specified by input_api.RunTests in all '
4530 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004531 auth.add_auth_options(parser)
4532 options, args = parser.parse_args(args)
4533 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534
sbc@chromium.org71437c02015-04-09 19:29:40 +00004535 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004536 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537 return 1
4538
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004539 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004540 if args:
4541 base_branch = args[0]
4542 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004543 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004544 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545
Aaron Gable8076c282017-11-29 14:39:41 -08004546 if options.all:
4547 base_change = cl.GetChange(base_branch, None)
4548 files = [('M', f) for f in base_change.AllFiles()]
4549 change = presubmit_support.GitChange(
4550 base_change.Name(),
4551 base_change.FullDescriptionText(),
4552 base_change.RepositoryRoot(),
4553 files,
4554 base_change.issue,
4555 base_change.patchset,
4556 base_change.author_email,
4557 base_change._upstream)
4558 else:
4559 change = cl.GetChange(base_branch, None)
4560
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004561 cl.RunHook(
4562 committing=not options.upload,
4563 may_prompt=False,
4564 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004565 change=change,
4566 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004567 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004568
4569
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004570def GenerateGerritChangeId(message):
4571 """Returns Ixxxxxx...xxx change id.
4572
4573 Works the same way as
4574 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4575 but can be called on demand on all platforms.
4576
4577 The basic idea is to generate git hash of a state of the tree, original commit
4578 message, author/committer info and timestamps.
4579 """
4580 lines = []
4581 tree_hash = RunGitSilent(['write-tree'])
4582 lines.append('tree %s' % tree_hash.strip())
4583 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4584 if code == 0:
4585 lines.append('parent %s' % parent.strip())
4586 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4587 lines.append('author %s' % author.strip())
4588 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4589 lines.append('committer %s' % committer.strip())
4590 lines.append('')
4591 # Note: Gerrit's commit-hook actually cleans message of some lines and
4592 # whitespace. This code is not doing this, but it clearly won't decrease
4593 # entropy.
4594 lines.append(message)
4595 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004596 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004597 return 'I%s' % change_hash.strip()
4598
4599
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004600def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004601 """Computes the remote branch ref to use for the CL.
4602
4603 Args:
4604 remote (str): The git remote for the CL.
4605 remote_branch (str): The git remote branch for the CL.
4606 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004607 """
4608 if not (remote and remote_branch):
4609 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004610
wittman@chromium.org455dc922015-01-26 20:15:50 +00004611 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004612 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004613 # refs, which are then translated into the remote full symbolic refs
4614 # below.
4615 if '/' not in target_branch:
4616 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4617 else:
4618 prefix_replacements = (
4619 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4620 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4621 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4622 )
4623 match = None
4624 for regex, replacement in prefix_replacements:
4625 match = re.search(regex, target_branch)
4626 if match:
4627 remote_branch = target_branch.replace(match.group(0), replacement)
4628 break
4629 if not match:
4630 # This is a branch path but not one we recognize; use as-is.
4631 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004632 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4633 # Handle the refs that need to land in different refs.
4634 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004635
wittman@chromium.org455dc922015-01-26 20:15:50 +00004636 # Create the true path to the remote branch.
4637 # Does the following translation:
4638 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4639 # * refs/remotes/origin/master -> refs/heads/master
4640 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4641 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4642 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4643 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4644 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4645 'refs/heads/')
4646 elif remote_branch.startswith('refs/remotes/branch-heads'):
4647 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004648
wittman@chromium.org455dc922015-01-26 20:15:50 +00004649 return remote_branch
4650
4651
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004652def cleanup_list(l):
4653 """Fixes a list so that comma separated items are put as individual items.
4654
4655 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4656 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4657 """
4658 items = sum((i.split(',') for i in l), [])
4659 stripped_items = (i.strip() for i in items)
4660 return sorted(filter(None, stripped_items))
4661
4662
Aaron Gable4db38df2017-11-03 14:59:07 -07004663@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004664@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004665def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004666 """Uploads the current changelist to codereview.
4667
4668 Can skip dependency patchset uploads for a branch by running:
4669 git config branch.branch_name.skip-deps-uploads True
4670 To unset run:
4671 git config --unset branch.branch_name.skip-deps-uploads
4672 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004673
4674 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4675 a bug number, this bug number is automatically populated in the CL
4676 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004677
4678 If subject contains text in square brackets or has "<text>: " prefix, such
4679 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4680 [git-cl] add support for hashtags
4681 Foo bar: implement foo
4682 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004683 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004684 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4685 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004686 parser.add_option('--bypass-watchlists', action='store_true',
4687 dest='bypass_watchlists',
4688 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004689 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004690 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004691 parser.add_option('--message', '-m', dest='message',
4692 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004693 parser.add_option('-b', '--bug',
4694 help='pre-populate the bug number(s) for this issue. '
4695 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004696 parser.add_option('--message-file', dest='message_file',
4697 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004698 parser.add_option('--title', '-t', dest='title',
4699 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004700 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004701 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004702 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004703 parser.add_option('--tbrs',
4704 action='append', default=[],
4705 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004706 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004707 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004708 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004709 parser.add_option('--hashtag', dest='hashtags',
4710 action='append', default=[],
4711 help=('Gerrit hashtag for new CL; '
4712 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004713 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004714 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004715 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004716 help='tell the commit queue to commit this patchset; '
4717 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004718 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004719 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004720 metavar='TARGET',
4721 help='Apply CL to remote ref TARGET. ' +
4722 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004723 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004724 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004725 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004726 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004727 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004728 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004729 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4730 const='TBR', help='add a set of OWNERS to TBR')
4731 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4732 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004733 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4734 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004735 help='Send the patchset to do a CQ dry run right after '
4736 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004737 parser.add_option('--dependencies', action='store_true',
4738 help='Uploads CLs of all the local branches that depend on '
4739 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004740 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4741 help='Sends your change to the CQ after an approval. Only '
4742 'works on repos that have the Auto-Submit label '
4743 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004744 parser.add_option('--parallel', action='store_true',
4745 help='Run all tests specified by input_api.RunTests in all '
4746 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004747
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004748 parser.add_option('--no-autocc', action='store_true',
4749 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004750 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004751 help='Set the review private. This implies --no-autocc.')
4752
rmistry@google.com2dd99862015-06-22 12:22:18 +00004753 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004754 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004755 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004756 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004757 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004758 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004759
sbc@chromium.org71437c02015-04-09 19:29:40 +00004760 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004761 return 1
4762
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004763 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004764 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004765 options.cc = cleanup_list(options.cc)
4766
tandriib80458a2016-06-23 12:20:07 -07004767 if options.message_file:
4768 if options.message:
4769 parser.error('only one of --message and --message-file allowed.')
4770 options.message = gclient_utils.FileRead(options.message_file)
4771 options.message_file = None
4772
tandrii4d0545a2016-07-06 03:56:49 -07004773 if options.cq_dry_run and options.use_commit_queue:
4774 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4775
Aaron Gableedbc4132017-09-11 13:22:28 -07004776 if options.use_commit_queue:
4777 options.send_mail = True
4778
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004779 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4780 settings.GetIsGerrit()
4781
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004782 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004783 if not cl.IsGerrit():
4784 # Error out with instructions for repos not yet configured for Gerrit.
4785 print('=====================================')
4786 print('NOTICE: Rietveld is no longer supported. '
4787 'You can upload changes to Gerrit with')
4788 print(' git cl upload --gerrit')
4789 print('or set Gerrit to be your default code review tool with')
4790 print(' git config gerrit.host true')
4791 print('=====================================')
4792 return 1
4793
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004794 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004795
4796
Francois Dorayd42c6812017-05-30 15:10:20 -04004797@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004798@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004799def CMDsplit(parser, args):
4800 """Splits a branch into smaller branches and uploads CLs.
4801
4802 Creates a branch and uploads a CL for each group of files modified in the
4803 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004804 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004805 the shared OWNERS file.
4806 """
4807 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05004808 help="A text file containing a CL description in which "
4809 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04004810 parser.add_option("-c", "--comment", dest="comment_file",
4811 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11004812 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
4813 default=False,
4814 help="List the files and reviewers for each CL that would "
4815 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00004816 parser.add_option("--cq-dry-run", action='store_true',
4817 help="If set, will do a cq dry run for each uploaded CL. "
4818 "Please be careful when doing this; more than ~10 CLs "
4819 "has the potential to overload our build "
4820 "infrastructure. Try to upload these not during high "
4821 "load times (usually 11-3 Mountain View time). Email "
4822 "infra-dev@chromium.org with any questions.")
Takuto Ikuta51eca592019-02-14 19:40:52 +00004823 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4824 default=True,
4825 help='Sends your change to the CQ after an approval. Only '
4826 'works on repos that have the Auto-Submit label '
4827 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004828 options, _ = parser.parse_args(args)
4829
4830 if not options.description_file:
4831 parser.error('No --description flag specified.')
4832
4833 def WrappedCMDupload(args):
4834 return CMDupload(OptionParser(), args)
4835
4836 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004837 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004838 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004839
4840
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004841@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004842@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004843def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004844 """DEPRECATED: Used to commit the current changelist via git-svn."""
4845 message = ('git-cl no longer supports committing to SVN repositories via '
4846 'git-svn. You probably want to use `git cl land` instead.')
4847 print(message)
4848 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004849
4850
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004851# Two special branches used by git cl land.
4852MERGE_BRANCH = 'git-cl-commit'
4853CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4854
4855
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004856@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004857@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004858def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004859 """Commits the current changelist via git.
4860
4861 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4862 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004863 """
4864 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4865 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004866 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004867 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004868 parser.add_option('--parallel', action='store_true',
4869 help='Run all tests specified by input_api.RunTests in all '
4870 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004871 auth.add_auth_options(parser)
4872 (options, args) = parser.parse_args(args)
4873 auth_config = auth.extract_auth_config_from_options(options)
4874
4875 cl = Changelist(auth_config=auth_config)
4876
Robert Iannucci2e73d432018-03-14 01:10:47 -07004877 if not cl.IsGerrit():
4878 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004879
Robert Iannucci2e73d432018-03-14 01:10:47 -07004880 if not cl.GetIssue():
4881 DieWithError('You must upload the change first to Gerrit.\n'
4882 ' If you would rather have `git cl land` upload '
4883 'automatically for you, see http://crbug.com/642759')
4884 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004885 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004886
4887
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004888@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004889@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004890def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004891 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004892 parser.add_option('-b', dest='newbranch',
4893 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004894 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004895 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004896 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07004897 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004898 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004899 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004900 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004901 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004902 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004903 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004904
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004905
4906 group = optparse.OptionGroup(
4907 parser,
4908 'Options for continuing work on the current issue uploaded from a '
4909 'different clone (e.g. different machine). Must be used independently '
4910 'from the other options. No issue number should be specified, and the '
4911 'branch must have an issue number associated with it')
4912 group.add_option('--reapply', action='store_true', dest='reapply',
4913 help='Reset the branch and reapply the issue.\n'
4914 'CAUTION: This will undo any local changes in this '
4915 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004916
4917 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004918 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004919 parser.add_option_group(group)
4920
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004921 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004922 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004923 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004924 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004925 auth_config = auth.extract_auth_config_from_options(options)
4926
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004927 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004928 if options.newbranch:
4929 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004930 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004931 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004932
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004933 cl = Changelist(auth_config=auth_config,
4934 codereview=options.forced_codereview)
4935 if not cl.GetIssue():
4936 parser.error('current branch must have an associated issue')
4937
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004938 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004939 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004940 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004941
4942 RunGit(['reset', '--hard', upstream])
4943 if options.pull:
4944 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004945
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004946 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4947 options.directory)
4948
4949 if len(args) != 1 or not args[0]:
4950 parser.error('Must specify issue number or url')
4951
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004952 target_issue_arg = ParseIssueNumberArgument(args[0],
4953 options.forced_codereview)
4954 if not target_issue_arg.valid:
4955 parser.error('invalid codereview url or CL id')
4956
4957 cl_kwargs = {
4958 'auth_config': auth_config,
4959 'codereview_host': target_issue_arg.hostname,
4960 'codereview': options.forced_codereview,
4961 }
4962 detected_codereview_from_url = False
4963 if target_issue_arg.codereview and not options.forced_codereview:
4964 detected_codereview_from_url = True
4965 cl_kwargs['codereview'] = target_issue_arg.codereview
4966 cl_kwargs['issue'] = target_issue_arg.issue
4967
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004968 # We don't want uncommitted changes mixed up with the patch.
4969 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004970 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004971
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004972 if options.newbranch:
4973 if options.force:
4974 RunGit(['branch', '-D', options.newbranch],
4975 stderr=subprocess2.PIPE, error_ok=True)
4976 RunGit(['new-branch', options.newbranch])
4977
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004978 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004979
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004980 if cl.IsGerrit():
4981 if options.reject:
4982 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004983 if options.directory:
4984 parser.error('--directory is not supported with Gerrit codereview.')
4985
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004986 if detected_codereview_from_url:
4987 print('canonical issue/change URL: %s (type: %s)\n' %
4988 (cl.GetIssueURL(), target_issue_arg.codereview))
4989
4990 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07004991 options.nocommit, options.directory,
4992 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004993
4994
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004995def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004996 """Fetches the tree status and returns either 'open', 'closed',
4997 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004998 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004999 if url:
5000 status = urllib2.urlopen(url).read().lower()
5001 if status.find('closed') != -1 or status == '0':
5002 return 'closed'
5003 elif status.find('open') != -1 or status == '1':
5004 return 'open'
5005 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005006 return 'unset'
5007
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005009def GetTreeStatusReason():
5010 """Fetches the tree status from a json url and returns the message
5011 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005012 url = settings.GetTreeStatusUrl()
5013 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005014 connection = urllib2.urlopen(json_url)
5015 status = json.loads(connection.read())
5016 connection.close()
5017 return status['message']
5018
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005019
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005020@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005021def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005022 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005023 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005024 status = GetTreeStatus()
5025 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005026 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005027 return 2
5028
vapiera7fbd5a2016-06-16 09:17:49 -07005029 print('The tree is %s' % status)
5030 print()
5031 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005032 if status != 'open':
5033 return 1
5034 return 0
5035
5036
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005037@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005038def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005039 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005040 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005041 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005042 '-b', '--bot', action='append',
5043 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5044 'times to specify multiple builders. ex: '
5045 '"-b win_rel -b win_layout". See '
5046 'the try server waterfall for the builders name and the tests '
5047 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005048 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005049 '-B', '--bucket', default='',
5050 help=('Buildbucket bucket to send the try requests.'))
5051 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005052 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005053 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005054 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005055 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005056 help='Revision to use for the try job; default: the revision will '
5057 'be determined by the try recipe that builder runs, which usually '
5058 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005059 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005060 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005061 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005062 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005063 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005064 '--category', default='git_cl_try', help='Specify custom build category.')
5065 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005066 '--project',
5067 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005068 'in recipe to determine to which repository or directory to '
5069 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005070 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005071 '-p', '--property', dest='properties', action='append', default=[],
5072 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005073 'key2=value2 etc. The value will be treated as '
5074 'json if decodable, or as string otherwise. '
5075 'NOTE: using this may make your try job not usable for CQ, '
5076 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005077 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005078 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5079 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005080 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005081 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005082 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005083 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005084 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005085 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005086
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005087 if options.master and options.master.startswith('luci.'):
5088 parser.error(
5089 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005090 # Make sure that all properties are prop=value pairs.
5091 bad_params = [x for x in options.properties if '=' not in x]
5092 if bad_params:
5093 parser.error('Got properties with missing "=": %s' % bad_params)
5094
maruel@chromium.org15192402012-09-06 12:38:29 +00005095 if args:
5096 parser.error('Unknown arguments: %s' % args)
5097
Koji Ishii31c14782018-01-08 17:17:33 +09005098 cl = Changelist(auth_config=auth_config, issue=options.issue,
5099 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005100 if not cl.GetIssue():
5101 parser.error('Need to upload first')
5102
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005103 if cl.IsGerrit():
5104 # HACK: warm up Gerrit change detail cache to save on RPCs.
5105 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5106
tandriie113dfd2016-10-11 10:20:12 -07005107 error_message = cl.CannotTriggerTryJobReason()
5108 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005109 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005110
borenet6c0efe62016-10-19 08:13:29 -07005111 if options.bucket and options.master:
5112 parser.error('Only one of --bucket and --master may be used.')
5113
qyearsley1fdfcb62016-10-24 13:22:03 -07005114 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005115
qyearsleydd49f942016-10-28 11:57:22 -07005116 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5117 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005118 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005119 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005120 print('git cl try with no bots now defaults to CQ dry run.')
5121 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5122 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005123
borenet6c0efe62016-10-19 08:13:29 -07005124 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005125 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005126 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005127 'of bot requires an initial job from a parent (usually a builder). '
5128 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005129 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005130 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005131
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005132 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005133 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005134 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005135 except BuildbucketResponseException as ex:
5136 print('ERROR: %s' % ex)
5137 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005138 return 0
5139
5140
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005141@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005142def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005143 """Prints info about try jobs associated with current CL."""
5144 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005145 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005146 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005147 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005148 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005149 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005150 '--color', action='store_true', default=setup_color.IS_TTY,
5151 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005152 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005153 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5154 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005155 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005156 '--json', help=('Path of JSON output file to write try job results to,'
5157 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005158 parser.add_option_group(group)
5159 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005160 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005161 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005162 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005163 if args:
5164 parser.error('Unrecognized args: %s' % ' '.join(args))
5165
5166 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005167 cl = Changelist(
5168 issue=options.issue, codereview=options.forced_codereview,
5169 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005170 if not cl.GetIssue():
5171 parser.error('Need to upload first')
5172
tandrii221ab252016-10-06 08:12:04 -07005173 patchset = options.patchset
5174 if not patchset:
5175 patchset = cl.GetMostRecentPatchset()
5176 if not patchset:
5177 parser.error('Codereview doesn\'t know about issue %s. '
5178 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005179 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005180 cl.GetIssue())
5181
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005182 try:
tandrii221ab252016-10-06 08:12:04 -07005183 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005184 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005185 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005186 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005187 if options.json:
5188 write_try_results_json(options.json, jobs)
5189 else:
5190 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005191 return 0
5192
5193
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005194@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005195@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005196def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005197 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005198 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005199 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005200 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005202 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005203 if args:
5204 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005205 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005206 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005207 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005208 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005209
5210 # Clear configured merge-base, if there is one.
5211 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005212 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005213 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005214 return 0
5215
5216
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005217@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005218def CMDweb(parser, args):
5219 """Opens the current CL in the web browser."""
5220 _, args = parser.parse_args(args)
5221 if args:
5222 parser.error('Unrecognized args: %s' % ' '.join(args))
5223
5224 issue_url = Changelist().GetIssueURL()
5225 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005226 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005227 return 1
5228
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005229 # Redirect I/O before invoking browser to hide its output. For example, this
5230 # allows to hide "Created new window in existing browser session." message
5231 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5232 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005233 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005234 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005235 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005236 os.open(os.devnull, os.O_RDWR)
5237 try:
5238 webbrowser.open(issue_url)
5239 finally:
5240 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005241 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005242 return 0
5243
5244
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005245@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005246def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005247 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005248 parser.add_option('-d', '--dry-run', action='store_true',
5249 help='trigger in dry run mode')
5250 parser.add_option('-c', '--clear', action='store_true',
5251 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005252 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005253 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005254 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005255 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005256 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005257 if args:
5258 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005259 if options.dry_run and options.clear:
5260 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5261
iannuccie53c9352016-08-17 14:40:40 -07005262 cl = Changelist(auth_config=auth_config, issue=options.issue,
5263 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005264 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005265 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005266 elif options.dry_run:
5267 state = _CQState.DRY_RUN
5268 else:
5269 state = _CQState.COMMIT
5270 if not cl.GetIssue():
5271 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005272 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005273 return 0
5274
5275
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005276@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005277def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005278 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005279 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005280 auth.add_auth_options(parser)
5281 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005282 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005283 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005284 if args:
5285 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005286 cl = Changelist(auth_config=auth_config, issue=options.issue,
5287 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005288 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005289 if not cl.GetIssue():
5290 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005291 cl.CloseIssue()
5292 return 0
5293
5294
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005295@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005296def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005297 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005298 parser.add_option(
5299 '--stat',
5300 action='store_true',
5301 dest='stat',
5302 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005303 auth.add_auth_options(parser)
5304 options, args = parser.parse_args(args)
5305 auth_config = auth.extract_auth_config_from_options(options)
5306 if args:
5307 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005308
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005309 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005310 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005311 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005312 if not issue:
5313 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005314
Aaron Gablea718c3e2017-08-28 17:47:28 -07005315 base = cl._GitGetBranchConfigValue('last-upload-hash')
5316 if not base:
5317 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5318 if not base:
5319 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5320 revision_info = detail['revisions'][detail['current_revision']]
5321 fetch_info = revision_info['fetch']['http']
5322 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5323 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005324
Aaron Gablea718c3e2017-08-28 17:47:28 -07005325 cmd = ['git', 'diff']
5326 if options.stat:
5327 cmd.append('--stat')
5328 cmd.append(base)
5329 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005330
5331 return 0
5332
5333
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005334@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005335def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005336 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005337 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005338 '--ignore-current',
5339 action='store_true',
5340 help='Ignore the CL\'s current reviewers and start from scratch.')
5341 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005342 '--ignore-self',
5343 action='store_true',
5344 help='Do not consider CL\'s author as an owners.')
5345 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005346 '--no-color',
5347 action='store_true',
5348 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005349 parser.add_option(
5350 '--batch',
5351 action='store_true',
5352 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005353 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005354 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005355 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005356
5357 author = RunGit(['config', 'user.email']).strip() or None
5358
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005359 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005360
5361 if args:
5362 if len(args) > 1:
5363 parser.error('Unknown args')
5364 base_branch = args[0]
5365 else:
5366 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005367 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005368
5369 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005370 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5371
5372 if options.batch:
5373 db = owners.Database(change.RepositoryRoot(), file, os.path)
5374 print('\n'.join(db.reviewers_for(affected_files, author)))
5375 return 0
5376
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005377 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005378 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005379 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005380 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005381 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005382 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005383 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005384 override_files=change.OriginalOwnersFiles(),
5385 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005386
5387
Aiden Bennerc08566e2018-10-03 17:52:42 +00005388def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005389 """Generates a diff command."""
5390 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005391 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5392
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005393 if allow_prefix:
5394 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5395 # case that diff.noprefix is set in the user's git config.
5396 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5397 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005398 diff_cmd += ['--no-prefix']
5399
5400 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005401
5402 if args:
5403 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005404 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005405 diff_cmd.append(arg)
5406 else:
5407 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005408
5409 return diff_cmd
5410
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005411
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005412def MatchingFileType(file_name, extensions):
5413 """Returns true if the file name ends with one of the given extensions."""
5414 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005415
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005416
enne@chromium.org555cfe42014-01-29 18:21:39 +00005417@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005419def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005420 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005421 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005422 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005423 parser.add_option('--full', action='store_true',
5424 help='Reformat the full content of all touched files')
5425 parser.add_option('--dry-run', action='store_true',
5426 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005427 parser.add_option(
5428 '--python',
5429 action='store_true',
5430 default=None,
5431 help='Enables python formatting on all python files.')
5432 parser.add_option(
5433 '--no-python',
5434 action='store_true',
5435 dest='python',
5436 help='Disables python formatting on all python files. '
5437 'Takes precedence over --python. '
5438 'If neither --python or --no-python are set, python '
5439 'files that have a .style.yapf file in an ancestor '
5440 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005441 parser.add_option('--js', action='store_true',
5442 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005443 parser.add_option('--diff', action='store_true',
5444 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005445 parser.add_option('--presubmit', action='store_true',
5446 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005447 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005448
Daniel Chengc55eecf2016-12-30 03:11:02 -08005449 # Normalize any remaining args against the current path, so paths relative to
5450 # the current directory are still resolved as expected.
5451 args = [os.path.join(os.getcwd(), arg) for arg in args]
5452
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005453 # git diff generates paths against the root of the repository. Change
5454 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005455 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005456 if rel_base_path:
5457 os.chdir(rel_base_path)
5458
digit@chromium.org29e47272013-05-17 17:01:46 +00005459 # Grab the merge-base commit, i.e. the upstream commit of the current
5460 # branch when it was created or the last time it was rebased. This is
5461 # to cover the case where the user may have called "git fetch origin",
5462 # moving the origin branch to a newer commit, but hasn't rebased yet.
5463 upstream_commit = None
5464 cl = Changelist()
5465 upstream_branch = cl.GetUpstreamBranch()
5466 if upstream_branch:
5467 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5468 upstream_commit = upstream_commit.strip()
5469
5470 if not upstream_commit:
5471 DieWithError('Could not find base commit for this branch. '
5472 'Are you in detached state?')
5473
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005474 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5475 diff_output = RunGit(changed_files_cmd)
5476 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005477 # Filter out files deleted by this CL
5478 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005479
Christopher Lamc5ba6922017-01-24 11:19:14 +11005480 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005481 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005482
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005483 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5484 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5485 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005486 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005487
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005488 top_dir = os.path.normpath(
5489 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5490
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005491 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5492 # formatted. This is used to block during the presubmit.
5493 return_value = 0
5494
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005495 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005496 # Locate the clang-format binary in the checkout
5497 try:
5498 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005499 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005500 DieWithError(e)
5501
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005502 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005503 cmd = [clang_format_tool]
5504 if not opts.dry_run and not opts.diff:
5505 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005506 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005507 if opts.diff:
5508 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005509 else:
5510 env = os.environ.copy()
5511 env['PATH'] = str(os.path.dirname(clang_format_tool))
5512 try:
5513 script = clang_format.FindClangFormatScriptInChromiumTree(
5514 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005515 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005516 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005517
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005518 cmd = [sys.executable, script, '-p0']
5519 if not opts.dry_run and not opts.diff:
5520 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005521
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005522 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5523 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005524
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005525 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5526 if opts.diff:
5527 sys.stdout.write(stdout)
5528 if opts.dry_run and len(stdout) > 0:
5529 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005530
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005531 # Similar code to above, but using yapf on .py files rather than clang-format
5532 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005533 py_explicitly_disabled = opts.python is not None and not opts.python
5534 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005535 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5536 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5537 if sys.platform.startswith('win'):
5538 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005539
Aiden Bennerc08566e2018-10-03 17:52:42 +00005540 # If we couldn't find a yapf file we'll default to the chromium style
5541 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005542 chromium_default_yapf_style = os.path.join(depot_tools_path,
5543 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005544 # Used for caching.
5545 yapf_configs = {}
5546 for f in python_diff_files:
5547 # Find the yapf style config for the current file, defaults to depot
5548 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005549 _FindYapfConfigFile(f, yapf_configs, top_dir)
5550
5551 # Turn on python formatting by default if a yapf config is specified.
5552 # This breaks in the case of this repo though since the specified
5553 # style file is also the global default.
5554 if opts.python is None:
5555 filtered_py_files = []
5556 for f in python_diff_files:
5557 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5558 filtered_py_files.append(f)
5559 else:
5560 filtered_py_files = python_diff_files
5561
5562 # Note: yapf still seems to fix indentation of the entire file
5563 # even if line ranges are specified.
5564 # See https://github.com/google/yapf/issues/499
5565 if not opts.full and filtered_py_files:
5566 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5567
5568 for f in filtered_py_files:
5569 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5570 if yapf_config is None:
5571 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005572
5573 cmd = [yapf_tool, '--style', yapf_config, f]
5574
5575 has_formattable_lines = False
5576 if not opts.full:
5577 # Only run yapf over changed line ranges.
5578 for diff_start, diff_len in py_line_diffs[f]:
5579 diff_end = diff_start + diff_len - 1
5580 # Yapf errors out if diff_end < diff_start but this
5581 # is a valid line range diff for a removal.
5582 if diff_end >= diff_start:
5583 has_formattable_lines = True
5584 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5585 # If all line diffs were removals we have nothing to format.
5586 if not has_formattable_lines:
5587 continue
5588
5589 if opts.diff or opts.dry_run:
5590 cmd += ['--diff']
5591 # Will return non-zero exit code if non-empty diff.
5592 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5593 if opts.diff:
5594 sys.stdout.write(stdout)
5595 elif len(stdout) > 0:
5596 return_value = 2
5597 else:
5598 cmd += ['-i']
5599 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005600
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005601 # Dart's formatter does not have the nice property of only operating on
5602 # modified chunks, so hard code full.
5603 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005604 try:
5605 command = [dart_format.FindDartFmtToolInChromiumTree()]
5606 if not opts.dry_run and not opts.diff:
5607 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005608 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005609
ppi@chromium.org6593d932016-03-03 15:41:15 +00005610 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005611 if opts.dry_run and stdout:
5612 return_value = 2
5613 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005614 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5615 'found in this checkout. Files in other languages are still '
5616 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005617
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005618 # Format GN build files. Always run on full build files for canonical form.
5619 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005620 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005621 if opts.dry_run or opts.diff:
5622 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005623 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005624 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5625 shell=sys.platform == 'win32',
5626 cwd=top_dir)
5627 if opts.dry_run and gn_ret == 2:
5628 return_value = 2 # Not formatted.
5629 elif opts.diff and gn_ret == 2:
5630 # TODO this should compute and print the actual diff.
5631 print("This change has GN build file diff for " + gn_diff_file)
5632 elif gn_ret != 0:
5633 # For non-dry run cases (and non-2 return values for dry-run), a
5634 # nonzero error code indicates a failure, probably because the file
5635 # doesn't parse.
5636 DieWithError("gn format failed on " + gn_diff_file +
5637 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005638
Ilya Shermane081cbe2017-08-15 17:51:04 -07005639 # Skip the metrics formatting from the global presubmit hook. These files have
5640 # a separate presubmit hook that issues an error if the files need formatting,
5641 # whereas the top-level presubmit script merely issues a warning. Formatting
5642 # these files is somewhat slow, so it's important not to duplicate the work.
5643 if not opts.presubmit:
5644 for xml_dir in GetDirtyMetricsDirs(diff_files):
5645 tool_dir = os.path.join(top_dir, xml_dir)
5646 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5647 if opts.dry_run or opts.diff:
5648 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005649 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005650 if opts.diff:
5651 sys.stdout.write(stdout)
5652 if opts.dry_run and stdout:
5653 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005654
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005655 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005656
Steven Holte2e664bf2017-04-21 13:10:47 -07005657def GetDirtyMetricsDirs(diff_files):
5658 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5659 metrics_xml_dirs = [
5660 os.path.join('tools', 'metrics', 'actions'),
5661 os.path.join('tools', 'metrics', 'histograms'),
5662 os.path.join('tools', 'metrics', 'rappor'),
5663 os.path.join('tools', 'metrics', 'ukm')]
5664 for xml_dir in metrics_xml_dirs:
5665 if any(file.startswith(xml_dir) for file in xml_diff_files):
5666 yield xml_dir
5667
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005668
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005669@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005670@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005671def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005672 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005673 _, args = parser.parse_args(args)
5674
5675 if len(args) != 1:
5676 parser.print_help()
5677 return 1
5678
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005679 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005680 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005681 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005682
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005683 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005684
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005685 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005686 output = RunGit(['config', '--local', '--get-regexp',
5687 r'branch\..*\.%s' % issueprefix],
5688 error_ok=True)
5689 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005690 if issue == target_issue:
5691 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005692
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005693 branches = []
5694 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005695 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005696 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005697 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005698 return 1
5699 if len(branches) == 1:
5700 RunGit(['checkout', branches[0]])
5701 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005702 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005703 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005704 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005705 which = raw_input('Choose by index: ')
5706 try:
5707 RunGit(['checkout', branches[int(which)]])
5708 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005709 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005710 return 1
5711
5712 return 0
5713
5714
maruel@chromium.org29404b52014-09-08 22:58:00 +00005715def CMDlol(parser, args):
5716 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005717 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005718 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5719 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5720 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005721 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005722 return 0
5723
5724
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005725class OptionParser(optparse.OptionParser):
5726 """Creates the option parse and add --verbose support."""
5727 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005728 optparse.OptionParser.__init__(
5729 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005730 self.add_option(
5731 '-v', '--verbose', action='count', default=0,
5732 help='Use 2 times for more debugging info')
5733
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005734 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005735 try:
5736 return self._parse_args(args)
5737 finally:
5738 # Regardless of success or failure of args parsing, we want to report
5739 # metrics, but only after logging has been initialized (if parsing
5740 # succeeded).
5741 global settings
5742 settings = Settings()
5743
5744 if not metrics.DISABLE_METRICS_COLLECTION:
5745 # GetViewVCUrl ultimately calls logging method.
5746 project_url = settings.GetViewVCUrl().strip('/+')
5747 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5748 metrics.collector.add('project_urls', [project_url])
5749
5750 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005751 # Create an optparse.Values object that will store only the actual passed
5752 # options, without the defaults.
5753 actual_options = optparse.Values()
5754 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5755 # Create an optparse.Values object with the default options.
5756 options = optparse.Values(self.get_default_values().__dict__)
5757 # Update it with the options passed by the user.
5758 options._update_careful(actual_options.__dict__)
5759 # Store the options passed by the user in an _actual_options attribute.
5760 # We store only the keys, and not the values, since the values can contain
5761 # arbitrary information, which might be PII.
5762 metrics.collector.add('arguments', actual_options.__dict__.keys())
5763
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005764 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005765 logging.basicConfig(
5766 level=levels[min(options.verbose, len(levels) - 1)],
5767 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5768 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005769
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005770 return options, args
5771
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005772
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005773def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005774 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005775 print('\nYour python version %s is unsupported, please upgrade.\n' %
5776 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005777 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005778
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005779 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005780 dispatcher = subcommand.CommandDispatcher(__name__)
5781 try:
5782 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005783 except auth.AuthenticationError as e:
5784 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005785 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005786 if e.code != 500:
5787 raise
5788 DieWithError(
5789 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5790 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005791 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005792
5793
5794if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005795 # These affect sys.stdout so do it outside of main() to simplify mocks in
5796 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005797 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005798 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005799 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005800 sys.exit(main(sys.argv[1:]))