blob: 3b1a8dd7899a8bce09ceb95e36e9f109e86b2d3b [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
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
tandrii9d2c7a32016-06-22 03:42:45 -0700106COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800107POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000108DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000109REFS_THAT_ALIAS_TO_OTHER_REFS = {
110 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
111 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
112}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
borenet6c0efe62016-10-19 08:13:29 -0700121# Buildbucket master name prefix.
122MASTER_PREFIX = 'master.'
123
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000124# Shortcut since it quickly becomes redundant.
125Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000126
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000127# Initialized in main()
128settings = None
129
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100130# Used by tests/git_cl_test.py to add extra logging.
131# Inside the weirdly failing test, add this:
132# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700133# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134_IS_BEING_TESTED = False
135
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000136
Christopher Lamf732cd52017-01-24 12:40:11 +1100137def DieWithError(message, change_desc=None):
138 if change_desc:
139 SaveDescriptionBackup(change_desc)
140
vapiera7fbd5a2016-06-16 09:17:49 -0700141 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000142 sys.exit(1)
143
144
Christopher Lamf732cd52017-01-24 12:40:11 +1100145def SaveDescriptionBackup(change_desc):
146 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000147 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100148 backup_file = open(backup_path, 'w')
149 backup_file.write(change_desc.description)
150 backup_file.close()
151
152
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000153def GetNoGitPagerEnv():
154 env = os.environ.copy()
155 # 'cat' is a magical git string that disables pagers on all platforms.
156 env['GIT_PAGER'] = 'cat'
157 return env
158
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000159
bsep@chromium.org627d9002016-04-29 00:00:52 +0000160def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000162 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000163 except subprocess2.CalledProcessError as e:
164 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000165 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000167 'Command "%s" failed.\n%s' % (
168 ' '.join(args), error_message or e.stdout or ''))
169 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000170
171
172def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000173 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000174 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000175
176
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000177def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000178 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700179 if suppress_stderr:
180 stderr = subprocess2.VOID
181 else:
182 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000183 try:
tandrii5d48c322016-08-18 16:19:37 -0700184 (out, _), code = subprocess2.communicate(['git'] + args,
185 env=GetNoGitPagerEnv(),
186 stdout=subprocess2.PIPE,
187 stderr=stderr)
188 return code, out
189 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900190 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700191 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000192
193
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000194def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000195 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000196 return RunGitWithCode(args, suppress_stderr=True)[1]
197
198
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000199def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000200 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000201 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000202 return (version.startswith(prefix) and
203 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000204
205
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000206def BranchExists(branch):
207 """Return True if specified branch exists."""
208 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
209 suppress_stderr=True)
210 return not code
211
212
tandrii2a16b952016-10-19 07:09:44 -0700213def time_sleep(seconds):
214 # Use this so that it can be mocked in tests without interfering with python
215 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700216 return time.sleep(seconds)
217
218
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000219def time_time():
220 # Use this so that it can be mocked in tests without interfering with python
221 # system machinery.
222 return time.time()
223
224
Edward Lemur1b52d872019-05-09 21:12:12 +0000225def datetime_now():
226 # Use this so that it can be mocked in tests without interfering with python
227 # system machinery.
228 return datetime.datetime.now()
229
230
maruel@chromium.org90541732011-04-01 17:54:18 +0000231def ask_for_data(prompt):
232 try:
233 return raw_input(prompt)
234 except KeyboardInterrupt:
235 # Hide the exception.
236 sys.exit(1)
237
238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239def confirm_or_exit(prefix='', action='confirm'):
240 """Asks user to press enter to continue or press Ctrl+C to abort."""
241 if not prefix or prefix.endswith('\n'):
242 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100243 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 mid = ' Press'
245 elif prefix.endswith(' '):
246 mid = 'press'
247 else:
248 mid = ' press'
249 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
250
251
252def ask_for_explicit_yes(prompt):
253 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
254 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
255 while True:
256 if 'yes'.startswith(result):
257 return True
258 if 'no'.startswith(result):
259 return False
260 result = ask_for_data('Please, type yes or no: ').lower()
261
262
tandrii5d48c322016-08-18 16:19:37 -0700263def _git_branch_config_key(branch, key):
264 """Helper method to return Git config key for a branch."""
265 assert branch, 'branch name is required to set git config for it'
266 return 'branch.%s.%s' % (branch, key)
267
268
269def _git_get_branch_config_value(key, default=None, value_type=str,
270 branch=False):
271 """Returns git config value of given or current branch if any.
272
273 Returns default in all other cases.
274 """
275 assert value_type in (int, str, bool)
276 if branch is False: # Distinguishing default arg value from None.
277 branch = GetCurrentBranch()
278
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000279 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700280 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000281
tandrii5d48c322016-08-18 16:19:37 -0700282 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700283 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700284 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700285 # git config also has --int, but apparently git config suffers from integer
286 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700287 args.append(_git_branch_config_key(branch, key))
288 code, out = RunGitWithCode(args)
289 if code == 0:
290 value = out.strip()
291 if value_type == int:
292 return int(value)
293 if value_type == bool:
294 return bool(value.lower() == 'true')
295 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000296 return default
297
298
tandrii5d48c322016-08-18 16:19:37 -0700299def _git_set_branch_config_value(key, value, branch=None, **kwargs):
300 """Sets the value or unsets if it's None of a git branch config.
301
302 Valid, though not necessarily existing, branch must be provided,
303 otherwise currently checked out branch is used.
304 """
305 if not branch:
306 branch = GetCurrentBranch()
307 assert branch, 'a branch name OR currently checked out branch is required'
308 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700309 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700310 if value is None:
311 args.append('--unset')
312 elif isinstance(value, bool):
313 args.append('--bool')
314 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700315 else:
tandrii33a46ff2016-08-23 05:53:40 -0700316 # git config also has --int, but apparently git config suffers from integer
317 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700318 value = str(value)
319 args.append(_git_branch_config_key(branch, key))
320 if value is not None:
321 args.append(value)
322 RunGit(args, **kwargs)
323
324
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100325def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700326 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100327
328 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
329 """
330 # Git also stores timezone offset, but it only affects visual display,
331 # actual point in time is defined by this timestamp only.
332 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
333
334
335def _git_amend_head(message, committer_timestamp):
336 """Amends commit with new message and desired committer_timestamp.
337
338 Sets committer timezone to UTC.
339 """
340 env = os.environ.copy()
341 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
342 return RunGit(['commit', '--amend', '-m', message], env=env)
343
344
machenbach@chromium.org45453142015-09-15 08:45:22 +0000345def _get_properties_from_options(options):
346 properties = dict(x.split('=', 1) for x in options.properties)
347 for key, val in properties.iteritems():
348 try:
349 properties[key] = json.loads(val)
350 except ValueError:
351 pass # If a value couldn't be evaluated, treat it as a string.
352 return properties
353
354
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000355def _prefix_master(master):
356 """Convert user-specified master name to full master name.
357
358 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
359 name, while the developers always use shortened master name
360 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
361 function does the conversion for buildbucket migration.
362 """
borenet6c0efe62016-10-19 08:13:29 -0700363 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000364 return master
borenet6c0efe62016-10-19 08:13:29 -0700365 return '%s%s' % (MASTER_PREFIX, master)
366
367
368def _unprefix_master(bucket):
369 """Convert bucket name to shortened master name.
370
371 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
372 name, while the developers always use shortened master name
373 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
374 function does the conversion for buildbucket migration.
375 """
376 if bucket.startswith(MASTER_PREFIX):
377 return bucket[len(MASTER_PREFIX):]
378 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000379
380
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000381def _buildbucket_retry(operation_name, http, *args, **kwargs):
382 """Retries requests to buildbucket service and returns parsed json content."""
383 try_count = 0
384 while True:
385 response, content = http.request(*args, **kwargs)
386 try:
387 content_json = json.loads(content)
388 except ValueError:
389 content_json = None
390
391 # Buildbucket could return an error even if status==200.
392 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000393 error = content_json.get('error')
394 if error.get('code') == 403:
395 raise BuildbucketResponseException(
396 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000397 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000398 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000399 raise BuildbucketResponseException(msg)
400
401 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700402 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 raise BuildbucketResponseException(
404 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700405 'Please file bugs at http://crbug.com, '
406 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000407 content)
408 return content_json
409 if response.status < 500 or try_count >= 2:
410 raise httplib2.HttpLib2Error(content)
411
412 # status >= 500 means transient failures.
413 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700414 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000415 try_count += 1
416 assert False, 'unreachable'
417
418
qyearsley1fdfcb62016-10-24 13:22:03 -0700419def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700420 """Returns a dict mapping bucket names to builders and tests,
421 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700422 """
qyearsleydd49f942016-10-28 11:57:22 -0700423 # If no bots are listed, we try to get a set of builders and tests based
424 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700425 if not options.bot:
426 change = changelist.GetChange(
427 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700428 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700429 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700430 change=change,
431 changed_files=change.LocalPaths(),
432 repository_root=settings.GetRoot(),
433 default_presubmit=None,
434 project=None,
435 verbose=options.verbose,
436 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700437 if masters is None:
438 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100439 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700440
qyearsley1fdfcb62016-10-24 13:22:03 -0700441 if options.bucket:
442 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700443 if options.master:
444 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700445
qyearsleydd49f942016-10-28 11:57:22 -0700446 # If bots are listed but no master or bucket, then we need to find out
447 # the corresponding master for each bot.
448 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
449 if error_message:
450 option_parser.error(
451 'Tryserver master cannot be found because: %s\n'
452 'Please manually specify the tryserver master, e.g. '
453 '"-m tryserver.chromium.linux".' % error_message)
454 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700455
456
qyearsley123a4682016-10-26 09:12:17 -0700457def _get_bucket_map_for_builders(builders):
458 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700459 map_url = 'https://builders-map.appspot.com/'
460 try:
qyearsley123a4682016-10-26 09:12:17 -0700461 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 except urllib2.URLError as e:
463 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
464 (map_url, e))
465 except ValueError as e:
466 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700467 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700468 return None, 'Failed to build master map.'
469
qyearsley123a4682016-10-26 09:12:17 -0700470 bucket_map = {}
471 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800472 bucket = builders_map.get(builder, {}).get('bucket')
473 if bucket:
474 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700475 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700476
477
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800478def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700479 """Sends a request to Buildbucket to trigger try jobs for a changelist.
480
481 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700482 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700483 changelist: Changelist that the try jobs are associated with.
484 buckets: A nested dict mapping bucket names to builders to tests.
485 options: Command-line options.
486 """
tandriide281ae2016-10-12 06:02:30 -0700487 assert changelist.GetIssue(), 'CL must be uploaded first'
488 codereview_url = changelist.GetCodereviewServer()
489 assert codereview_url, 'CL must be uploaded first'
490 patchset = patchset or changelist.GetMostRecentPatchset()
491 assert patchset, 'CL must be uploaded first'
492
493 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700494 # Cache the buildbucket credentials under the codereview host key, so that
495 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700496 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000497 http = authenticator.authorize(httplib2.Http())
498 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700499
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 buildbucket_put_url = (
501 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000502 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000503 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700504 hostname=codereview_host,
505 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000506 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700507
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700508 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800509 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700510 if options.clobber:
511 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700512 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700513 if extra_properties:
514 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000515
516 batch_req_body = {'builds': []}
517 print_text = []
518 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700519 for bucket, builders_and_tests in sorted(buckets.iteritems()):
520 print_text.append('Bucket: %s' % bucket)
521 master = None
522 if bucket.startswith(MASTER_PREFIX):
523 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000524 for builder, tests in sorted(builders_and_tests.iteritems()):
525 print_text.append(' %s: %s' % (builder, tests))
526 parameters = {
527 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000528 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100529 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000530 'revision': options.revision,
531 }],
tandrii8c5a3532016-11-04 07:52:02 -0700532 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000533 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000534 if 'presubmit' in builder.lower():
535 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000536 if tests:
537 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700538
539 tags = [
540 'builder:%s' % builder,
541 'buildset:%s' % buildset,
542 'user_agent:git_cl_try',
543 ]
544 if master:
545 parameters['properties']['master'] = master
546 tags.append('master:%s' % master)
547
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 batch_req_body['builds'].append(
549 {
550 'bucket': bucket,
551 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700553 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000554 }
555 )
556
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700558 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 http,
560 buildbucket_put_url,
561 'PUT',
562 body=json.dumps(batch_req_body),
563 headers={'Content-Type': 'application/json'}
564 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000565 print_text.append('To see results here, run: git cl try-results')
566 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700567 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000568
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000569
tandrii221ab252016-10-06 08:12:04 -0700570def fetch_try_jobs(auth_config, changelist, buildbucket_host,
571 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700572 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573
qyearsley53f48a12016-09-01 10:45:13 -0700574 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000575 """
tandrii221ab252016-10-06 08:12:04 -0700576 assert buildbucket_host
577 assert changelist.GetIssue(), 'CL must be uploaded first'
578 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
579 patchset = patchset or changelist.GetMostRecentPatchset()
580 assert patchset, 'CL must be uploaded first'
581
582 codereview_url = changelist.GetCodereviewServer()
583 codereview_host = urlparse.urlparse(codereview_url).hostname
584 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 if authenticator.has_cached_credentials():
586 http = authenticator.authorize(httplib2.Http())
587 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700588 print('Warning: Some results might be missing because %s' %
589 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700590 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 http = httplib2.Http()
592
593 http.force_exception_to_status_code = True
594
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000595 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700596 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700598 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599 params = {'tag': 'buildset:%s' % buildset}
600
601 builds = {}
602 while True:
603 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700604 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700606 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000607 for build in content.get('builds', []):
608 builds[build['id']] = build
609 if 'next_cursor' in content:
610 params['start_cursor'] = content['next_cursor']
611 else:
612 break
613 return builds
614
615
qyearsleyeab3c042016-08-24 09:18:28 -0700616def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617 """Prints nicely result of fetch_try_jobs."""
618 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700619 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000620 return
621
622 # Make a copy, because we'll be modifying builds dictionary.
623 builds = builds.copy()
624 builder_names_cache = {}
625
626 def get_builder(b):
627 try:
628 return builder_names_cache[b['id']]
629 except KeyError:
630 try:
631 parameters = json.loads(b['parameters_json'])
632 name = parameters['builder_name']
633 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700634 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700635 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 name = None
637 builder_names_cache[b['id']] = name
638 return name
639
640 def get_bucket(b):
641 bucket = b['bucket']
642 if bucket.startswith('master.'):
643 return bucket[len('master.'):]
644 return bucket
645
646 if options.print_master:
647 name_fmt = '%%-%ds %%-%ds' % (
648 max(len(str(get_bucket(b))) for b in builds.itervalues()),
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % (get_bucket(b), get_builder(b))
652 else:
653 name_fmt = '%%-%ds' % (
654 max(len(str(get_builder(b))) for b in builds.itervalues()))
655 def get_name(b):
656 return name_fmt % get_builder(b)
657
658 def sort_key(b):
659 return b['status'], b.get('result'), get_name(b), b.get('url')
660
661 def pop(title, f, color=None, **kwargs):
662 """Pop matching builds from `builds` dict and print them."""
663
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000664 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000665 colorize = str
666 else:
667 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
668
669 result = []
670 for b in builds.values():
671 if all(b.get(k) == v for k, v in kwargs.iteritems()):
672 builds.pop(b['id'])
673 result.append(b)
674 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700675 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000676 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700677 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000678
679 total = len(builds)
680 pop(status='COMPLETED', result='SUCCESS',
681 title='Successes:', color=Fore.GREEN,
682 f=lambda b: (get_name(b), b.get('url')))
683 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
684 title='Infra Failures:', color=Fore.MAGENTA,
685 f=lambda b: (get_name(b), b.get('url')))
686 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
687 title='Failures:', color=Fore.RED,
688 f=lambda b: (get_name(b), b.get('url')))
689 pop(status='COMPLETED', result='CANCELED',
690 title='Canceled:', color=Fore.MAGENTA,
691 f=lambda b: (get_name(b),))
692 pop(status='COMPLETED', result='FAILURE',
693 failure_reason='INVALID_BUILD_DEFINITION',
694 title='Wrong master/builder name:', color=Fore.MAGENTA,
695 f=lambda b: (get_name(b),))
696 pop(status='COMPLETED', result='FAILURE',
697 title='Other failures:',
698 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
699 pop(status='COMPLETED',
700 title='Other finished:',
701 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
702 pop(status='STARTED',
703 title='Started:', color=Fore.YELLOW,
704 f=lambda b: (get_name(b), b.get('url')))
705 pop(status='SCHEDULED',
706 title='Scheduled:',
707 f=lambda b: (get_name(b), 'id=%s' % b['id']))
708 # The last section is just in case buildbucket API changes OR there is a bug.
709 pop(title='Other:',
710 f=lambda b: (get_name(b), 'id=%s' % b['id']))
711 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700712 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000713
714
Aiden Bennerc08566e2018-10-03 17:52:42 +0000715def _ComputeDiffLineRanges(files, upstream_commit):
716 """Gets the changed line ranges for each file since upstream_commit.
717
718 Parses a git diff on provided files and returns a dict that maps a file name
719 to an ordered list of range tuples in the form (start_line, count).
720 Ranges are in the same format as a git diff.
721 """
722 # If files is empty then diff_output will be a full diff.
723 if len(files) == 0:
724 return {}
725
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000726 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000727 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
728 diff_output = RunGit(diff_cmd)
729
730 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
731 # 2 capture groups
732 # 0 == fname of diff file
733 # 1 == 'diff_start,diff_count' or 'diff_start'
734 # will match each of
735 # diff --git a/foo.foo b/foo.py
736 # @@ -12,2 +14,3 @@
737 # @@ -12,2 +17 @@
738 # running re.findall on the above string with pattern will give
739 # [('foo.py', ''), ('', '14,3'), ('', '17')]
740
741 curr_file = None
742 line_diffs = {}
743 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
744 if match[0] != '':
745 # Will match the second filename in diff --git a/a.py b/b.py.
746 curr_file = match[0]
747 line_diffs[curr_file] = []
748 else:
749 # Matches +14,3
750 if ',' in match[1]:
751 diff_start, diff_count = match[1].split(',')
752 else:
753 # Single line changes are of the form +12 instead of +12,1.
754 diff_start = match[1]
755 diff_count = 1
756
757 diff_start = int(diff_start)
758 diff_count = int(diff_count)
759
760 # If diff_count == 0 this is a removal we can ignore.
761 line_diffs[curr_file].append((diff_start, diff_count))
762
763 return line_diffs
764
765
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000766def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000767 """Checks if a yapf file is in any parent directory of fpath until top_dir.
768
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000769 Recursively checks parent directories to find yapf file and if no yapf file
770 is found returns None. Uses yapf_config_cache as a cache for
771 previously found configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000772 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000773 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000774 # Return result if we've already computed it.
775 if fpath in yapf_config_cache:
776 return yapf_config_cache[fpath]
777
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000778 parent_dir = os.path.dirname(fpath)
779 if os.path.isfile(fpath):
780 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000781 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000782 # Otherwise fpath is a directory
783 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
784 if os.path.isfile(yapf_file):
785 ret = yapf_file
786 elif fpath == top_dir or parent_dir == fpath:
787 # If we're at the top level directory, or if we're at root
788 # there is no provided style.
789 ret = None
790 else:
791 # Otherwise recurse on the current directory.
792 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000793 yapf_config_cache[fpath] = ret
794 return ret
795
796
qyearsley53f48a12016-09-01 10:45:13 -0700797def write_try_results_json(output_file, builds):
798 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
799
800 The input |builds| dict is assumed to be generated by Buildbucket.
801 Buildbucket documentation: http://goo.gl/G0s101
802 """
803
804 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800805 """Extracts some of the information from one build dict."""
806 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700807 return {
808 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700809 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800810 'builder_name': parameters.get('builder_name'),
811 'created_ts': build.get('created_ts'),
812 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700813 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800814 'result': build.get('result'),
815 'status': build.get('status'),
816 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700817 'url': build.get('url'),
818 }
819
820 converted = []
821 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000822 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700823 write_json(output_file, converted)
824
825
Aaron Gable13101a62018-02-09 13:20:41 -0800826def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000827 """Prints statistics about the change to the user."""
828 # --no-ext-diff is broken in some versions of Git, so try to work around
829 # this by overriding the environment (but there is still a problem if the
830 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000831 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000832 if 'GIT_EXTERNAL_DIFF' in env:
833 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000834
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000835 try:
836 stdout = sys.stdout.fileno()
837 except AttributeError:
838 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000839 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800840 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000841 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000842
843
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000844class BuildbucketResponseException(Exception):
845 pass
846
847
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000848class Settings(object):
849 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000851 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000852 self.tree_status_url = None
853 self.viewvc_url = None
854 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000855 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000856 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000857 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000858 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000859
860 def LazyUpdateIfNeeded(self):
861 """Updates the settings from a codereview.settings file, if available."""
862 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000863 # The only value that actually changes the behavior is
864 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000865 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000866 error_ok=True
867 ).strip().lower()
868
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000869 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000870 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871 LoadCodereviewSettingsFromFile(cr_settings_file)
872 self.updated = True
873
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000874 @staticmethod
875 def GetRelativeRoot():
876 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000877
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000878 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000879 if self.root is None:
880 self.root = os.path.abspath(self.GetRelativeRoot())
881 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000882
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 def GetTreeStatusUrl(self, error_ok=False):
884 if not self.tree_status_url:
885 error_message = ('You must configure your tree status URL by running '
886 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000887 self.tree_status_url = self._GetConfig(
888 'rietveld.tree-status-url', error_ok=error_ok,
889 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000890 return self.tree_status_url
891
892 def GetViewVCUrl(self):
893 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000894 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000895 return self.viewvc_url
896
rmistry@google.com90752582014-01-14 21:04:50 +0000897 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000898 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000899
rmistry@google.com5626a922015-02-26 14:03:30 +0000900 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000901 run_post_upload_hook = self._GetConfig(
902 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000903 return run_post_upload_hook == "True"
904
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000905 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000906 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000907
ukai@chromium.orge8077812012-02-03 03:41:46 +0000908 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700909 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000910 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700911 self.is_gerrit = (
912 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000913 return self.is_gerrit
914
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000915 def GetSquashGerritUploads(self):
916 """Return true if uploads to Gerrit should be squashed by default."""
917 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700918 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
919 if self.squash_gerrit_uploads is None:
920 # Default is squash now (http://crbug.com/611892#c23).
921 self.squash_gerrit_uploads = not (
922 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
923 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000924 return self.squash_gerrit_uploads
925
tandriia60502f2016-06-20 02:01:53 -0700926 def GetSquashGerritUploadsOverride(self):
927 """Return True or False if codereview.settings should be overridden.
928
929 Returns None if no override has been defined.
930 """
931 # See also http://crbug.com/611892#c23
932 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
933 error_ok=True).strip()
934 if result == 'true':
935 return True
936 if result == 'false':
937 return False
938 return None
939
tandrii@chromium.org28253532016-04-14 13:46:56 +0000940 def GetGerritSkipEnsureAuthenticated(self):
941 """Return True if EnsureAuthenticated should not be done for Gerrit
942 uploads."""
943 if self.gerrit_skip_ensure_authenticated is None:
944 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000945 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000946 error_ok=True).strip() == 'true')
947 return self.gerrit_skip_ensure_authenticated
948
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000949 def GetGitEditor(self):
950 """Return the editor specified in the git config, or None if none is."""
951 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000952 # Git requires single quotes for paths with spaces. We need to replace
953 # them with double quotes for Windows to treat such paths as a single
954 # path.
955 self.git_editor = self._GetConfig(
956 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000957 return self.git_editor or None
958
thestig@chromium.org44202a22014-03-11 19:22:18 +0000959 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000960 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000961 DEFAULT_LINT_REGEX)
962
963 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000964 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000965 DEFAULT_LINT_IGNORE_REGEX)
966
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000967 def _GetConfig(self, param, **kwargs):
968 self.LazyUpdateIfNeeded()
969 return RunGit(['config', param], **kwargs).strip()
970
971
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100972@contextlib.contextmanager
973def _get_gerrit_project_config_file(remote_url):
974 """Context manager to fetch and store Gerrit's project.config from
975 refs/meta/config branch and store it in temp file.
976
977 Provides a temporary filename or None if there was error.
978 """
979 error, _ = RunGitWithCode([
980 'fetch', remote_url,
981 '+refs/meta/config:refs/git_cl/meta/config'])
982 if error:
983 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700984 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100985 (remote_url, error))
986 yield None
987 return
988
989 error, project_config_data = RunGitWithCode(
990 ['show', 'refs/git_cl/meta/config:project.config'])
991 if error:
992 print('WARNING: project.config file not found')
993 yield None
994 return
995
996 with gclient_utils.temporary_directory() as tempdir:
997 project_config_file = os.path.join(tempdir, 'project.config')
998 gclient_utils.FileWrite(project_config_file, project_config_data)
999 yield project_config_file
1000
1001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001002def ShortBranchName(branch):
1003 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001004 return branch.replace('refs/heads/', '', 1)
1005
1006
1007def GetCurrentBranchRef():
1008 """Returns branch ref (e.g., refs/heads/master) or None."""
1009 return RunGit(['symbolic-ref', 'HEAD'],
1010 stderr=subprocess2.VOID, error_ok=True).strip() or None
1011
1012
1013def GetCurrentBranch():
1014 """Returns current branch or None.
1015
1016 For refs/heads/* branches, returns just last part. For others, full ref.
1017 """
1018 branchref = GetCurrentBranchRef()
1019 if branchref:
1020 return ShortBranchName(branchref)
1021 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001022
1023
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001024class _CQState(object):
1025 """Enum for states of CL with respect to Commit Queue."""
1026 NONE = 'none'
1027 DRY_RUN = 'dry_run'
1028 COMMIT = 'commit'
1029
1030 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1031
1032
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001033class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001034 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001035 self.issue = issue
1036 self.patchset = patchset
1037 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001038 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001039 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040
1041 @property
1042 def valid(self):
1043 return self.issue is not None
1044
1045
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001046def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001047 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1048 fail_result = _ParsedIssueNumberArgument()
1049
1050 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001051 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001052 if not arg.startswith('http'):
1053 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001054
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055 url = gclient_utils.UpgradeToHttps(arg)
1056 try:
1057 parsed_url = urlparse.urlparse(url)
1058 except ValueError:
1059 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001060
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001061 if codereview is not None:
1062 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1063 return parsed or fail_result
1064
Andrii Shyshkalov0a264d82018-11-21 00:36:16 +00001065 return _GerritChangelistImpl.ParseIssueURL(parsed_url) or fail_result
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001066
1067
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001068def _create_description_from_log(args):
1069 """Pulls out the commit log to use as a base for the CL description."""
1070 log_args = []
1071 if len(args) == 1 and not args[0].endswith('.'):
1072 log_args = [args[0] + '..']
1073 elif len(args) == 1 and args[0].endswith('...'):
1074 log_args = [args[0][:-1]]
1075 elif len(args) == 2:
1076 log_args = [args[0] + '..' + args[1]]
1077 else:
1078 log_args = args[:] # Hope for the best!
1079 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1080
1081
Aaron Gablea45ee112016-11-22 15:14:38 -08001082class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001083 def __init__(self, issue, url):
1084 self.issue = issue
1085 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001086 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001087
1088 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001089 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001090 self.issue, self.url)
1091
1092
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001093_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001094 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001095 # TODO(tandrii): these two aren't known in Gerrit.
1096 'approval', 'disapproval'])
1097
1098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001100 """Changelist works with one changelist in local branch.
1101
1102 Supports two codereview backends: Rietveld or Gerrit, selected at object
1103 creation.
1104
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001105 Notes:
1106 * Not safe for concurrent multi-{thread,process} use.
1107 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001108 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001109 """
1110
1111 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1112 """Create a new ChangeList instance.
1113
1114 If issue is given, the codereview must be given too.
1115
1116 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1117 Otherwise, it's decided based on current configuration of the local branch,
1118 with default being 'rietveld' for backwards compatibility.
1119 See _load_codereview_impl for more details.
1120
1121 **kwargs will be passed directly to codereview implementation.
1122 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001124 global settings
1125 if not settings:
1126 # Happens when git_cl.py is used as a utility library.
1127 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001128
1129 if issue:
1130 assert codereview, 'codereview must be known, if issue is known'
1131
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 self.branchref = branchref
1133 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001134 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 self.branch = ShortBranchName(self.branchref)
1136 else:
1137 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001139 self.lookedup_issue = False
1140 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.has_description = False
1142 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001143 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001145 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001146 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001147 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001148 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001149
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001150 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001151 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001152 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001153 assert self._codereview_impl
1154 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001155
1156 def _load_codereview_impl(self, codereview=None, **kwargs):
1157 if codereview:
Joe Masond87b0962018-12-03 21:04:46 +00001158 assert codereview in _CODEREVIEW_IMPLEMENTATIONS, (
1159 'codereview {} not in {}'.format(codereview,
1160 _CODEREVIEW_IMPLEMENTATIONS))
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001161 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1162 self._codereview = codereview
1163 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001164 return
1165
1166 # Automatic selection based on issue number set for a current branch.
1167 # Rietveld takes precedence over Gerrit.
1168 assert not self.issue
1169 # Whether we find issue or not, we are doing the lookup.
1170 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001171 if self.GetBranch():
1172 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1173 issue = _git_get_branch_config_value(
1174 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1175 if issue:
1176 self._codereview = codereview
1177 self._codereview_impl = cls(self, **kwargs)
1178 self.issue = int(issue)
1179 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001180
Bryce Thomascfc97122018-12-13 20:21:47 +00001181 # No issue is set for this branch, so default to gerrit.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001182 return self._load_codereview_impl(
Bryce Thomascfc97122018-12-13 20:21:47 +00001183 codereview='gerrit',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001184 **kwargs)
1185
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001186 def IsGerrit(self):
1187 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001188
1189 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001190 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001191
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001192 The return value is a string suitable for passing to git cl with the --cc
1193 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001194 """
1195 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001196 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001197 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001198 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1199 return self.cc
1200
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001201 def GetCCListWithoutDefault(self):
1202 """Return the users cc'd on this CL excluding default ones."""
1203 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001204 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001205 return self.cc
1206
Daniel Cheng7227d212017-11-17 08:12:37 -08001207 def ExtendCC(self, more_cc):
1208 """Extends the list of users to cc on this CL based on the changed files."""
1209 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210
1211 def GetBranch(self):
1212 """Returns the short branch name, e.g. 'master'."""
1213 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001214 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001215 if not branchref:
1216 return None
1217 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218 self.branch = ShortBranchName(self.branchref)
1219 return self.branch
1220
1221 def GetBranchRef(self):
1222 """Returns the full branch name, e.g. 'refs/heads/master'."""
1223 self.GetBranch() # Poke the lazy loader.
1224 return self.branchref
1225
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001226 def ClearBranch(self):
1227 """Clears cached branch data of this object."""
1228 self.branch = self.branchref = None
1229
tandrii5d48c322016-08-18 16:19:37 -07001230 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1231 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1232 kwargs['branch'] = self.GetBranch()
1233 return _git_get_branch_config_value(key, default, **kwargs)
1234
1235 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1236 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1237 assert self.GetBranch(), (
1238 'this CL must have an associated branch to %sset %s%s' %
1239 ('un' if value is None else '',
1240 key,
1241 '' if value is None else ' to %r' % value))
1242 kwargs['branch'] = self.GetBranch()
1243 return _git_set_branch_config_value(key, value, **kwargs)
1244
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001245 @staticmethod
1246 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001247 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248 e.g. 'origin', 'refs/heads/master'
1249 """
1250 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001251 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1252
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001254 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001256 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1257 error_ok=True).strip()
1258 if upstream_branch:
1259 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001261 # Else, try to guess the origin remote.
1262 remote_branches = RunGit(['branch', '-r']).split()
1263 if 'origin/master' in remote_branches:
1264 # Fall back on origin/master if it exits.
1265 remote = 'origin'
1266 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001268 DieWithError(
1269 'Unable to determine default branch to diff against.\n'
1270 'Either pass complete "git diff"-style arguments, like\n'
1271 ' git cl upload origin/master\n'
1272 'or verify this branch is set up to track another \n'
1273 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274
1275 return remote, upstream_branch
1276
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001277 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001278 upstream_branch = self.GetUpstreamBranch()
1279 if not BranchExists(upstream_branch):
1280 DieWithError('The upstream for the current branch (%s) does not exist '
1281 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001282 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001283 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001284
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 def GetUpstreamBranch(self):
1286 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001287 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001288 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001289 upstream_branch = upstream_branch.replace('refs/heads/',
1290 'refs/remotes/%s/' % remote)
1291 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1292 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 self.upstream_branch = upstream_branch
1294 return self.upstream_branch
1295
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001297 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001298 remote, branch = None, self.GetBranch()
1299 seen_branches = set()
1300 while branch not in seen_branches:
1301 seen_branches.add(branch)
1302 remote, branch = self.FetchUpstreamTuple(branch)
1303 branch = ShortBranchName(branch)
1304 if remote != '.' or branch.startswith('refs/remotes'):
1305 break
1306 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001307 remotes = RunGit(['remote'], error_ok=True).split()
1308 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001310 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001311 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001312 logging.warn('Could not determine which remote this change is '
1313 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001314 else:
1315 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001316 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 branch = 'HEAD'
1318 if branch.startswith('refs/remotes'):
1319 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001320 elif branch.startswith('refs/branch-heads/'):
1321 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 else:
1323 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001324 return self._remote
1325
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001326 def GitSanityChecks(self, upstream_git_obj):
1327 """Checks git repo status and ensures diff is from local commits."""
1328
sbc@chromium.org79706062015-01-14 21:18:12 +00001329 if upstream_git_obj is None:
1330 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001331 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001332 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001333 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001334 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001335 return False
1336
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001337 # Verify the commit we're diffing against is in our current branch.
1338 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1339 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1340 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001341 print('ERROR: %s is not in the current branch. You may need to rebase '
1342 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001343 return False
1344
1345 # List the commits inside the diff, and verify they are all local.
1346 commits_in_diff = RunGit(
1347 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1348 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1349 remote_branch = remote_branch.strip()
1350 if code != 0:
1351 _, remote_branch = self.GetRemoteBranch()
1352
1353 commits_in_remote = RunGit(
1354 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1355
1356 common_commits = set(commits_in_diff) & set(commits_in_remote)
1357 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001358 print('ERROR: Your diff contains %d commits already in %s.\n'
1359 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1360 'the diff. If you are using a custom git flow, you can override'
1361 ' the reference used for this check with "git config '
1362 'gitcl.remotebranch <git-ref>".' % (
1363 len(common_commits), remote_branch, upstream_git_obj),
1364 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001365 return False
1366 return True
1367
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001368 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001369 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001370
1371 Returns None if it is not set.
1372 """
tandrii5d48c322016-08-18 16:19:37 -07001373 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001374
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375 def GetRemoteUrl(self):
1376 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1377
1378 Returns None if there is no remote.
1379 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001380 is_cached, value = self._cached_remote_url
1381 if is_cached:
1382 return value
1383
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001384 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001385 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1386
Edward Lemur298f2cf2019-02-22 21:40:39 +00001387 # Check if the remote url can be parsed as an URL.
1388 host = urlparse.urlparse(url).netloc
1389 if host:
1390 self._cached_remote_url = (True, url)
1391 return url
1392
1393 # If it cannot be parsed as an url, assume it is a local directory, probably
1394 # a git cache.
1395 logging.warning('"%s" doesn\'t appear to point to a git host. '
1396 'Interpreting it as a local directory.', url)
1397 if not os.path.isdir(url):
1398 logging.error(
1399 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
1400 remote, url, self.GetBranch())
1401 return None
1402
1403 cache_path = url
1404 url = RunGit(['config', 'remote.%s.url' % remote],
1405 error_ok=True,
1406 cwd=url).strip()
1407
1408 host = urlparse.urlparse(url).netloc
1409 if not host:
1410 logging.error(
1411 'Remote "%(remote)s" for branch "%(branch)s" points to '
1412 '"%(cache_path)s", but it is misconfigured.\n'
1413 '"%(cache_path)s" must be a git repo and must have a remote named '
1414 '"%(remote)s" pointing to the git host.', {
1415 'remote': remote,
1416 'cache_path': cache_path,
1417 'branch': self.GetBranch()})
1418 return None
1419
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001420 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001421 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001423 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001424 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001425 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001426 self.issue = self._GitGetBranchConfigValue(
1427 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001428 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 return self.issue
1430
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 def GetIssueURL(self):
1432 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001433 issue = self.GetIssue()
1434 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001435 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001436 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001438 def GetDescription(self, pretty=False, force=False):
1439 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001440 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001441 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 self.has_description = True
1443 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001444 # Set width to 72 columns + 2 space indent.
1445 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001447 lines = self.description.splitlines()
1448 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001449 return self.description
1450
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001451 def GetDescriptionFooters(self):
1452 """Returns (non_footer_lines, footers) for the commit message.
1453
1454 Returns:
1455 non_footer_lines (list(str)) - Simple list of description lines without
1456 any footer. The lines do not contain newlines, nor does the list contain
1457 the empty line between the message and the footers.
1458 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1459 [("Change-Id", "Ideadbeef...."), ...]
1460 """
1461 raw_description = self.GetDescription()
1462 msg_lines, _, footers = git_footers.split_footers(raw_description)
1463 if footers:
1464 msg_lines = msg_lines[:len(msg_lines)-1]
1465 return msg_lines, footers
1466
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001467 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001468 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001469 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001470 self.patchset = self._GitGetBranchConfigValue(
1471 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001472 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001473 return self.patchset
1474
1475 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001476 """Set this branch's patchset. If patchset=0, clears the patchset."""
1477 assert self.GetBranch()
1478 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001479 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001480 else:
1481 self.patchset = int(patchset)
1482 self._GitSetBranchConfigValue(
1483 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001484
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001485 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001486 """Set this branch's issue. If issue isn't given, clears the issue."""
1487 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001488 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001489 issue = int(issue)
1490 self._GitSetBranchConfigValue(
1491 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001492 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001493 codereview_server = self._codereview_impl.GetCodereviewServer()
1494 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001495 self._GitSetBranchConfigValue(
1496 self._codereview_impl.CodereviewServerConfigKey(),
1497 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001498 else:
tandrii5d48c322016-08-18 16:19:37 -07001499 # Reset all of these just to be clean.
1500 reset_suffixes = [
1501 'last-upload-hash',
1502 self._codereview_impl.IssueConfigKey(),
1503 self._codereview_impl.PatchsetConfigKey(),
1504 self._codereview_impl.CodereviewServerConfigKey(),
1505 ] + self._PostUnsetIssueProperties()
1506 for prop in reset_suffixes:
1507 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001508 msg = RunGit(['log', '-1', '--format=%B']).strip()
1509 if msg and git_footers.get_footer_change_id(msg):
1510 print('WARNING: The change patched into this branch has a Change-Id. '
1511 'Removing it.')
1512 RunGit(['commit', '--amend', '-m',
1513 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001514 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001515 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001516
dnjba1b0f32016-09-02 12:37:42 -07001517 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001518 if not self.GitSanityChecks(upstream_branch):
1519 DieWithError('\nGit sanity check failure')
1520
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001521 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001522 if not root:
1523 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001524 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001525
1526 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001527 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001528 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001529 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001530 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001531 except subprocess2.CalledProcessError:
1532 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001533 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001534 'This branch probably doesn\'t exist anymore. To reset the\n'
1535 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001536 ' git branch --set-upstream-to origin/master %s\n'
1537 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001538 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001539
maruel@chromium.org52424302012-08-29 15:14:30 +00001540 issue = self.GetIssue()
1541 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001542 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001543 description = self.GetDescription()
1544 else:
1545 # If the change was never uploaded, use the log messages of all commits
1546 # up to the branch point, as git cl upload will prefill the description
1547 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001548 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1549 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001550
1551 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001552 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001553 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001554 name,
1555 description,
1556 absroot,
1557 files,
1558 issue,
1559 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001560 author,
1561 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001562
dsansomee2d6fd92016-09-08 00:10:47 -07001563 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001564 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001565 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001566 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001567
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001568 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1569 """Sets the description for this CL remotely.
1570
1571 You can get description_lines and footers with GetDescriptionFooters.
1572
1573 Args:
1574 description_lines (list(str)) - List of CL description lines without
1575 newline characters.
1576 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1577 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1578 `List-Of-Tokens`). It will be case-normalized so that each token is
1579 title-cased.
1580 """
1581 new_description = '\n'.join(description_lines)
1582 if footers:
1583 new_description += '\n'
1584 for k, v in footers:
1585 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1586 if not git_footers.FOOTER_PATTERN.match(foot):
1587 raise ValueError('Invalid footer %r' % foot)
1588 new_description += foot + '\n'
1589 self.UpdateDescription(new_description, force)
1590
Edward Lesmes8e282792018-04-03 18:50:29 -04001591 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001592 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1593 try:
1594 return presubmit_support.DoPresubmitChecks(change, committing,
1595 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1596 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001597 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1598 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001599 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001600 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001601
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001602 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1603 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001604 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1605 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001606 else:
1607 # Assume url.
1608 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1609 urlparse.urlparse(issue_arg))
1610 if not parsed_issue_arg or not parsed_issue_arg.valid:
1611 DieWithError('Failed to parse issue argument "%s". '
1612 'Must be an issue number or a valid URL.' % issue_arg)
1613 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001614 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001615
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616 def CMDUpload(self, options, git_diff_args, orig_args):
1617 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001618 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001619 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001621 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 else:
1623 if self.GetBranch() is None:
1624 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1625
1626 # Default to diffing against common ancestor of upstream branch
1627 base_branch = self.GetCommonAncestorWithUpstream()
1628 git_diff_args = [base_branch, 'HEAD']
1629
Aaron Gablec4c40d12017-05-22 11:49:53 -07001630
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001631 # Fast best-effort checks to abort before running potentially
1632 # expensive hooks if uploading is likely to fail anyway. Passing these
1633 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001634 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001635 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001636
1637 # Apply watchlists on upload.
1638 change = self.GetChange(base_branch, None)
1639 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1640 files = [f.LocalPath() for f in change.AffectedFiles()]
1641 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001642 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001643
1644 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001645 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001646 # Set the reviewer list now so that presubmit checks can access it.
1647 change_description = ChangeDescription(change.FullDescriptionText())
1648 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001649 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001650 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001651 change)
1652 change.SetDescriptionText(change_description.description)
1653 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001654 may_prompt=not options.force,
1655 verbose=options.verbose,
1656 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001657 if not hook_results.should_continue():
1658 return 1
1659 if not options.reviewers and hook_results.reviewers:
1660 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001661 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001662
Aaron Gable13101a62018-02-09 13:20:41 -08001663 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001664 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001665 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001666 _git_set_branch_config_value('last-upload-hash',
1667 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001668 # Run post upload hooks, if specified.
1669 if settings.GetRunPostUploadHook():
1670 presubmit_support.DoPostUploadExecuter(
1671 change,
1672 self,
1673 settings.GetRoot(),
1674 options.verbose,
1675 sys.stdout)
1676
1677 # Upload all dependencies if specified.
1678 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001679 print()
1680 print('--dependencies has been specified.')
1681 print('All dependent local branches will be re-uploaded.')
1682 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001683 # Remove the dependencies flag from args so that we do not end up in a
1684 # loop.
1685 orig_args.remove('--dependencies')
1686 ret = upload_branch_deps(self, orig_args)
1687 return ret
1688
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001689 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001690 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001691
1692 Issue must have been already uploaded and known.
1693 """
1694 assert new_state in _CQState.ALL_STATES
1695 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001696 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001697 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001698 return 0
1699 except KeyboardInterrupt:
1700 raise
1701 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001702 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001703 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001704 ' * Your project has no CQ,\n'
1705 ' * You don\'t have permission to change the CQ state,\n'
1706 ' * There\'s a bug in this code (see stack trace below).\n'
1707 'Consider specifying which bots to trigger manually or asking your '
1708 'project owners for permissions or contacting Chrome Infra at:\n'
1709 'https://www.chromium.org/infra\n\n' %
1710 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001711 # Still raise exception so that stack trace is printed.
1712 raise
1713
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001714 # Forward methods to codereview specific implementation.
1715
Aaron Gable636b13f2017-07-14 10:42:48 -07001716 def AddComment(self, message, publish=None):
1717 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001718
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001719 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001720 """Returns list of _CommentSummary for each comment.
1721
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001722 args:
1723 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001724 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001726
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001727 def CloseIssue(self):
1728 return self._codereview_impl.CloseIssue()
1729
1730 def GetStatus(self):
1731 return self._codereview_impl.GetStatus()
1732
1733 def GetCodereviewServer(self):
1734 return self._codereview_impl.GetCodereviewServer()
1735
tandriide281ae2016-10-12 06:02:30 -07001736 def GetIssueOwner(self):
1737 """Get owner from codereview, which may differ from this checkout."""
1738 return self._codereview_impl.GetIssueOwner()
1739
Edward Lemur707d70b2018-02-07 00:50:14 +01001740 def GetReviewers(self):
1741 return self._codereview_impl.GetReviewers()
1742
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001743 def GetMostRecentPatchset(self):
1744 return self._codereview_impl.GetMostRecentPatchset()
1745
tandriide281ae2016-10-12 06:02:30 -07001746 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001747 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001748 return self._codereview_impl.CannotTriggerTryJobReason()
1749
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001750 def GetTryJobProperties(self, patchset=None):
1751 """Returns dictionary of properties to launch try job."""
1752 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001753
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 def __getattr__(self, attr):
1755 # This is because lots of untested code accesses Rietveld-specific stuff
1756 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001757 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001758 # Note that child method defines __getattr__ as well, and forwards it here,
1759 # because _RietveldChangelistImpl is not cleaned up yet, and given
1760 # deprecation of Rietveld, it should probably be just removed.
1761 # Until that time, avoid infinite recursion by bypassing __getattr__
1762 # of implementation class.
1763 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764
1765
1766class _ChangelistCodereviewBase(object):
1767 """Abstract base class encapsulating codereview specifics of a changelist."""
1768 def __init__(self, changelist):
1769 self._changelist = changelist # instance of Changelist
1770
1771 def __getattr__(self, attr):
1772 # Forward methods to changelist.
1773 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1774 # _RietveldChangelistImpl to avoid this hack?
1775 return getattr(self._changelist, attr)
1776
1777 def GetStatus(self):
1778 """Apply a rough heuristic to give a simple summary of an issue's review
1779 or CQ status, assuming adherence to a common workflow.
1780
1781 Returns None if no issue for this branch, or specific string keywords.
1782 """
1783 raise NotImplementedError()
1784
1785 def GetCodereviewServer(self):
1786 """Returns server URL without end slash, like "https://codereview.com"."""
1787 raise NotImplementedError()
1788
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001789 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001790 """Fetches and returns description from the codereview server."""
1791 raise NotImplementedError()
1792
tandrii5d48c322016-08-18 16:19:37 -07001793 @classmethod
1794 def IssueConfigKey(cls):
1795 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 raise NotImplementedError()
1797
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001798 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001799 def PatchsetConfigKey(cls):
1800 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 raise NotImplementedError()
1802
tandrii5d48c322016-08-18 16:19:37 -07001803 @classmethod
1804 def CodereviewServerConfigKey(cls):
1805 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001806 raise NotImplementedError()
1807
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001808 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001809 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001810 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001811
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001812 def GetGerritObjForPresubmit(self):
1813 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1814 return None
1815
dsansomee2d6fd92016-09-08 00:10:47 -07001816 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001817 """Update the description on codereview site."""
1818 raise NotImplementedError()
1819
Aaron Gable636b13f2017-07-14 10:42:48 -07001820 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001821 """Posts a comment to the codereview site."""
1822 raise NotImplementedError()
1823
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001824 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001825 raise NotImplementedError()
1826
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001827 def CloseIssue(self):
1828 """Closes the issue."""
1829 raise NotImplementedError()
1830
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001831 def GetMostRecentPatchset(self):
1832 """Returns the most recent patchset number from the codereview site."""
1833 raise NotImplementedError()
1834
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001835 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001836 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001837 """Fetches and applies the issue.
1838
1839 Arguments:
1840 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1841 reject: if True, reject the failed patch instead of switching to 3-way
1842 merge. Rietveld only.
1843 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1844 only.
1845 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001846 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001847 """
1848 raise NotImplementedError()
1849
1850 @staticmethod
1851 def ParseIssueURL(parsed_url):
1852 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1853 failed."""
1854 raise NotImplementedError()
1855
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001856 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001857 """Best effort check that user is authenticated with codereview server.
1858
1859 Arguments:
1860 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001861 refresh: whether to attempt to refresh credentials. Ignored if not
1862 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001863 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864 raise NotImplementedError()
1865
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001866 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001867 """Best effort check that uploading isn't supposed to fail for predictable
1868 reasons.
1869
1870 This method should raise informative exception if uploading shouldn't
1871 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872
1873 Arguments:
1874 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001875 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001876 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001877
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001878 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001879 """Uploads a change to codereview."""
1880 raise NotImplementedError()
1881
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001882 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001883 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001884
1885 Issue must have been already uploaded and known.
1886 """
1887 raise NotImplementedError()
1888
tandriie113dfd2016-10-11 10:20:12 -07001889 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001890 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001891 raise NotImplementedError()
1892
tandriide281ae2016-10-12 06:02:30 -07001893 def GetIssueOwner(self):
1894 raise NotImplementedError()
1895
Edward Lemur707d70b2018-02-07 00:50:14 +01001896 def GetReviewers(self):
1897 raise NotImplementedError()
1898
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001899 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001900 raise NotImplementedError()
1901
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001902
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001904 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905 # auth_config is Rietveld thing, kept here to preserve interface only.
1906 super(_GerritChangelistImpl, self).__init__(changelist)
1907 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001908 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001909 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001911 # Map from change number (issue) to its detail cache.
1912 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001914 if codereview_host is not None:
1915 assert not codereview_host.startswith('https://'), codereview_host
1916 self._gerrit_host = codereview_host
1917 self._gerrit_server = 'https://%s' % codereview_host
1918
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919 def _GetGerritHost(self):
1920 # Lazy load of configs.
1921 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001922 if self._gerrit_host and '.' not in self._gerrit_host:
1923 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1924 # This happens for internal stuff http://crbug.com/614312.
1925 parsed = urlparse.urlparse(self.GetRemoteUrl())
1926 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001927 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07001928 ' Your current remote is: %s' % self.GetRemoteUrl())
1929 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1930 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001931 return self._gerrit_host
1932
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001933 def _GetGitHost(self):
1934 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001935 remote_url = self.GetRemoteUrl()
1936 if not remote_url:
1937 return None
1938 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001939
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001940 def GetCodereviewServer(self):
1941 if not self._gerrit_server:
1942 # If we're on a branch then get the server potentially associated
1943 # with that branch.
1944 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001945 self._gerrit_server = self._GitGetBranchConfigValue(
1946 self.CodereviewServerConfigKey())
1947 if self._gerrit_server:
1948 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949 if not self._gerrit_server:
1950 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1951 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001952 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001953 parts[0] = parts[0] + '-review'
1954 self._gerrit_host = '.'.join(parts)
1955 self._gerrit_server = 'https://%s' % self._gerrit_host
1956 return self._gerrit_server
1957
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001958 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001959 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001960 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001961 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001962 logging.warn('can\'t detect Gerrit project.')
1963 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001964 project = urlparse.urlparse(remote_url).path.strip('/')
1965 if project.endswith('.git'):
1966 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001967 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1968 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1969 # gitiles/git-over-https protocol. E.g.,
1970 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1971 # as
1972 # https://chromium.googlesource.com/v8/v8
1973 if project.startswith('a/'):
1974 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001975 return project
1976
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001977 def _GerritChangeIdentifier(self):
1978 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1979
1980 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001981 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001982 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001983 project = self._GetGerritProject()
1984 if project:
1985 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1986 # Fall back on still unique, but less efficient change number.
1987 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001988
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001989 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001990 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001991 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001992
tandrii5d48c322016-08-18 16:19:37 -07001993 @classmethod
1994 def PatchsetConfigKey(cls):
1995 return 'gerritpatchset'
1996
1997 @classmethod
1998 def CodereviewServerConfigKey(cls):
1999 return 'gerritserver'
2000
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002001 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002002 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002003 if settings.GetGerritSkipEnsureAuthenticated():
2004 # For projects with unusual authentication schemes.
2005 # See http://crbug.com/603378.
2006 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002007
2008 # Check presence of cookies only if using cookies-based auth method.
2009 cookie_auth = gerrit_util.Authenticator.get()
2010 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002011 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002012
Daniel Chengcf6269b2019-05-18 01:02:12 +00002013 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
2014 print('WARNING: Ignoring branch %s with non-https remote %s' %
2015 (self._changelist.branch, self.GetRemoteUrl()))
2016 return
2017
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002018 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002019 self.GetCodereviewServer()
2020 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002021 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002022
2023 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2024 git_auth = cookie_auth.get_auth_header(git_host)
2025 if gerrit_auth and git_auth:
2026 if gerrit_auth == git_auth:
2027 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002028 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002029 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002030 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002031 ' %s\n'
2032 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002033 ' Consider running the following command:\n'
2034 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002035 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002036 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002037 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002038 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002039 cookie_auth.get_new_password_message(git_host)))
2040 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002041 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002042 return
2043 else:
2044 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002045 ([] if gerrit_auth else [self._gerrit_host]) +
2046 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002047 DieWithError('Credentials for the following hosts are required:\n'
2048 ' %s\n'
2049 'These are read from %s (or legacy %s)\n'
2050 '%s' % (
2051 '\n '.join(missing),
2052 cookie_auth.get_gitcookies_path(),
2053 cookie_auth.get_netrc_path(),
2054 cookie_auth.get_new_password_message(git_host)))
2055
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002056 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002057 if not self.GetIssue():
2058 return
2059
2060 # Warm change details cache now to avoid RPCs later, reducing latency for
2061 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002062 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002063 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002064
2065 status = self._GetChangeDetail()['status']
2066 if status in ('MERGED', 'ABANDONED'):
2067 DieWithError('Change %s has been %s, new uploads are not allowed' %
2068 (self.GetIssueURL(),
2069 'submitted' if status == 'MERGED' else 'abandoned'))
2070
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002071 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2072 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2073 # Apparently this check is not very important? Otherwise get_auth_email
2074 # could have been added to other implementations of Authenticator.
2075 cookies_auth = gerrit_util.Authenticator.get()
2076 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002077 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002078
2079 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002080 if self.GetIssueOwner() == cookies_user:
2081 return
2082 logging.debug('change %s owner is %s, cookies user is %s',
2083 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002084 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002085 # so ask what Gerrit thinks of this user.
2086 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2087 if details['email'] == self.GetIssueOwner():
2088 return
2089 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002090 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002091 'as %s.\n'
2092 'Uploading may fail due to lack of permissions.' %
2093 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2094 confirm_or_exit(action='upload')
2095
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002096 def _PostUnsetIssueProperties(self):
2097 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002098 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002099
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002100 def GetGerritObjForPresubmit(self):
2101 return presubmit_support.GerritAccessor(self._GetGerritHost())
2102
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002103 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002104 """Apply a rough heuristic to give a simple summary of an issue's review
2105 or CQ status, assuming adherence to a common workflow.
2106
2107 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002108 * 'error' - error from review tool (including deleted issues)
2109 * 'unsent' - no reviewers added
2110 * 'waiting' - waiting for review
2111 * 'reply' - waiting for uploader to reply to review
2112 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002113 * 'dry-run' - dry-running in the commit queue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002114 * 'commit' - in the commit queue
2115 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002116 """
2117 if not self.GetIssue():
2118 return None
2119
2120 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002121 data = self._GetChangeDetail([
2122 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002123 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002124 return 'error'
2125
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002126 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002127 return 'closed'
2128
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002129 cq_label = data['labels'].get('Commit-Queue', {})
2130 max_cq_vote = 0
2131 for vote in cq_label.get('all', []):
2132 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2133 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002134 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002135 if max_cq_vote == 1:
2136 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002137
Aaron Gable9ab38c62017-04-06 14:36:33 -07002138 if data['labels'].get('Code-Review', {}).get('approved'):
2139 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002140
2141 if not data.get('reviewers', {}).get('REVIEWER', []):
2142 return 'unsent'
2143
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002144 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002145 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2146 last_message_author = messages.pop().get('author', {})
2147 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002148 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2149 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002150 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002151 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002152 if last_message_author.get('_account_id') == owner:
2153 # Most recent message was by owner.
2154 return 'waiting'
2155 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002156 # Some reply from non-owner.
2157 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002158
2159 # Somehow there are no messages even though there are reviewers.
2160 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002161
2162 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002163 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002164 patchset = data['revisions'][data['current_revision']]['_number']
2165 self.SetPatchset(patchset)
2166 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002167
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002168 def FetchDescription(self, force=False):
2169 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2170 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002171 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00002172 return data['revisions'][current_rev]['commit']['message'].encode(
2173 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002174
dsansomee2d6fd92016-09-08 00:10:47 -07002175 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002176 if gerrit_util.HasPendingChangeEdit(
2177 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002178 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002179 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002180 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002181 'unpublished edit. Either publish the edit in the Gerrit web UI '
2182 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002183
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002184 gerrit_util.DeletePendingChangeEdit(
2185 self._GetGerritHost(), self._GerritChangeIdentifier())
2186 gerrit_util.SetCommitMessage(
2187 self._GetGerritHost(), self._GerritChangeIdentifier(),
2188 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002189
Aaron Gable636b13f2017-07-14 10:42:48 -07002190 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002191 gerrit_util.SetReview(
2192 self._GetGerritHost(), self._GerritChangeIdentifier(),
2193 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002194
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002195 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002196 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002197 # CURRENT_REVISION is included to get the latest patchset so that
2198 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002199 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002200 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2201 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002202 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002203 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002204 robot_file_comments = gerrit_util.GetChangeRobotComments(
2205 self._GetGerritHost(), self._GerritChangeIdentifier())
2206
2207 # Add the robot comments onto the list of comments, but only
2208 # keep those that are from the latest pachset.
2209 latest_patch_set = self.GetMostRecentPatchset()
2210 for path, robot_comments in robot_file_comments.iteritems():
2211 line_comments = file_comments.setdefault(path, [])
2212 line_comments.extend(
2213 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002214
2215 # Build dictionary of file comments for easy access and sorting later.
2216 # {author+date: {path: {patchset: {line: url+message}}}}
2217 comments = collections.defaultdict(
2218 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2219 for path, line_comments in file_comments.iteritems():
2220 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002221 tag = comment.get('tag', '')
2222 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002223 continue
2224 key = (comment['author']['email'], comment['updated'])
2225 if comment.get('side', 'REVISION') == 'PARENT':
2226 patchset = 'Base'
2227 else:
2228 patchset = 'PS%d' % comment['patch_set']
2229 line = comment.get('line', 0)
2230 url = ('https://%s/c/%s/%s/%s#%s%s' %
2231 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2232 'b' if comment.get('side') == 'PARENT' else '',
2233 str(line) if line else ''))
2234 comments[key][path][patchset][line] = (url, comment['message'])
2235
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002236 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002237 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002238 summary = self._BuildCommentSummary(msg, comments, readable)
2239 if summary:
2240 summaries.append(summary)
2241 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002242
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002243 @staticmethod
2244 def _BuildCommentSummary(msg, comments, readable):
2245 key = (msg['author']['email'], msg['date'])
2246 # Don't bother showing autogenerated messages that don't have associated
2247 # file or line comments. this will filter out most autogenerated
2248 # messages, but will keep robot comments like those from Tricium.
2249 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2250 if is_autogenerated and not comments.get(key):
2251 return None
2252 message = msg['message']
2253 # Gerrit spits out nanoseconds.
2254 assert len(msg['date'].split('.')[-1]) == 9
2255 date = datetime.datetime.strptime(msg['date'][:-3],
2256 '%Y-%m-%d %H:%M:%S.%f')
2257 if key in comments:
2258 message += '\n'
2259 for path, patchsets in sorted(comments.get(key, {}).items()):
2260 if readable:
2261 message += '\n%s' % path
2262 for patchset, lines in sorted(patchsets.items()):
2263 for line, (url, content) in sorted(lines.items()):
2264 if line:
2265 line_str = 'Line %d' % line
2266 path_str = '%s:%d:' % (path, line)
2267 else:
2268 line_str = 'File comment'
2269 path_str = '%s:0:' % path
2270 if readable:
2271 message += '\n %s, %s: %s' % (patchset, line_str, url)
2272 message += '\n %s\n' % content
2273 else:
2274 message += '\n%s ' % path_str
2275 message += '\n%s\n' % content
2276
2277 return _CommentSummary(
2278 date=date,
2279 message=message,
2280 sender=msg['author']['email'],
2281 autogenerated=is_autogenerated,
2282 # These could be inferred from the text messages and correlated with
2283 # Code-Review label maximum, however this is not reliable.
2284 # Leaving as is until the need arises.
2285 approval=False,
2286 disapproval=False,
2287 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002288
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002289 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002290 gerrit_util.AbandonChange(
2291 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002292
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002293 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002294 gerrit_util.SubmitChange(
2295 self._GetGerritHost(), self._GerritChangeIdentifier(),
2296 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002297
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002298 def _GetChangeDetail(self, options=None, no_cache=False):
2299 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002300
2301 If fresh data is needed, set no_cache=True which will clear cache and
2302 thus new data will be fetched from Gerrit.
2303 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002305 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002306
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002307 # Optimization to avoid multiple RPCs:
2308 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2309 'CURRENT_COMMIT' not in options):
2310 options.append('CURRENT_COMMIT')
2311
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002312 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002313 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002314 options = [o.upper() for o in options]
2315
2316 # Check in cache first unless no_cache is True.
2317 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002318 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002319 else:
2320 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002321 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002322 # Assumption: data fetched before with extra options is suitable
2323 # for return for a smaller set of options.
2324 # For example, if we cached data for
2325 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2326 # and request is for options=[CURRENT_REVISION],
2327 # THEN we can return prior cached data.
2328 if options_set.issubset(cached_options_set):
2329 return data
2330
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002331 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002332 data = gerrit_util.GetChangeDetail(
2333 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002334 except gerrit_util.GerritError as e:
2335 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002336 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002337 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002338
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002339 self._detail_cache.setdefault(cache_key, []).append(
2340 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002341 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002342
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002343 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002344 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002345 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002346 data = gerrit_util.GetChangeCommit(
2347 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002348 except gerrit_util.GerritError as e:
2349 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002350 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002351 raise
agable32978d92016-11-01 12:55:02 -07002352 return data
2353
Karen Qian40c19422019-03-13 21:28:29 +00002354 def _IsCqConfigured(self):
2355 detail = self._GetChangeDetail(['LABELS'])
2356 if not u'Commit-Queue' in detail.get('labels', {}):
2357 return False
2358 # TODO(crbug/753213): Remove temporary hack
2359 if ('https://chromium.googlesource.com/chromium/src' ==
2360 self._changelist.GetRemoteUrl() and
2361 detail['branch'].startswith('refs/branch-heads/')):
2362 return False
2363 return True
2364
Olivier Robin75ee7252018-04-13 10:02:56 +02002365 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002366 if git_common.is_dirty_git_tree('land'):
2367 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002368
tandriid60367b2016-06-22 05:25:12 -07002369 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002370 if not force and self._IsCqConfigured():
2371 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002372 'which can test and land changes for you. '
2373 'Are you sure you wish to bypass it?\n',
2374 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002375 differs = True
tandriic4344b52016-08-29 06:04:54 -07002376 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002377 # Note: git diff outputs nothing if there is no diff.
2378 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002379 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002380 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002381 if detail['current_revision'] == last_upload:
2382 differs = False
2383 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002384 print('WARNING: Local branch contents differ from latest uploaded '
2385 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002386 if differs:
2387 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002388 confirm_or_exit(
2389 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2390 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002391 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002392 elif not bypass_hooks:
2393 hook_results = self.RunHook(
2394 committing=True,
2395 may_prompt=not force,
2396 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002397 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2398 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002399 if not hook_results.should_continue():
2400 return 1
2401
2402 self.SubmitIssue(wait_for_merge=True)
2403 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002404 links = self._GetChangeCommit().get('web_links', [])
2405 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002406 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002407 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002408 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002409 return 0
2410
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002411 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002412 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002413 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002414 assert not directory
2415 assert parsed_issue_arg.valid
2416
2417 self._changelist.issue = parsed_issue_arg.issue
2418
2419 if parsed_issue_arg.hostname:
2420 self._gerrit_host = parsed_issue_arg.hostname
2421 self._gerrit_server = 'https://%s' % self._gerrit_host
2422
tandriic2405f52016-10-10 08:13:15 -07002423 try:
2424 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002425 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002426 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002427
2428 if not parsed_issue_arg.patchset:
2429 # Use current revision by default.
2430 revision_info = detail['revisions'][detail['current_revision']]
2431 patchset = int(revision_info['_number'])
2432 else:
2433 patchset = parsed_issue_arg.patchset
2434 for revision_info in detail['revisions'].itervalues():
2435 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2436 break
2437 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002438 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002439 (parsed_issue_arg.patchset, self.GetIssue()))
2440
Aaron Gable697a91b2018-01-19 15:20:15 -08002441 remote_url = self._changelist.GetRemoteUrl()
2442 if remote_url.endswith('.git'):
2443 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002444 remote_url = remote_url.rstrip('/')
2445
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002446 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002447 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002448
2449 if remote_url != fetch_info['url']:
2450 DieWithError('Trying to patch a change from %s but this repo appears '
2451 'to be %s.' % (fetch_info['url'], remote_url))
2452
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002453 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002454
Aaron Gable62619a32017-06-16 08:22:09 -07002455 if force:
2456 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2457 print('Checked out commit for change %i patchset %i locally' %
2458 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002459 elif nocommit:
2460 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2461 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002462 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002463 RunGit(['cherry-pick', 'FETCH_HEAD'])
2464 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002465 (parsed_issue_arg.issue, patchset))
2466 print('Note: this created a local commit which does not have '
2467 'the same hash as the one uploaded for review. This will make '
2468 'uploading changes based on top of this branch difficult.\n'
2469 'If you want to do that, use "git cl patch --force" instead.')
2470
Stefan Zagerd08043c2017-10-12 12:07:02 -07002471 if self.GetBranch():
2472 self.SetIssue(parsed_issue_arg.issue)
2473 self.SetPatchset(patchset)
2474 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2475 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2476 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2477 else:
2478 print('WARNING: You are in detached HEAD state.\n'
2479 'The patch has been applied to your checkout, but you will not be '
2480 'able to upload a new patch set to the gerrit issue.\n'
2481 'Try using the \'-b\' option if you would like to work on a '
2482 'branch and/or upload a new patch set.')
2483
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002484 return 0
2485
2486 @staticmethod
2487 def ParseIssueURL(parsed_url):
2488 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2489 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002490 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2491 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002492 # Short urls like https://domain/<issue_number> can be used, but don't allow
2493 # specifying the patchset (you'd 404), but we allow that here.
2494 if parsed_url.path == '/':
2495 part = parsed_url.fragment
2496 else:
2497 part = parsed_url.path
Bruce Dawson9c062012019-05-02 19:20:28 +00002498 match = re.match(r'(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002499 if match:
2500 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002501 issue=int(match.group(3)),
2502 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002503 hostname=parsed_url.netloc,
2504 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002505 return None
2506
tandrii16e0b4e2016-06-07 10:34:28 -07002507 def _GerritCommitMsgHookCheck(self, offer_removal):
2508 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2509 if not os.path.exists(hook):
2510 return
2511 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2512 # custom developer made one.
2513 data = gclient_utils.FileRead(hook)
2514 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2515 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002516 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002517 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002518 'and may interfere with it in subtle ways.\n'
2519 'We recommend you remove the commit-msg hook.')
2520 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002521 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002522 gclient_utils.rm_file_or_tree(hook)
2523 print('Gerrit commit-msg hook removed.')
2524 else:
2525 print('OK, will keep Gerrit commit-msg hook in place.')
2526
Edward Lemur1b52d872019-05-09 21:12:12 +00002527 def _CleanUpOldTraces(self):
2528 """Keep only the last |MAX_TRACES| traces."""
2529 try:
2530 traces = sorted([
2531 os.path.join(TRACES_DIR, f)
2532 for f in os.listdir(TRACES_DIR)
2533 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2534 and not f.startswith('tmp'))
2535 ])
2536 traces_to_delete = traces[:-MAX_TRACES]
2537 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002538 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002539 except OSError:
2540 print('WARNING: Failed to remove old git traces from\n'
2541 ' %s'
2542 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002543
Edward Lemur5737f022019-05-17 01:24:00 +00002544 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002545 """Zip and write the git push traces stored in traces_dir."""
2546 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002547 traces_zip = trace_name + '-traces'
2548 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002549 # Create a temporary dir to store git config and gitcookies in. It will be
2550 # compressed and stored next to the traces.
2551 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002552 git_info_zip = trace_name + '-git-info'
2553
Edward Lemur5737f022019-05-17 01:24:00 +00002554 git_push_metadata['now'] = datetime_now().strftime('%c')
sangwoo.ko7a614332019-05-22 02:46:19 +00002555 if sys.stdin.encoding != 'utf-8':
2556 git_push_metadata['now'] = git_push_metadata['now'].decode(
2557 sys.stdin.encoding)
2558
Edward Lemur1b52d872019-05-09 21:12:12 +00002559 git_push_metadata['trace_name'] = trace_name
2560 gclient_utils.FileWrite(
2561 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2562
2563 # Keep only the first 6 characters of the git hashes on the packet
2564 # trace. This greatly decreases size after compression.
2565 packet_traces = os.path.join(traces_dir, 'trace-packet')
2566 if os.path.isfile(packet_traces):
2567 contents = gclient_utils.FileRead(packet_traces)
2568 gclient_utils.FileWrite(
2569 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2570 shutil.make_archive(traces_zip, 'zip', traces_dir)
2571
2572 # Collect and compress the git config and gitcookies.
2573 git_config = RunGit(['config', '-l'])
2574 gclient_utils.FileWrite(
2575 os.path.join(git_info_dir, 'git-config'),
2576 git_config)
2577
2578 cookie_auth = gerrit_util.Authenticator.get()
2579 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2580 gitcookies_path = cookie_auth.get_gitcookies_path()
2581 if os.path.isfile(gitcookies_path):
2582 gitcookies = gclient_utils.FileRead(gitcookies_path)
2583 gclient_utils.FileWrite(
2584 os.path.join(git_info_dir, 'gitcookies'),
2585 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2586 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2587
Edward Lemur1b52d872019-05-09 21:12:12 +00002588 gclient_utils.rmtree(git_info_dir)
2589
2590 def _RunGitPushWithTraces(
2591 self, change_desc, refspec, refspec_opts, git_push_metadata):
2592 """Run git push and collect the traces resulting from the execution."""
2593 # Create a temporary directory to store traces in. Traces will be compressed
2594 # and stored in a 'traces' dir inside depot_tools.
2595 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002596 trace_name = os.path.join(
2597 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002598
2599 env = os.environ.copy()
2600 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2601 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002602 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002603 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2604 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2605 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2606
2607 try:
2608 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002609 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002610 before_push = time_time()
2611 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002612 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002613 env=env,
2614 print_stdout=True,
2615 # Flush after every line: useful for seeing progress when running as
2616 # recipe.
2617 filter_fn=lambda _: sys.stdout.flush())
2618 except subprocess2.CalledProcessError as e:
2619 push_returncode = e.returncode
2620 DieWithError('Failed to create a change. Please examine output above '
2621 'for the reason of the failure.\n'
2622 'Hint: run command below to diagnose common Git/Gerrit '
2623 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002624 ' git cl creds-check\n'
2625 '\n'
2626 'If git-cl is not working correctly, file a bug under the '
2627 'Infra>SDK component including the files below.\n'
2628 'Review the files before upload, since they might contain '
2629 'sensitive information.\n'
2630 'Set the Restrict-View-Google label so that they are not '
2631 'publicly accessible.\n'
2632 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002633 change_desc)
2634 finally:
2635 execution_time = time_time() - before_push
2636 metrics.collector.add_repeated('sub_commands', {
2637 'command': 'git push',
2638 'execution_time': execution_time,
2639 'exit_code': push_returncode,
2640 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2641 })
2642
Edward Lemur1b52d872019-05-09 21:12:12 +00002643 git_push_metadata['execution_time'] = execution_time
2644 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002645 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002646
Edward Lemur1b52d872019-05-09 21:12:12 +00002647 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002648 gclient_utils.rmtree(traces_dir)
2649
2650 return push_stdout
2651
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002652 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002653 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002654 if options.squash and options.no_squash:
2655 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002656
2657 if not options.squash and not options.no_squash:
2658 # Load default for user, repo, squash=true, in this order.
2659 options.squash = settings.GetSquashGerritUploads()
2660 elif options.no_squash:
2661 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002662
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002663 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002664 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002665 # This may be None; default fallback value is determined in logic below.
2666 title = options.title
2667
Dominic Battre7d1c4842017-10-27 09:17:28 +02002668 # Extract bug number from branch name.
2669 bug = options.bug
2670 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2671 if not bug and match:
2672 bug = match.group(1)
2673
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002674 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002675 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002676 if self.GetIssue():
2677 # Try to get the message from a previous upload.
2678 message = self.GetDescription()
2679 if not message:
2680 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002681 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002682 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002683 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002684 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002685 # When uploading a subsequent patchset, -m|--message is taken
2686 # as the patchset title if --title was not provided.
2687 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002688 else:
2689 default_title = RunGit(
2690 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002691 if options.force:
2692 title = default_title
2693 else:
2694 title = ask_for_data(
2695 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002696 change_id = self._GetChangeDetail()['change_id']
2697 while True:
2698 footer_change_ids = git_footers.get_footer_change_id(message)
2699 if footer_change_ids == [change_id]:
2700 break
2701 if not footer_change_ids:
2702 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002703 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002704 continue
2705 # There is already a valid footer but with different or several ids.
2706 # Doing this automatically is non-trivial as we don't want to lose
2707 # existing other footers, yet we want to append just 1 desired
2708 # Change-Id. Thus, just create a new footer, but let user verify the
2709 # new description.
2710 message = '%s\n\nChange-Id: %s' % (message, change_id)
2711 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002712 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002713 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002714 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002715 'Please, check the proposed correction to the description, '
2716 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2717 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2718 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002719 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002720 if not options.force:
2721 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002722 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002723 message = change_desc.description
2724 if not message:
2725 DieWithError("Description is empty. Aborting...")
2726 # Continue the while loop.
2727 # Sanity check of this code - we should end up with proper message
2728 # footer.
2729 assert [change_id] == git_footers.get_footer_change_id(message)
2730 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002731 else: # if not self.GetIssue()
2732 if options.message:
2733 message = options.message
2734 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002735 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002736 if options.title:
2737 message = options.title + '\n\n' + message
2738 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002739
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002740 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002741 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002742 # On first upload, patchset title is always this string, while
2743 # --title flag gets converted to first line of message.
2744 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002745 if not change_desc.description:
2746 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002747 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002748 if len(change_ids) > 1:
2749 DieWithError('too many Change-Id footers, at most 1 allowed.')
2750 if not change_ids:
2751 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002752 change_desc.set_description(git_footers.add_footer_change_id(
2753 change_desc.description,
2754 GenerateGerritChangeId(change_desc.description)))
2755 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756 assert len(change_ids) == 1
2757 change_id = change_ids[0]
2758
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002759 if options.reviewers or options.tbrs or options.add_owners_to:
2760 change_desc.update_reviewers(options.reviewers, options.tbrs,
2761 options.add_owners_to, change)
2762
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002764 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2765 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002767 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2768 desc_tempfile.write(change_desc.description)
2769 desc_tempfile.close()
2770 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2771 '-F', desc_tempfile.name]).strip()
2772 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002773 else:
2774 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002775 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776 if not change_desc.description:
2777 DieWithError("Description is empty. Aborting...")
2778
2779 if not git_footers.get_footer_change_id(change_desc.description):
2780 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002781 change_desc.set_description(
2782 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002783 if options.reviewers or options.tbrs or options.add_owners_to:
2784 change_desc.update_reviewers(options.reviewers, options.tbrs,
2785 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002786 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002787 # For no-squash mode, we assume the remote called "origin" is the one we
2788 # want. It is not worthwhile to support different workflows for
2789 # no-squash mode.
2790 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002791 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2792
2793 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002794 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2796 ref_to_push)]).splitlines()
2797 if len(commits) > 1:
2798 print('WARNING: This will upload %d commits. Run the following command '
2799 'to see which commits will be uploaded: ' % len(commits))
2800 print('git log %s..%s' % (parent, ref_to_push))
2801 print('You can also use `git squash-branch` to squash these into a '
2802 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002803 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002804
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002805 if options.reviewers or options.tbrs or options.add_owners_to:
2806 change_desc.update_reviewers(options.reviewers, options.tbrs,
2807 options.add_owners_to, change)
2808
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002809 reviewers = sorted(change_desc.get_reviewers())
2810 # Add cc's from the CC_LIST and --cc flag (if any).
2811 if not options.private and not options.no_autocc:
2812 cc = self.GetCCList().split(',')
2813 else:
2814 cc = []
2815 if options.cc:
2816 cc.extend(options.cc)
2817 cc = filter(None, [email.strip() for email in cc])
2818 if change_desc.get_cced():
2819 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002820 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2821 valid_accounts = set(reviewers + cc)
2822 # TODO(crbug/877717): relax this for all hosts.
2823 else:
2824 valid_accounts = gerrit_util.ValidAccounts(
2825 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002826 logging.info('accounts %s are recognized, %s invalid',
2827 sorted(valid_accounts),
2828 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002829
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002830 # Extra options that can be specified at push time. Doc:
2831 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002832 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002833
Aaron Gable844cf292017-06-28 11:32:59 -07002834 # By default, new changes are started in WIP mode, and subsequent patchsets
2835 # don't send email. At any time, passing --send-mail will mark the change
2836 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002837 if options.send_mail:
2838 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002839 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002840 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002841 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002842 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002843 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002844
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002845 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002846 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002847
Aaron Gable9b713dd2016-12-14 16:04:21 -08002848 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002849 # Punctuation and whitespace in |title| must be percent-encoded.
2850 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002851
agablec6787972016-09-09 16:13:34 -07002852 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002853 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002854
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002855 for r in sorted(reviewers):
2856 if r in valid_accounts:
2857 refspec_opts.append('r=%s' % r)
2858 reviewers.remove(r)
2859 else:
2860 # TODO(tandrii): this should probably be a hard failure.
2861 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2862 % r)
2863 for c in sorted(cc):
2864 # refspec option will be rejected if cc doesn't correspond to an
2865 # account, even though REST call to add such arbitrary cc may succeed.
2866 if c in valid_accounts:
2867 refspec_opts.append('cc=%s' % c)
2868 cc.remove(c)
2869
rmistry9eadede2016-09-19 11:22:43 -07002870 if options.topic:
2871 # Documentation on Gerrit topics is here:
2872 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002873 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002874
Edward Lemur687ca902018-12-05 02:30:30 +00002875 if options.enable_auto_submit:
2876 refspec_opts.append('l=Auto-Submit+1')
2877 if options.use_commit_queue:
2878 refspec_opts.append('l=Commit-Queue+2')
2879 elif options.cq_dry_run:
2880 refspec_opts.append('l=Commit-Queue+1')
2881
2882 if change_desc.get_reviewers(tbr_only=True):
2883 score = gerrit_util.GetCodeReviewTbrScore(
2884 self._GetGerritHost(),
2885 self._GetGerritProject())
2886 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002887
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002888 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002889 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002890 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002891 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002892 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2893
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002894 refspec_suffix = ''
2895 if refspec_opts:
2896 refspec_suffix = '%' + ','.join(refspec_opts)
2897 assert ' ' not in refspec_suffix, (
2898 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2899 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2900
Edward Lemur1b52d872019-05-09 21:12:12 +00002901 git_push_metadata = {
2902 'gerrit_host': self._GetGerritHost(),
2903 'title': title or '<untitled>',
2904 'change_id': change_id,
2905 'description': change_desc.description,
2906 }
2907 push_stdout = self._RunGitPushWithTraces(
2908 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002909
2910 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002911 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 change_numbers = [m.group(1)
2913 for m in map(regex.match, push_stdout.splitlines())
2914 if m]
2915 if len(change_numbers) != 1:
2916 DieWithError(
2917 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002918 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002920 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002921
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002922 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002923 # GetIssue() is not set in case of non-squash uploads according to tests.
2924 # TODO(agable): non-squash uploads in git cl should be removed.
2925 gerrit_util.AddReviewers(
2926 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002927 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002928 reviewers, cc,
2929 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002930
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002931 return 0
2932
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002933 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2934 change_desc):
2935 """Computes parent of the generated commit to be uploaded to Gerrit.
2936
2937 Returns revision or a ref name.
2938 """
2939 if custom_cl_base:
2940 # Try to avoid creating additional unintended CLs when uploading, unless
2941 # user wants to take this risk.
2942 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2943 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2944 local_ref_of_target_remote])
2945 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002946 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002947 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2948 'If you proceed with upload, more than 1 CL may be created by '
2949 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2950 'If you are certain that specified base `%s` has already been '
2951 'uploaded to Gerrit as another CL, you may proceed.\n' %
2952 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2953 if not force:
2954 confirm_or_exit(
2955 'Do you take responsibility for cleaning up potential mess '
2956 'resulting from proceeding with upload?',
2957 action='upload')
2958 return custom_cl_base
2959
Aaron Gablef97e33d2017-03-30 15:44:27 -07002960 if remote != '.':
2961 return self.GetCommonAncestorWithUpstream()
2962
2963 # If our upstream branch is local, we base our squashed commit on its
2964 # squashed version.
2965 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2966
Aaron Gablef97e33d2017-03-30 15:44:27 -07002967 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002968 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002969
2970 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002971 # TODO(tandrii): consider checking parent change in Gerrit and using its
2972 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2973 # the tree hash of the parent branch. The upside is less likely bogus
2974 # requests to reupload parent change just because it's uploadhash is
2975 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002976 parent = RunGit(['config',
2977 'branch.%s.gerritsquashhash' % upstream_branch_name],
2978 error_ok=True).strip()
2979 # Verify that the upstream branch has been uploaded too, otherwise
2980 # Gerrit will create additional CLs when uploading.
2981 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2982 RunGitSilent(['rev-parse', parent + ':'])):
2983 DieWithError(
2984 '\nUpload upstream branch %s first.\n'
2985 'It is likely that this branch has been rebased since its last '
2986 'upload, so you just need to upload it again.\n'
2987 '(If you uploaded it with --no-squash, then branch dependencies '
2988 'are not supported, and you should reupload with --squash.)'
2989 % upstream_branch_name,
2990 change_desc)
2991 return parent
2992
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002993 def _AddChangeIdToCommitMessage(self, options, args):
2994 """Re-commits using the current message, assumes the commit hook is in
2995 place.
2996 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002997 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002998 git_command = ['commit', '--amend', '-m', log_desc]
2999 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003000 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003001 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003002 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003003 return new_log_desc
3004 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003005 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003007 def SetCQState(self, new_state):
3008 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003009 vote_map = {
3010 _CQState.NONE: 0,
3011 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003012 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003013 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003014 labels = {'Commit-Queue': vote_map[new_state]}
3015 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003016 gerrit_util.SetReview(
3017 self._GetGerritHost(), self._GerritChangeIdentifier(),
3018 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003019
tandriie113dfd2016-10-11 10:20:12 -07003020 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003021 try:
3022 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003023 except GerritChangeNotExists:
3024 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003025
3026 if data['status'] in ('ABANDONED', 'MERGED'):
3027 return 'CL %s is closed' % self.GetIssue()
3028
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003029 def GetTryJobProperties(self, patchset=None):
3030 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003031 data = self._GetChangeDetail(['ALL_REVISIONS'])
3032 patchset = int(patchset or self.GetPatchset())
3033 assert patchset
3034 revision_data = None # Pylint wants it to be defined.
3035 for revision_data in data['revisions'].itervalues():
3036 if int(revision_data['_number']) == patchset:
3037 break
3038 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003039 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003040 (patchset, self.GetIssue()))
3041 return {
3042 'patch_issue': self.GetIssue(),
3043 'patch_set': patchset or self.GetPatchset(),
3044 'patch_project': data['project'],
3045 'patch_storage': 'gerrit',
3046 'patch_ref': revision_data['fetch']['http']['ref'],
3047 'patch_repository_url': revision_data['fetch']['http']['url'],
3048 'patch_gerrit_url': self.GetCodereviewServer(),
3049 }
tandriie113dfd2016-10-11 10:20:12 -07003050
tandriide281ae2016-10-12 06:02:30 -07003051 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003052 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003053
Edward Lemur707d70b2018-02-07 00:50:14 +01003054 def GetReviewers(self):
3055 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003056 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003057
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003058
3059_CODEREVIEW_IMPLEMENTATIONS = {
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003060 'gerrit': _GerritChangelistImpl,
3061}
3062
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003063
iannuccie53c9352016-08-17 14:40:40 -07003064def _add_codereview_issue_select_options(parser, extra=""):
3065 _add_codereview_select_options(parser)
3066
3067 text = ('Operate on this issue number instead of the current branch\'s '
3068 'implicit issue.')
3069 if extra:
3070 text += ' '+extra
3071 parser.add_option('-i', '--issue', type=int, help=text)
3072
3073
3074def _process_codereview_issue_select_options(parser, options):
3075 _process_codereview_select_options(parser, options)
3076 if options.issue is not None and not options.forced_codereview:
3077 parser.error('--issue must be specified with either --rietveld or --gerrit')
3078
3079
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003080def _add_codereview_select_options(parser):
3081 """Appends --gerrit and --rietveld options to force specific codereview."""
3082 parser.codereview_group = optparse.OptionGroup(
3083 parser, 'EXPERIMENTAL! Codereview override options')
3084 parser.add_option_group(parser.codereview_group)
3085 parser.codereview_group.add_option(
3086 '--gerrit', action='store_true',
3087 help='Force the use of Gerrit for codereview')
3088 parser.codereview_group.add_option(
3089 '--rietveld', action='store_true',
3090 help='Force the use of Rietveld for codereview')
3091
3092
3093def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003094 if options.rietveld:
3095 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003096 options.forced_codereview = None
3097 if options.gerrit:
3098 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003099
3100
tandriif9aefb72016-07-01 09:06:51 -07003101def _get_bug_line_values(default_project, bugs):
3102 """Given default_project and comma separated list of bugs, yields bug line
3103 values.
3104
3105 Each bug can be either:
3106 * a number, which is combined with default_project
3107 * string, which is left as is.
3108
3109 This function may produce more than one line, because bugdroid expects one
3110 project per line.
3111
3112 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3113 ['v8:123', 'chromium:789']
3114 """
3115 default_bugs = []
3116 others = []
3117 for bug in bugs.split(','):
3118 bug = bug.strip()
3119 if bug:
3120 try:
3121 default_bugs.append(int(bug))
3122 except ValueError:
3123 others.append(bug)
3124
3125 if default_bugs:
3126 default_bugs = ','.join(map(str, default_bugs))
3127 if default_project:
3128 yield '%s:%s' % (default_project, default_bugs)
3129 else:
3130 yield default_bugs
3131 for other in sorted(others):
3132 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3133 yield other
3134
3135
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003136class ChangeDescription(object):
3137 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003138 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003139 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003140 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003141 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003142 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3143 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3144 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3145 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003146
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003147 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003148 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003149
agable@chromium.org42c20792013-09-12 17:34:49 +00003150 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003151 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003152 return '\n'.join(self._description_lines)
3153
3154 def set_description(self, desc):
3155 if isinstance(desc, basestring):
3156 lines = desc.splitlines()
3157 else:
3158 lines = [line.rstrip() for line in desc]
3159 while lines and not lines[0]:
3160 lines.pop(0)
3161 while lines and not lines[-1]:
3162 lines.pop(-1)
3163 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003164
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003165 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3166 """Rewrites the R=/TBR= line(s) as a single line each.
3167
3168 Args:
3169 reviewers (list(str)) - list of additional emails to use for reviewers.
3170 tbrs (list(str)) - list of additional emails to use for TBRs.
3171 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3172 the change that are missing OWNER coverage. If this is not None, you
3173 must also pass a value for `change`.
3174 change (Change) - The Change that should be used for OWNERS lookups.
3175 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003176 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003177 assert isinstance(tbrs, list), tbrs
3178
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003179 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003180 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003181
3182 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003183 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003184
3185 reviewers = set(reviewers)
3186 tbrs = set(tbrs)
3187 LOOKUP = {
3188 'TBR': tbrs,
3189 'R': reviewers,
3190 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003191
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003192 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003193 regexp = re.compile(self.R_LINE)
3194 matches = [regexp.match(line) for line in self._description_lines]
3195 new_desc = [l for i, l in enumerate(self._description_lines)
3196 if not matches[i]]
3197 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003198
agable@chromium.org42c20792013-09-12 17:34:49 +00003199 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003200
3201 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003202 for match in matches:
3203 if not match:
3204 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003205 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3206
3207 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003208 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003209 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003210 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003211 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003212 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003213 LOOKUP[add_owners_to].update(
3214 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003215
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003216 # If any folks ended up in both groups, remove them from tbrs.
3217 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003218
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003219 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3220 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003221
3222 # Put the new lines in the description where the old first R= line was.
3223 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3224 if 0 <= line_loc < len(self._description_lines):
3225 if new_tbr_line:
3226 self._description_lines.insert(line_loc, new_tbr_line)
3227 if new_r_line:
3228 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003229 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003230 if new_r_line:
3231 self.append_footer(new_r_line)
3232 if new_tbr_line:
3233 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234
Aaron Gable3a16ed12017-03-23 10:51:55 -07003235 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003236 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 self.set_description([
3238 '# Enter a description of the change.',
3239 '# This will be displayed on the codereview site.',
3240 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003241 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003242 '--------------------',
3243 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003246 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00003247 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003248 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003249 if git_footer:
3250 self.append_footer('Bug: %s' % ', '.join(values))
3251 else:
3252 for value in values:
3253 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003254
agable@chromium.org42c20792013-09-12 17:34:49 +00003255 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003256 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003257 if not content:
3258 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003260
Bruce Dawson2377b012018-01-11 16:46:49 -08003261 # Strip off comments and default inserted "Bug:" line.
3262 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003263 (line.startswith('#') or
3264 line.rstrip() == "Bug:" or
3265 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003266 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003267 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003268 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003269
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003270 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003271 """Adds a footer line to the description.
3272
3273 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3274 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3275 that Gerrit footers are always at the end.
3276 """
3277 parsed_footer_line = git_footers.parse_footer(line)
3278 if parsed_footer_line:
3279 # Line is a gerrit footer in the form: Footer-Key: any value.
3280 # Thus, must be appended observing Gerrit footer rules.
3281 self.set_description(
3282 git_footers.add_footer(self.description,
3283 key=parsed_footer_line[0],
3284 value=parsed_footer_line[1]))
3285 return
3286
3287 if not self._description_lines:
3288 self._description_lines.append(line)
3289 return
3290
3291 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3292 if gerrit_footers:
3293 # git_footers.split_footers ensures that there is an empty line before
3294 # actual (gerrit) footers, if any. We have to keep it that way.
3295 assert top_lines and top_lines[-1] == ''
3296 top_lines, separator = top_lines[:-1], top_lines[-1:]
3297 else:
3298 separator = [] # No need for separator if there are no gerrit_footers.
3299
3300 prev_line = top_lines[-1] if top_lines else ''
3301 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3302 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3303 top_lines.append('')
3304 top_lines.append(line)
3305 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003306
tandrii99a72f22016-08-17 14:33:24 -07003307 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003308 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003309 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003310 reviewers = [match.group(2).strip()
3311 for match in matches
3312 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003313 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003314
bradnelsond975b302016-10-23 12:20:23 -07003315 def get_cced(self):
3316 """Retrieves the list of reviewers."""
3317 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3318 cced = [match.group(2).strip() for match in matches if match]
3319 return cleanup_list(cced)
3320
Nodir Turakulov23b82142017-11-16 11:04:25 -08003321 def get_hash_tags(self):
3322 """Extracts and sanitizes a list of Gerrit hashtags."""
3323 subject = (self._description_lines or ('',))[0]
3324 subject = re.sub(
3325 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3326
3327 tags = []
3328 start = 0
3329 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3330 while True:
3331 m = bracket_exp.match(subject, start)
3332 if not m:
3333 break
3334 tags.append(self.sanitize_hash_tag(m.group(1)))
3335 start = m.end()
3336
3337 if not tags:
3338 # Try "Tag: " prefix.
3339 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3340 if m:
3341 tags.append(self.sanitize_hash_tag(m.group(1)))
3342 return tags
3343
3344 @classmethod
3345 def sanitize_hash_tag(cls, tag):
3346 """Returns a sanitized Gerrit hash tag.
3347
3348 A sanitized hashtag can be used as a git push refspec parameter value.
3349 """
3350 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3351
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003352 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3353 """Updates this commit description given the parent.
3354
3355 This is essentially what Gnumbd used to do.
3356 Consult https://goo.gl/WMmpDe for more details.
3357 """
3358 assert parent_msg # No, orphan branch creation isn't supported.
3359 assert parent_hash
3360 assert dest_ref
3361 parent_footer_map = git_footers.parse_footers(parent_msg)
3362 # This will also happily parse svn-position, which GnumbD is no longer
3363 # supporting. While we'd generate correct footers, the verifier plugin
3364 # installed in Gerrit will block such commit (ie git push below will fail).
3365 parent_position = git_footers.get_position(parent_footer_map)
3366
3367 # Cherry-picks may have last line obscuring their prior footers,
3368 # from git_footers perspective. This is also what Gnumbd did.
3369 cp_line = None
3370 if (self._description_lines and
3371 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3372 cp_line = self._description_lines.pop()
3373
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003374 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003375
3376 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3377 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003378 for i, line in enumerate(footer_lines):
3379 k, v = git_footers.parse_footer(line) or (None, None)
3380 if k and k.startswith('Cr-'):
3381 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003382
3383 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003384 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003385 if parent_position[0] == dest_ref:
3386 # Same branch as parent.
3387 number = int(parent_position[1]) + 1
3388 else:
3389 number = 1 # New branch, and extra lineage.
3390 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3391 int(parent_position[1])))
3392
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003393 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3394 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003395
3396 self._description_lines = top_lines
3397 if cp_line:
3398 self._description_lines.append(cp_line)
3399 if self._description_lines[-1] != '':
3400 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003401 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003402
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003403
Aaron Gablea1bab272017-04-11 16:38:18 -07003404def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003405 """Retrieves the reviewers that approved a CL from the issue properties with
3406 messages.
3407
3408 Note that the list may contain reviewers that are not committer, thus are not
3409 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003410
3411 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003412 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003413 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003414 return sorted(
3415 set(
3416 message['sender']
3417 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003418 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003419 )
3420 )
3421
3422
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003423def FindCodereviewSettingsFile(filename='codereview.settings'):
3424 """Finds the given file starting in the cwd and going up.
3425
3426 Only looks up to the top of the repository unless an
3427 'inherit-review-settings-ok' file exists in the root of the repository.
3428 """
3429 inherit_ok_file = 'inherit-review-settings-ok'
3430 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003431 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003432 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3433 root = '/'
3434 while True:
3435 if filename in os.listdir(cwd):
3436 if os.path.isfile(os.path.join(cwd, filename)):
3437 return open(os.path.join(cwd, filename))
3438 if cwd == root:
3439 break
3440 cwd = os.path.dirname(cwd)
3441
3442
3443def LoadCodereviewSettingsFromFile(fileobj):
3444 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003445 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003446
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003447 def SetProperty(name, setting, unset_error_ok=False):
3448 fullname = 'rietveld.' + name
3449 if setting in keyvals:
3450 RunGit(['config', fullname, keyvals[setting]])
3451 else:
3452 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3453
tandrii48df5812016-10-17 03:55:37 -07003454 if not keyvals.get('GERRIT_HOST', False):
3455 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456 # Only server setting is required. Other settings can be absent.
3457 # In that case, we ignore errors raised during option deletion attempt.
3458 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3459 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3460 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003461 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003462 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3463 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003464 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3465 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003466
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003467 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003468 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003469
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003470 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003471 RunGit(['config', 'gerrit.squash-uploads',
3472 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003473
tandrii@chromium.org28253532016-04-14 13:46:56 +00003474 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003475 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003476 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3477
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003478 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003479 # should be of the form
3480 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3481 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003482 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3483 keyvals['ORIGIN_URL_CONFIG']])
3484
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003485
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003486def urlretrieve(source, destination):
3487 """urllib is broken for SSL connections via a proxy therefore we
3488 can't use urllib.urlretrieve()."""
3489 with open(destination, 'w') as f:
3490 f.write(urllib2.urlopen(source).read())
3491
3492
ukai@chromium.org712d6102013-11-27 00:52:58 +00003493def hasSheBang(fname):
3494 """Checks fname is a #! script."""
3495 with open(fname) as f:
3496 return f.read(2).startswith('#!')
3497
3498
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003499# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3500def DownloadHooks(*args, **kwargs):
3501 pass
3502
3503
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003504def DownloadGerritHook(force):
3505 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003506
3507 Args:
3508 force: True to update hooks. False to install hooks if not present.
3509 """
3510 if not settings.GetIsGerrit():
3511 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003512 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003513 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3514 if not os.access(dst, os.X_OK):
3515 if os.path.exists(dst):
3516 if not force:
3517 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003518 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003519 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003520 if not hasSheBang(dst):
3521 DieWithError('Not a script: %s\n'
3522 'You need to download from\n%s\n'
3523 'into .git/hooks/commit-msg and '
3524 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003525 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3526 except Exception:
3527 if os.path.exists(dst):
3528 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003529 DieWithError('\nFailed to download hooks.\n'
3530 'You need to download from\n%s\n'
3531 'into .git/hooks/commit-msg and '
3532 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003533
3534
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003535class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003536 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003537
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003538 _GOOGLESOURCE = 'googlesource.com'
3539
3540 def __init__(self):
3541 # Cached list of [host, identity, source], where source is either
3542 # .gitcookies or .netrc.
3543 self._all_hosts = None
3544
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003545 def ensure_configured_gitcookies(self):
3546 """Runs checks and suggests fixes to make git use .gitcookies from default
3547 path."""
3548 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3549 configured_path = RunGitSilent(
3550 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003551 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003552 if configured_path:
3553 self._ensure_default_gitcookies_path(configured_path, default)
3554 else:
3555 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003556
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003557 @staticmethod
3558 def _ensure_default_gitcookies_path(configured_path, default_path):
3559 assert configured_path
3560 if configured_path == default_path:
3561 print('git is already configured to use your .gitcookies from %s' %
3562 configured_path)
3563 return
3564
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003565 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003566 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3567 (configured_path, default_path))
3568
3569 if not os.path.exists(configured_path):
3570 print('However, your configured .gitcookies file is missing.')
3571 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3572 action='reconfigure')
3573 RunGit(['config', '--global', 'http.cookiefile', default_path])
3574 return
3575
3576 if os.path.exists(default_path):
3577 print('WARNING: default .gitcookies file already exists %s' %
3578 default_path)
3579 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3580 default_path)
3581
3582 confirm_or_exit('Move existing .gitcookies to default location?',
3583 action='move')
3584 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003585 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003586 print('Moved and reconfigured git to use .gitcookies from %s' %
3587 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003588
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003589 @staticmethod
3590 def _configure_gitcookies_path(default_path):
3591 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3592 if os.path.exists(netrc_path):
3593 print('You seem to be using outdated .netrc for git credentials: %s' %
3594 netrc_path)
3595 print('This tool will guide you through setting up recommended '
3596 '.gitcookies store for git credentials.\n'
3597 '\n'
3598 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3599 ' git config --global --unset http.cookiefile\n'
3600 ' mv %s %s.backup\n\n' % (default_path, default_path))
3601 confirm_or_exit(action='setup .gitcookies')
3602 RunGit(['config', '--global', 'http.cookiefile', default_path])
3603 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003604
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003605 def get_hosts_with_creds(self, include_netrc=False):
3606 if self._all_hosts is None:
3607 a = gerrit_util.CookiesAuthenticator()
3608 self._all_hosts = [
3609 (h, u, s)
3610 for h, u, s in itertools.chain(
3611 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3612 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3613 )
3614 if h.endswith(self._GOOGLESOURCE)
3615 ]
3616
3617 if include_netrc:
3618 return self._all_hosts
3619 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3620
3621 def print_current_creds(self, include_netrc=False):
3622 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3623 if not hosts:
3624 print('No Git/Gerrit credentials found')
3625 return
3626 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3627 header = [('Host', 'User', 'Which file'),
3628 ['=' * l for l in lengths]]
3629 for row in (header + hosts):
3630 print('\t'.join((('%%+%ds' % l) % s)
3631 for l, s in zip(lengths, row)))
3632
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003633 @staticmethod
3634 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003635 """Parses identity "git-<username>.domain" into <username> and domain."""
3636 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003637 # distinguishable from sub-domains. But we do know typical domains:
3638 if identity.endswith('.chromium.org'):
3639 domain = 'chromium.org'
3640 username = identity[:-len('.chromium.org')]
3641 else:
3642 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003643 if username.startswith('git-'):
3644 username = username[len('git-'):]
3645 return username, domain
3646
3647 def _get_usernames_of_domain(self, domain):
3648 """Returns list of usernames referenced by .gitcookies in a given domain."""
3649 identities_by_domain = {}
3650 for _, identity, _ in self.get_hosts_with_creds():
3651 username, domain = self._parse_identity(identity)
3652 identities_by_domain.setdefault(domain, []).append(username)
3653 return identities_by_domain.get(domain)
3654
3655 def _canonical_git_googlesource_host(self, host):
3656 """Normalizes Gerrit hosts (with '-review') to Git host."""
3657 assert host.endswith(self._GOOGLESOURCE)
3658 # Prefix doesn't include '.' at the end.
3659 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3660 if prefix.endswith('-review'):
3661 prefix = prefix[:-len('-review')]
3662 return prefix + '.' + self._GOOGLESOURCE
3663
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003664 def _canonical_gerrit_googlesource_host(self, host):
3665 git_host = self._canonical_git_googlesource_host(host)
3666 prefix = git_host.split('.', 1)[0]
3667 return prefix + '-review.' + self._GOOGLESOURCE
3668
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003669 def _get_counterpart_host(self, host):
3670 assert host.endswith(self._GOOGLESOURCE)
3671 git = self._canonical_git_googlesource_host(host)
3672 gerrit = self._canonical_gerrit_googlesource_host(git)
3673 return git if gerrit == host else gerrit
3674
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003675 def has_generic_host(self):
3676 """Returns whether generic .googlesource.com has been configured.
3677
3678 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3679 """
3680 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3681 if host == '.' + self._GOOGLESOURCE:
3682 return True
3683 return False
3684
3685 def _get_git_gerrit_identity_pairs(self):
3686 """Returns map from canonic host to pair of identities (Git, Gerrit).
3687
3688 One of identities might be None, meaning not configured.
3689 """
3690 host_to_identity_pairs = {}
3691 for host, identity, _ in self.get_hosts_with_creds():
3692 canonical = self._canonical_git_googlesource_host(host)
3693 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3694 idx = 0 if canonical == host else 1
3695 pair[idx] = identity
3696 return host_to_identity_pairs
3697
3698 def get_partially_configured_hosts(self):
3699 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003700 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3701 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3702 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003703
3704 def get_conflicting_hosts(self):
3705 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003706 host
3707 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003708 if None not in (i1, i2) and i1 != i2)
3709
3710 def get_duplicated_hosts(self):
3711 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3712 return set(host for host, count in counters.iteritems() if count > 1)
3713
3714 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3715 'chromium.googlesource.com': 'chromium.org',
3716 'chrome-internal.googlesource.com': 'google.com',
3717 }
3718
3719 def get_hosts_with_wrong_identities(self):
3720 """Finds hosts which **likely** reference wrong identities.
3721
3722 Note: skips hosts which have conflicting identities for Git and Gerrit.
3723 """
3724 hosts = set()
3725 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3726 pair = self._get_git_gerrit_identity_pairs().get(host)
3727 if pair and pair[0] == pair[1]:
3728 _, domain = self._parse_identity(pair[0])
3729 if domain != expected:
3730 hosts.add(host)
3731 return hosts
3732
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003733 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003734 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003735 hosts = sorted(hosts)
3736 assert hosts
3737 if extra_column_func is None:
3738 extras = [''] * len(hosts)
3739 else:
3740 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003741 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3742 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003743 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003744 lines.append(tmpl % he)
3745 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003746
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003747 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003748 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003749 yield ('.googlesource.com wildcard record detected',
3750 ['Chrome Infrastructure team recommends to list full host names '
3751 'explicitly.'],
3752 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003753
3754 dups = self.get_duplicated_hosts()
3755 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003756 yield ('The following hosts were defined twice',
3757 self._format_hosts(dups),
3758 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003759
3760 partial = self.get_partially_configured_hosts()
3761 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003762 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3763 'These hosts are missing',
3764 self._format_hosts(partial, lambda host: 'but %s defined' %
3765 self._get_counterpart_host(host)),
3766 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003767
3768 conflicting = self.get_conflicting_hosts()
3769 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003770 yield ('The following Git hosts have differing credentials from their '
3771 'Gerrit counterparts',
3772 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3773 tuple(self._get_git_gerrit_identity_pairs()[host])),
3774 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003775
3776 wrong = self.get_hosts_with_wrong_identities()
3777 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003778 yield ('These hosts likely use wrong identity',
3779 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3780 (self._get_git_gerrit_identity_pairs()[host][0],
3781 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3782 wrong)
3783
3784 def find_and_report_problems(self):
3785 """Returns True if there was at least one problem, else False."""
3786 found = False
3787 bad_hosts = set()
3788 for title, sublines, hosts in self._find_problems():
3789 if not found:
3790 found = True
3791 print('\n\n.gitcookies problem report:\n')
3792 bad_hosts.update(hosts or [])
3793 print(' %s%s' % (title , (':' if sublines else '')))
3794 if sublines:
3795 print()
3796 print(' %s' % '\n '.join(sublines))
3797 print()
3798
3799 if bad_hosts:
3800 assert found
3801 print(' You can manually remove corresponding lines in your %s file and '
3802 'visit the following URLs with correct account to generate '
3803 'correct credential lines:\n' %
3804 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3805 print(' %s' % '\n '.join(sorted(set(
3806 gerrit_util.CookiesAuthenticator().get_new_password_url(
3807 self._canonical_git_googlesource_host(host))
3808 for host in bad_hosts
3809 ))))
3810 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003811
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003812
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003813@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003814def CMDcreds_check(parser, args):
3815 """Checks credentials and suggests changes."""
3816 _, _ = parser.parse_args(args)
3817
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003818 # Code below checks .gitcookies. Abort if using something else.
3819 authn = gerrit_util.Authenticator.get()
3820 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3821 if isinstance(authn, gerrit_util.GceAuthenticator):
3822 DieWithError(
3823 'This command is not designed for GCE, are you on a bot?\n'
3824 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3825 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003826 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003827 'This command is not designed for bot environment. It checks '
3828 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003829
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003830 checker = _GitCookiesChecker()
3831 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003832
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003833 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003834 checker.print_current_creds(include_netrc=True)
3835
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003836 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003837 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003838 return 0
3839 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003840
3841
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003842@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003843def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003844 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003845 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3846 branch = ShortBranchName(branchref)
3847 _, args = parser.parse_args(args)
3848 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003849 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003850 return RunGit(['config', 'branch.%s.base-url' % branch],
3851 error_ok=False).strip()
3852 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003854 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3855 error_ok=False).strip()
3856
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003857def color_for_status(status):
3858 """Maps a Changelist status to color, for CMDstatus and other tools."""
3859 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003860 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003861 'waiting': Fore.BLUE,
3862 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003863 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003864 'lgtm': Fore.GREEN,
3865 'commit': Fore.MAGENTA,
3866 'closed': Fore.CYAN,
3867 'error': Fore.WHITE,
3868 }.get(status, Fore.WHITE)
3869
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003870
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003871def get_cl_statuses(changes, fine_grained, max_processes=None):
3872 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003873
3874 If fine_grained is true, this will fetch CL statuses from the server.
3875 Otherwise, simply indicate if there's a matching url for the given branches.
3876
3877 If max_processes is specified, it is used as the maximum number of processes
3878 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3879 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003880
3881 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003882 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003883 if not changes:
3884 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003885
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003886 if not fine_grained:
3887 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003888 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003889 for cl in changes:
3890 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003891 return
3892
3893 # First, sort out authentication issues.
3894 logging.debug('ensuring credentials exist')
3895 for cl in changes:
3896 cl.EnsureAuthenticated(force=False, refresh=True)
3897
3898 def fetch(cl):
3899 try:
3900 return (cl, cl.GetStatus())
3901 except:
3902 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003903 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003904 raise
3905
3906 threads_count = len(changes)
3907 if max_processes:
3908 threads_count = max(1, min(threads_count, max_processes))
3909 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3910
3911 pool = ThreadPool(threads_count)
3912 fetched_cls = set()
3913 try:
3914 it = pool.imap_unordered(fetch, changes).__iter__()
3915 while True:
3916 try:
3917 cl, status = it.next(timeout=5)
3918 except multiprocessing.TimeoutError:
3919 break
3920 fetched_cls.add(cl)
3921 yield cl, status
3922 finally:
3923 pool.close()
3924
3925 # Add any branches that failed to fetch.
3926 for cl in set(changes) - fetched_cls:
3927 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003928
rmistry@google.com2dd99862015-06-22 12:22:18 +00003929
3930def upload_branch_deps(cl, args):
3931 """Uploads CLs of local branches that are dependents of the current branch.
3932
3933 If the local branch dependency tree looks like:
3934 test1 -> test2.1 -> test3.1
3935 -> test3.2
3936 -> test2.2 -> test3.3
3937
3938 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3939 run on the dependent branches in this order:
3940 test2.1, test3.1, test3.2, test2.2, test3.3
3941
3942 Note: This function does not rebase your local dependent branches. Use it when
3943 you make a change to the parent branch that will not conflict with its
3944 dependent branches, and you would like their dependencies updated in
3945 Rietveld.
3946 """
3947 if git_common.is_dirty_git_tree('upload-branch-deps'):
3948 return 1
3949
3950 root_branch = cl.GetBranch()
3951 if root_branch is None:
3952 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3953 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003954 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003955 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3956 'patchset dependencies without an uploaded CL.')
3957
3958 branches = RunGit(['for-each-ref',
3959 '--format=%(refname:short) %(upstream:short)',
3960 'refs/heads'])
3961 if not branches:
3962 print('No local branches found.')
3963 return 0
3964
3965 # Create a dictionary of all local branches to the branches that are dependent
3966 # on it.
3967 tracked_to_dependents = collections.defaultdict(list)
3968 for b in branches.splitlines():
3969 tokens = b.split()
3970 if len(tokens) == 2:
3971 branch_name, tracked = tokens
3972 tracked_to_dependents[tracked].append(branch_name)
3973
vapiera7fbd5a2016-06-16 09:17:49 -07003974 print()
3975 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003976 dependents = []
3977 def traverse_dependents_preorder(branch, padding=''):
3978 dependents_to_process = tracked_to_dependents.get(branch, [])
3979 padding += ' '
3980 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003981 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003982 dependents.append(dependent)
3983 traverse_dependents_preorder(dependent, padding)
3984 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003985 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003986
3987 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003989 return 0
3990
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003991 confirm_or_exit('This command will checkout all dependent branches and run '
3992 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003993
rmistry@google.com2dd99862015-06-22 12:22:18 +00003994 # Record all dependents that failed to upload.
3995 failures = {}
3996 # Go through all dependents, checkout the branch and upload.
3997 try:
3998 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003999 print()
4000 print('--------------------------------------')
4001 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004002 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004003 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004004 try:
4005 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004006 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004007 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004008 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004009 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004010 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004011 finally:
4012 # Swap back to the original root branch.
4013 RunGit(['checkout', '-q', root_branch])
4014
vapiera7fbd5a2016-06-16 09:17:49 -07004015 print()
4016 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004017 for dependent_branch in dependents:
4018 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004019 print(' %s : %s' % (dependent_branch, upload_status))
4020 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004021
4022 return 0
4023
4024
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004025@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004026def CMDarchive(parser, args):
4027 """Archives and deletes branches associated with closed changelists."""
4028 parser.add_option(
4029 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004030 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004031 parser.add_option(
4032 '-f', '--force', action='store_true',
4033 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004034 parser.add_option(
4035 '-d', '--dry-run', action='store_true',
4036 help='Skip the branch tagging and removal steps.')
4037 parser.add_option(
4038 '-t', '--notags', action='store_true',
4039 help='Do not tag archived branches. '
4040 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004041
4042 auth.add_auth_options(parser)
4043 options, args = parser.parse_args(args)
4044 if args:
4045 parser.error('Unsupported args: %s' % ' '.join(args))
4046 auth_config = auth.extract_auth_config_from_options(options)
4047
4048 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4049 if not branches:
4050 return 0
4051
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004053 changes = [Changelist(branchref=b, auth_config=auth_config)
4054 for b in branches.splitlines()]
4055 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4056 statuses = get_cl_statuses(changes,
4057 fine_grained=True,
4058 max_processes=options.maxjobs)
4059 proposal = [(cl.GetBranch(),
4060 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4061 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004062 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004063 proposal.sort()
4064
4065 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004066 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004067 return 0
4068
4069 current_branch = GetCurrentBranch()
4070
vapiera7fbd5a2016-06-16 09:17:49 -07004071 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004072 if options.notags:
4073 for next_item in proposal:
4074 print(' ' + next_item[0])
4075 else:
4076 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4077 for next_item in proposal:
4078 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004079
kmarshall9249e012016-08-23 12:02:16 -07004080 # Quit now on precondition failure or if instructed by the user, either
4081 # via an interactive prompt or by command line flags.
4082 if options.dry_run:
4083 print('\nNo changes were made (dry run).\n')
4084 return 0
4085 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004086 print('You are currently on a branch \'%s\' which is associated with a '
4087 'closed codereview issue, so archive cannot proceed. Please '
4088 'checkout another branch and run this command again.' %
4089 current_branch)
4090 return 1
kmarshall9249e012016-08-23 12:02:16 -07004091 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004092 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4093 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004094 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004095 return 1
4096
4097 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004098 if not options.notags:
4099 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004100 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004101
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004103
4104 return 0
4105
4106
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004107@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004108def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004109 """Show status of changelists.
4110
4111 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004112 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004113 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004114 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004115 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004116 - Magenta in the commit queue
4117 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004118 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004119
4120 Also see 'git cl comments'.
4121 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004122 parser.add_option(
4123 '--no-branch-color',
4124 action='store_true',
4125 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004126 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004127 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004128 parser.add_option('-f', '--fast', action='store_true',
4129 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004130 parser.add_option(
4131 '-j', '--maxjobs', action='store', type=int,
4132 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004133
4134 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004135 _add_codereview_issue_select_options(
4136 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004137 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004138 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004139 if args:
4140 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004141 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004142
iannuccie53c9352016-08-17 14:40:40 -07004143 if options.issue is not None and not options.field:
4144 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004145
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004146 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004147 cl = Changelist(auth_config=auth_config, issue=options.issue,
4148 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004149 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004151 elif options.field == 'id':
4152 issueid = cl.GetIssue()
4153 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004155 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004156 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004157 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004158 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004159 elif options.field == 'status':
4160 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004161 elif options.field == 'url':
4162 url = cl.GetIssueURL()
4163 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004164 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004165 return 0
4166
4167 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4168 if not branches:
4169 print('No local branch found.')
4170 return 0
4171
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004172 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004173 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004174 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004175 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004176 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004177 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004178 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004179
Daniel McArdlea23bf592019-02-12 00:25:12 +00004180 current_branch = GetCurrentBranch()
4181
4182 def FormatBranchName(branch, colorize=False):
4183 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4184 an asterisk when it is the current branch."""
4185
4186 asterisk = ""
4187 color = Fore.RESET
4188 if branch == current_branch:
4189 asterisk = "* "
4190 color = Fore.GREEN
4191 branch_name = ShortBranchName(branch)
4192
4193 if colorize:
4194 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004195 return asterisk + branch_name
4196
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004197 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004198
4199 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004200 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4201 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004202 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004203 c, status = output.next()
4204 branch_statuses[c.GetBranch()] = status
4205 status = branch_statuses.pop(branch)
4206 url = cl.GetIssueURL()
4207 if url and (not status or status == 'error'):
4208 # The issue probably doesn't exist anymore.
4209 url += ' (broken)'
4210
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004211 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004212 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004213 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004214 color = ''
4215 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004216 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004217
Alan Cuttera3be9a52019-03-04 18:50:33 +00004218 branch_display = FormatBranchName(branch)
4219 padding = ' ' * (alignment - len(branch_display))
4220 if not options.no_branch_color:
4221 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004222
Alan Cuttera3be9a52019-03-04 18:50:33 +00004223 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4224 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004225
vapiera7fbd5a2016-06-16 09:17:49 -07004226 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004227 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004228 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004229 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004230 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004231 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004232 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004233 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004234 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004235 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004236 print('Issue description:')
4237 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238 return 0
4239
4240
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004241def colorize_CMDstatus_doc():
4242 """To be called once in main() to add colors to git cl status help."""
4243 colors = [i for i in dir(Fore) if i[0].isupper()]
4244
4245 def colorize_line(line):
4246 for color in colors:
4247 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004248 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004249 indent = len(line) - len(line.lstrip(' ')) + 1
4250 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4251 return line
4252
4253 lines = CMDstatus.__doc__.splitlines()
4254 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4255
4256
phajdan.jre328cf92016-08-22 04:12:17 -07004257def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004258 if path == '-':
4259 json.dump(contents, sys.stdout)
4260 else:
4261 with open(path, 'w') as f:
4262 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004263
4264
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004265@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004266@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004267def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004268 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004269
4270 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004271 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004272 parser.add_option('-r', '--reverse', action='store_true',
4273 help='Lookup the branch(es) for the specified issues. If '
4274 'no issues are specified, all branches with mapped '
4275 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004276 parser.add_option('--json',
4277 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004278 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004279 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004280 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004281
dnj@chromium.org406c4402015-03-03 17:22:28 +00004282 if options.reverse:
4283 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004284 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004285 # Reverse issue lookup.
4286 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004287
4288 git_config = {}
4289 for config in RunGit(['config', '--get-regexp',
4290 r'branch\..*issue']).splitlines():
4291 name, _space, val = config.partition(' ')
4292 git_config[name] = val
4293
dnj@chromium.org406c4402015-03-03 17:22:28 +00004294 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004295 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4296 config_key = _git_branch_config_key(ShortBranchName(branch),
4297 cls.IssueConfigKey())
4298 issue = git_config.get(config_key)
4299 if issue:
4300 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004301 if not args:
4302 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004303 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004304 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004305 try:
4306 issue_num = int(issue)
4307 except ValueError:
4308 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004309 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004310 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004311 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004312 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004313 if options.json:
4314 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004315 return 0
4316
4317 if len(args) > 0:
4318 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4319 if not issue.valid:
4320 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4321 'or no argument to list it.\n'
4322 'Maybe you want to run git cl status?')
4323 cl = Changelist(codereview=issue.codereview)
4324 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004325 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004326 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004327 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4328 if options.json:
4329 write_json(options.json, {
4330 'issue': cl.GetIssue(),
4331 'issue_url': cl.GetIssueURL(),
4332 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004333 return 0
4334
4335
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004336@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004337def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004338 """Shows or posts review comments for any changelist."""
4339 parser.add_option('-a', '--add-comment', dest='comment',
4340 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004341 parser.add_option('-p', '--publish', action='store_true',
4342 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004343 parser.add_option('-i', '--issue', dest='issue',
4344 help='review issue id (defaults to current issue). '
4345 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004346 parser.add_option('-m', '--machine-readable', dest='readable',
4347 action='store_false', default=True,
4348 help='output comments in a format compatible with '
4349 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004350 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004351 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004352 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004353 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004354 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004355 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004356 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004357
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004358 issue = None
4359 if options.issue:
4360 try:
4361 issue = int(options.issue)
4362 except ValueError:
4363 DieWithError('A review issue id is expected to be a number')
4364
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004365 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4366
4367 if not cl.IsGerrit():
4368 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004369
4370 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004371 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004372 return 0
4373
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004374 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4375 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004376 for comment in summary:
4377 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004378 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004379 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004380 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004381 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004382 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004383 elif comment.autogenerated:
4384 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004385 else:
4386 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004387 print('\n%s%s %s%s\n%s' % (
4388 color,
4389 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4390 comment.sender,
4391 Fore.RESET,
4392 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4393
smut@google.comc85ac942015-09-15 16:34:43 +00004394 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004395 def pre_serialize(c):
4396 dct = c.__dict__.copy()
4397 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4398 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004399 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004400 return 0
4401
4402
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004403@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004404@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004405def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004406 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004407 parser.add_option('-d', '--display', action='store_true',
4408 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004409 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004410 help='New description to set for this issue (- for stdin, '
4411 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004412 parser.add_option('-f', '--force', action='store_true',
4413 help='Delete any unpublished Gerrit edits for this issue '
4414 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004415
4416 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004417 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004418 options, args = parser.parse_args(args)
4419 _process_codereview_select_options(parser, options)
4420
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004421 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004422 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004423 target_issue_arg = ParseIssueNumberArgument(args[0],
4424 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004425 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004426 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004427
martiniss6eda05f2016-06-30 10:18:35 -07004428 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004429 'auth_config': auth.extract_auth_config_from_options(options),
4430 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004431 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004432 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004433 if target_issue_arg:
4434 kwargs['issue'] = target_issue_arg.issue
4435 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004436 if target_issue_arg.codereview and not options.forced_codereview:
4437 detected_codereview_from_url = True
4438 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004439
4440 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004441 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004442 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004443 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004444
4445 if detected_codereview_from_url:
4446 logging.info('canonical issue/change URL: %s (type: %s)\n',
4447 cl.GetIssueURL(), target_issue_arg.codereview)
4448
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004449 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004450
smut@google.com34fb6b12015-07-13 20:03:26 +00004451 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004452 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004453 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004454
4455 if options.new_description:
4456 text = options.new_description
4457 if text == '-':
4458 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004459 elif text == '+':
4460 base_branch = cl.GetCommonAncestorWithUpstream()
4461 change = cl.GetChange(base_branch, None, local_description=True)
4462 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004463
4464 description.set_description(text)
4465 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004466 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004467
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004468 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004469 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004470 return 0
4471
4472
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004473@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004474def CMDlint(parser, args):
4475 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004476 parser.add_option('--filter', action='append', metavar='-x,+y',
4477 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004478 auth.add_auth_options(parser)
4479 options, args = parser.parse_args(args)
4480 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004481
4482 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004483 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004484 try:
4485 import cpplint
4486 import cpplint_chromium
4487 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004488 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004489 return 1
4490
4491 # Change the current working directory before calling lint so that it
4492 # shows the correct base.
4493 previous_cwd = os.getcwd()
4494 os.chdir(settings.GetRoot())
4495 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004496 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004497 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4498 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004499 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004500 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004501 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004502
4503 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004504 command = args + files
4505 if options.filter:
4506 command = ['--filter=' + ','.join(options.filter)] + command
4507 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004508
4509 white_regex = re.compile(settings.GetLintRegex())
4510 black_regex = re.compile(settings.GetLintIgnoreRegex())
4511 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4512 for filename in filenames:
4513 if white_regex.match(filename):
4514 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004515 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004516 else:
4517 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4518 extra_check_functions)
4519 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004520 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004521 finally:
4522 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004523 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004524 if cpplint._cpplint_state.error_count != 0:
4525 return 1
4526 return 0
4527
4528
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004529@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004531 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004532 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004533 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004534 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004535 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004536 parser.add_option('--all', action='store_true',
4537 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004538 parser.add_option('--parallel', action='store_true',
4539 help='Run all tests specified by input_api.RunTests in all '
4540 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004541 auth.add_auth_options(parser)
4542 options, args = parser.parse_args(args)
4543 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004544
sbc@chromium.org71437c02015-04-09 19:29:40 +00004545 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004546 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547 return 1
4548
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004549 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550 if args:
4551 base_branch = args[0]
4552 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004553 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004554 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555
Aaron Gable8076c282017-11-29 14:39:41 -08004556 if options.all:
4557 base_change = cl.GetChange(base_branch, None)
4558 files = [('M', f) for f in base_change.AllFiles()]
4559 change = presubmit_support.GitChange(
4560 base_change.Name(),
4561 base_change.FullDescriptionText(),
4562 base_change.RepositoryRoot(),
4563 files,
4564 base_change.issue,
4565 base_change.patchset,
4566 base_change.author_email,
4567 base_change._upstream)
4568 else:
4569 change = cl.GetChange(base_branch, None)
4570
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004571 cl.RunHook(
4572 committing=not options.upload,
4573 may_prompt=False,
4574 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004575 change=change,
4576 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004577 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578
4579
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004580def GenerateGerritChangeId(message):
4581 """Returns Ixxxxxx...xxx change id.
4582
4583 Works the same way as
4584 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4585 but can be called on demand on all platforms.
4586
4587 The basic idea is to generate git hash of a state of the tree, original commit
4588 message, author/committer info and timestamps.
4589 """
4590 lines = []
4591 tree_hash = RunGitSilent(['write-tree'])
4592 lines.append('tree %s' % tree_hash.strip())
4593 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4594 if code == 0:
4595 lines.append('parent %s' % parent.strip())
4596 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4597 lines.append('author %s' % author.strip())
4598 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4599 lines.append('committer %s' % committer.strip())
4600 lines.append('')
4601 # Note: Gerrit's commit-hook actually cleans message of some lines and
4602 # whitespace. This code is not doing this, but it clearly won't decrease
4603 # entropy.
4604 lines.append(message)
4605 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004606 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004607 return 'I%s' % change_hash.strip()
4608
4609
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004610def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004611 """Computes the remote branch ref to use for the CL.
4612
4613 Args:
4614 remote (str): The git remote for the CL.
4615 remote_branch (str): The git remote branch for the CL.
4616 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004617 """
4618 if not (remote and remote_branch):
4619 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004620
wittman@chromium.org455dc922015-01-26 20:15:50 +00004621 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004622 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004623 # refs, which are then translated into the remote full symbolic refs
4624 # below.
4625 if '/' not in target_branch:
4626 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4627 else:
4628 prefix_replacements = (
4629 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4630 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4631 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4632 )
4633 match = None
4634 for regex, replacement in prefix_replacements:
4635 match = re.search(regex, target_branch)
4636 if match:
4637 remote_branch = target_branch.replace(match.group(0), replacement)
4638 break
4639 if not match:
4640 # This is a branch path but not one we recognize; use as-is.
4641 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004642 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4643 # Handle the refs that need to land in different refs.
4644 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004645
wittman@chromium.org455dc922015-01-26 20:15:50 +00004646 # Create the true path to the remote branch.
4647 # Does the following translation:
4648 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4649 # * refs/remotes/origin/master -> refs/heads/master
4650 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4651 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4652 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4653 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4654 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4655 'refs/heads/')
4656 elif remote_branch.startswith('refs/remotes/branch-heads'):
4657 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004658
wittman@chromium.org455dc922015-01-26 20:15:50 +00004659 return remote_branch
4660
4661
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004662def cleanup_list(l):
4663 """Fixes a list so that comma separated items are put as individual items.
4664
4665 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4666 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4667 """
4668 items = sum((i.split(',') for i in l), [])
4669 stripped_items = (i.strip() for i in items)
4670 return sorted(filter(None, stripped_items))
4671
4672
Aaron Gable4db38df2017-11-03 14:59:07 -07004673@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004674@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004675def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004676 """Uploads the current changelist to codereview.
4677
4678 Can skip dependency patchset uploads for a branch by running:
4679 git config branch.branch_name.skip-deps-uploads True
4680 To unset run:
4681 git config --unset branch.branch_name.skip-deps-uploads
4682 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004683
4684 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4685 a bug number, this bug number is automatically populated in the CL
4686 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004687
4688 If subject contains text in square brackets or has "<text>: " prefix, such
4689 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4690 [git-cl] add support for hashtags
4691 Foo bar: implement foo
4692 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004693 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004694 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4695 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004696 parser.add_option('--bypass-watchlists', action='store_true',
4697 dest='bypass_watchlists',
4698 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004699 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004700 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004701 parser.add_option('--message', '-m', dest='message',
4702 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004703 parser.add_option('-b', '--bug',
4704 help='pre-populate the bug number(s) for this issue. '
4705 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004706 parser.add_option('--message-file', dest='message_file',
4707 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004708 parser.add_option('--title', '-t', dest='title',
4709 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004710 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004711 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004712 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004713 parser.add_option('--tbrs',
4714 action='append', default=[],
4715 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004716 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004717 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004718 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004719 parser.add_option('--hashtag', dest='hashtags',
4720 action='append', default=[],
4721 help=('Gerrit hashtag for new CL; '
4722 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004723 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004724 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004725 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004726 help='tell the commit queue to commit this patchset; '
4727 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004728 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004729 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004730 metavar='TARGET',
4731 help='Apply CL to remote ref TARGET. ' +
4732 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004733 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004734 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004735 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004736 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004737 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004738 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004739 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4740 const='TBR', help='add a set of OWNERS to TBR')
4741 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4742 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004743 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4744 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004745 help='Send the patchset to do a CQ dry run right after '
4746 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004747 parser.add_option('--dependencies', action='store_true',
4748 help='Uploads CLs of all the local branches that depend on '
4749 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004750 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4751 help='Sends your change to the CQ after an approval. Only '
4752 'works on repos that have the Auto-Submit label '
4753 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004754 parser.add_option('--parallel', action='store_true',
4755 help='Run all tests specified by input_api.RunTests in all '
4756 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004757
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004758 parser.add_option('--no-autocc', action='store_true',
4759 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004760 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004761 help='Set the review private. This implies --no-autocc.')
4762
rmistry@google.com2dd99862015-06-22 12:22:18 +00004763 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004764 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004765 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004766 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004767 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004768 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004769
sbc@chromium.org71437c02015-04-09 19:29:40 +00004770 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004771 return 1
4772
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004773 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004774 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004775 options.cc = cleanup_list(options.cc)
4776
tandriib80458a2016-06-23 12:20:07 -07004777 if options.message_file:
4778 if options.message:
4779 parser.error('only one of --message and --message-file allowed.')
4780 options.message = gclient_utils.FileRead(options.message_file)
4781 options.message_file = None
4782
tandrii4d0545a2016-07-06 03:56:49 -07004783 if options.cq_dry_run and options.use_commit_queue:
4784 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4785
Aaron Gableedbc4132017-09-11 13:22:28 -07004786 if options.use_commit_queue:
4787 options.send_mail = True
4788
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004789 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4790 settings.GetIsGerrit()
4791
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004792 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004793 if not cl.IsGerrit():
4794 # Error out with instructions for repos not yet configured for Gerrit.
4795 print('=====================================')
4796 print('NOTICE: Rietveld is no longer supported. '
4797 'You can upload changes to Gerrit with')
4798 print(' git cl upload --gerrit')
4799 print('or set Gerrit to be your default code review tool with')
4800 print(' git config gerrit.host true')
4801 print('=====================================')
4802 return 1
4803
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004804 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004805
4806
Francois Dorayd42c6812017-05-30 15:10:20 -04004807@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004808@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004809def CMDsplit(parser, args):
4810 """Splits a branch into smaller branches and uploads CLs.
4811
4812 Creates a branch and uploads a CL for each group of files modified in the
4813 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004814 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004815 the shared OWNERS file.
4816 """
4817 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05004818 help="A text file containing a CL description in which "
4819 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04004820 parser.add_option("-c", "--comment", dest="comment_file",
4821 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11004822 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
4823 default=False,
4824 help="List the files and reviewers for each CL that would "
4825 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00004826 parser.add_option("--cq-dry-run", action='store_true',
4827 help="If set, will do a cq dry run for each uploaded CL. "
4828 "Please be careful when doing this; more than ~10 CLs "
4829 "has the potential to overload our build "
4830 "infrastructure. Try to upload these not during high "
4831 "load times (usually 11-3 Mountain View time). Email "
4832 "infra-dev@chromium.org with any questions.")
Takuto Ikuta51eca592019-02-14 19:40:52 +00004833 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4834 default=True,
4835 help='Sends your change to the CQ after an approval. Only '
4836 'works on repos that have the Auto-Submit label '
4837 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004838 options, _ = parser.parse_args(args)
4839
4840 if not options.description_file:
4841 parser.error('No --description flag specified.')
4842
4843 def WrappedCMDupload(args):
4844 return CMDupload(OptionParser(), args)
4845
4846 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004847 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004848 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004849
4850
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004851@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004852@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004853def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004854 """DEPRECATED: Used to commit the current changelist via git-svn."""
4855 message = ('git-cl no longer supports committing to SVN repositories via '
4856 'git-svn. You probably want to use `git cl land` instead.')
4857 print(message)
4858 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004859
4860
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004861# Two special branches used by git cl land.
4862MERGE_BRANCH = 'git-cl-commit'
4863CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4864
4865
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004866@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004867@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004868def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004869 """Commits the current changelist via git.
4870
4871 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4872 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004873 """
4874 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4875 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004876 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004877 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004878 parser.add_option('--parallel', action='store_true',
4879 help='Run all tests specified by input_api.RunTests in all '
4880 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004881 auth.add_auth_options(parser)
4882 (options, args) = parser.parse_args(args)
4883 auth_config = auth.extract_auth_config_from_options(options)
4884
4885 cl = Changelist(auth_config=auth_config)
4886
Robert Iannucci2e73d432018-03-14 01:10:47 -07004887 if not cl.IsGerrit():
4888 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004889
Robert Iannucci2e73d432018-03-14 01:10:47 -07004890 if not cl.GetIssue():
4891 DieWithError('You must upload the change first to Gerrit.\n'
4892 ' If you would rather have `git cl land` upload '
4893 'automatically for you, see http://crbug.com/642759')
4894 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004895 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004896
4897
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004898@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004899@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004900def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004901 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004902 parser.add_option('-b', dest='newbranch',
4903 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004904 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004905 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004906 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07004907 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004908 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004909 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004910 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004911 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004912 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004913 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004914
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004915
4916 group = optparse.OptionGroup(
4917 parser,
4918 'Options for continuing work on the current issue uploaded from a '
4919 'different clone (e.g. different machine). Must be used independently '
4920 'from the other options. No issue number should be specified, and the '
4921 'branch must have an issue number associated with it')
4922 group.add_option('--reapply', action='store_true', dest='reapply',
4923 help='Reset the branch and reapply the issue.\n'
4924 'CAUTION: This will undo any local changes in this '
4925 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004926
4927 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004928 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004929 parser.add_option_group(group)
4930
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004931 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004932 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004933 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004934 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004935 auth_config = auth.extract_auth_config_from_options(options)
4936
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004937 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004938 if options.newbranch:
4939 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004940 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004941 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004942
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004943 cl = Changelist(auth_config=auth_config,
4944 codereview=options.forced_codereview)
4945 if not cl.GetIssue():
4946 parser.error('current branch must have an associated issue')
4947
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004948 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004949 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004950 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004951
4952 RunGit(['reset', '--hard', upstream])
4953 if options.pull:
4954 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004955
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004956 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4957 options.directory)
4958
4959 if len(args) != 1 or not args[0]:
4960 parser.error('Must specify issue number or url')
4961
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004962 target_issue_arg = ParseIssueNumberArgument(args[0],
4963 options.forced_codereview)
4964 if not target_issue_arg.valid:
4965 parser.error('invalid codereview url or CL id')
4966
4967 cl_kwargs = {
4968 'auth_config': auth_config,
4969 'codereview_host': target_issue_arg.hostname,
4970 'codereview': options.forced_codereview,
4971 }
4972 detected_codereview_from_url = False
4973 if target_issue_arg.codereview and not options.forced_codereview:
4974 detected_codereview_from_url = True
4975 cl_kwargs['codereview'] = target_issue_arg.codereview
4976 cl_kwargs['issue'] = target_issue_arg.issue
4977
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004978 # We don't want uncommitted changes mixed up with the patch.
4979 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004980 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004981
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004982 if options.newbranch:
4983 if options.force:
4984 RunGit(['branch', '-D', options.newbranch],
4985 stderr=subprocess2.PIPE, error_ok=True)
4986 RunGit(['new-branch', options.newbranch])
4987
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004988 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004989
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004990 if cl.IsGerrit():
4991 if options.reject:
4992 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004993 if options.directory:
4994 parser.error('--directory is not supported with Gerrit codereview.')
4995
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004996 if detected_codereview_from_url:
4997 print('canonical issue/change URL: %s (type: %s)\n' %
4998 (cl.GetIssueURL(), target_issue_arg.codereview))
4999
5000 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005001 options.nocommit, options.directory,
5002 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005003
5004
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005005def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005006 """Fetches the tree status and returns either 'open', 'closed',
5007 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005008 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005009 if url:
5010 status = urllib2.urlopen(url).read().lower()
5011 if status.find('closed') != -1 or status == '0':
5012 return 'closed'
5013 elif status.find('open') != -1 or status == '1':
5014 return 'open'
5015 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005016 return 'unset'
5017
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005018
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005019def GetTreeStatusReason():
5020 """Fetches the tree status from a json url and returns the message
5021 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005022 url = settings.GetTreeStatusUrl()
5023 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005024 connection = urllib2.urlopen(json_url)
5025 status = json.loads(connection.read())
5026 connection.close()
5027 return status['message']
5028
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005029
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005030@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005031def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005032 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005033 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005034 status = GetTreeStatus()
5035 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005036 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005037 return 2
5038
vapiera7fbd5a2016-06-16 09:17:49 -07005039 print('The tree is %s' % status)
5040 print()
5041 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005042 if status != 'open':
5043 return 1
5044 return 0
5045
5046
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005047@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005048def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005049 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005050 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005051 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005052 '-b', '--bot', action='append',
5053 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5054 'times to specify multiple builders. ex: '
5055 '"-b win_rel -b win_layout". See '
5056 'the try server waterfall for the builders name and the tests '
5057 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005058 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005059 '-B', '--bucket', default='',
5060 help=('Buildbucket bucket to send the try requests.'))
5061 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005062 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005063 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005064 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005065 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005066 help='Revision to use for the try job; default: the revision will '
5067 'be determined by the try recipe that builder runs, which usually '
5068 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005069 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005070 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005071 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005072 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005073 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005074 '--category', default='git_cl_try', help='Specify custom build category.')
5075 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005076 '--project',
5077 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005078 'in recipe to determine to which repository or directory to '
5079 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005080 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005081 '-p', '--property', dest='properties', action='append', default=[],
5082 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005083 'key2=value2 etc. The value will be treated as '
5084 'json if decodable, or as string otherwise. '
5085 'NOTE: using this may make your try job not usable for CQ, '
5086 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005087 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005088 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5089 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005090 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005091 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005092 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005093 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005094 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005095 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005096
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005097 if options.master and options.master.startswith('luci.'):
5098 parser.error(
5099 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005100 # Make sure that all properties are prop=value pairs.
5101 bad_params = [x for x in options.properties if '=' not in x]
5102 if bad_params:
5103 parser.error('Got properties with missing "=": %s' % bad_params)
5104
maruel@chromium.org15192402012-09-06 12:38:29 +00005105 if args:
5106 parser.error('Unknown arguments: %s' % args)
5107
Koji Ishii31c14782018-01-08 17:17:33 +09005108 cl = Changelist(auth_config=auth_config, issue=options.issue,
5109 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005110 if not cl.GetIssue():
5111 parser.error('Need to upload first')
5112
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005113 if cl.IsGerrit():
5114 # HACK: warm up Gerrit change detail cache to save on RPCs.
5115 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5116
tandriie113dfd2016-10-11 10:20:12 -07005117 error_message = cl.CannotTriggerTryJobReason()
5118 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005119 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005120
borenet6c0efe62016-10-19 08:13:29 -07005121 if options.bucket and options.master:
5122 parser.error('Only one of --bucket and --master may be used.')
5123
qyearsley1fdfcb62016-10-24 13:22:03 -07005124 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005125
qyearsleydd49f942016-10-28 11:57:22 -07005126 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5127 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005128 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005129 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005130 print('git cl try with no bots now defaults to CQ dry run.')
5131 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5132 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005133
borenet6c0efe62016-10-19 08:13:29 -07005134 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005135 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005136 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005137 'of bot requires an initial job from a parent (usually a builder). '
5138 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005139 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005140 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005141
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005142 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005143 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005144 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005145 except BuildbucketResponseException as ex:
5146 print('ERROR: %s' % ex)
5147 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005148 return 0
5149
5150
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005151@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005152def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005153 """Prints info about try jobs associated with current CL."""
5154 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005155 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005156 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005157 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005158 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005159 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005160 '--color', action='store_true', default=setup_color.IS_TTY,
5161 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005162 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005163 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5164 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005165 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005166 '--json', help=('Path of JSON output file to write try job results to,'
5167 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005168 parser.add_option_group(group)
5169 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005170 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005171 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005172 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005173 if args:
5174 parser.error('Unrecognized args: %s' % ' '.join(args))
5175
5176 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005177 cl = Changelist(
5178 issue=options.issue, codereview=options.forced_codereview,
5179 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005180 if not cl.GetIssue():
5181 parser.error('Need to upload first')
5182
tandrii221ab252016-10-06 08:12:04 -07005183 patchset = options.patchset
5184 if not patchset:
5185 patchset = cl.GetMostRecentPatchset()
5186 if not patchset:
5187 parser.error('Codereview doesn\'t know about issue %s. '
5188 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005189 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005190 cl.GetIssue())
5191
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005192 try:
tandrii221ab252016-10-06 08:12:04 -07005193 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005194 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005195 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005196 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005197 if options.json:
5198 write_try_results_json(options.json, jobs)
5199 else:
5200 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005201 return 0
5202
5203
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005204@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005205@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005206def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005207 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005208 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005209 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005210 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005211
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005212 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005213 if args:
5214 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005215 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005216 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005217 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005218 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005219
5220 # Clear configured merge-base, if there is one.
5221 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005222 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005223 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005224 return 0
5225
5226
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005227@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005228def CMDweb(parser, args):
5229 """Opens the current CL in the web browser."""
5230 _, args = parser.parse_args(args)
5231 if args:
5232 parser.error('Unrecognized args: %s' % ' '.join(args))
5233
5234 issue_url = Changelist().GetIssueURL()
5235 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005236 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005237 return 1
5238
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005239 # Redirect I/O before invoking browser to hide its output. For example, this
5240 # allows to hide "Created new window in existing browser session." message
5241 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5242 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005243 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005244 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005245 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005246 os.open(os.devnull, os.O_RDWR)
5247 try:
5248 webbrowser.open(issue_url)
5249 finally:
5250 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005251 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005252 return 0
5253
5254
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005255@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005256def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005257 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005258 parser.add_option('-d', '--dry-run', action='store_true',
5259 help='trigger in dry run mode')
5260 parser.add_option('-c', '--clear', action='store_true',
5261 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005262 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005263 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005264 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005265 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005266 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005267 if args:
5268 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005269 if options.dry_run and options.clear:
5270 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5271
iannuccie53c9352016-08-17 14:40:40 -07005272 cl = Changelist(auth_config=auth_config, issue=options.issue,
5273 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005274 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005275 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005276 elif options.dry_run:
5277 state = _CQState.DRY_RUN
5278 else:
5279 state = _CQState.COMMIT
5280 if not cl.GetIssue():
5281 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005282 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005283 return 0
5284
5285
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005286@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005287def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005288 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005289 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005290 auth.add_auth_options(parser)
5291 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005292 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005293 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005294 if args:
5295 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005296 cl = Changelist(auth_config=auth_config, issue=options.issue,
5297 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005298 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005299 if not cl.GetIssue():
5300 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005301 cl.CloseIssue()
5302 return 0
5303
5304
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005305@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005306def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005307 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005308 parser.add_option(
5309 '--stat',
5310 action='store_true',
5311 dest='stat',
5312 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005313 auth.add_auth_options(parser)
5314 options, args = parser.parse_args(args)
5315 auth_config = auth.extract_auth_config_from_options(options)
5316 if args:
5317 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005318
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005319 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005320 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005321 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005322 if not issue:
5323 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005324
Aaron Gablea718c3e2017-08-28 17:47:28 -07005325 base = cl._GitGetBranchConfigValue('last-upload-hash')
5326 if not base:
5327 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5328 if not base:
5329 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5330 revision_info = detail['revisions'][detail['current_revision']]
5331 fetch_info = revision_info['fetch']['http']
5332 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5333 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005334
Aaron Gablea718c3e2017-08-28 17:47:28 -07005335 cmd = ['git', 'diff']
5336 if options.stat:
5337 cmd.append('--stat')
5338 cmd.append(base)
5339 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005340
5341 return 0
5342
5343
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005344@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005345def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005346 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005347 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005348 '--ignore-current',
5349 action='store_true',
5350 help='Ignore the CL\'s current reviewers and start from scratch.')
5351 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005352 '--ignore-self',
5353 action='store_true',
5354 help='Do not consider CL\'s author as an owners.')
5355 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005356 '--no-color',
5357 action='store_true',
5358 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005359 parser.add_option(
5360 '--batch',
5361 action='store_true',
5362 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005363 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005364 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005365 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005366
5367 author = RunGit(['config', 'user.email']).strip() or None
5368
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005369 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005370
5371 if args:
5372 if len(args) > 1:
5373 parser.error('Unknown args')
5374 base_branch = args[0]
5375 else:
5376 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005377 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005378
5379 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005380 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5381
5382 if options.batch:
5383 db = owners.Database(change.RepositoryRoot(), file, os.path)
5384 print('\n'.join(db.reviewers_for(affected_files, author)))
5385 return 0
5386
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005387 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005388 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005389 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005390 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005391 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005392 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005393 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005394 override_files=change.OriginalOwnersFiles(),
5395 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005396
5397
Aiden Bennerc08566e2018-10-03 17:52:42 +00005398def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005399 """Generates a diff command."""
5400 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005401 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5402
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005403 if allow_prefix:
5404 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5405 # case that diff.noprefix is set in the user's git config.
5406 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5407 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005408 diff_cmd += ['--no-prefix']
5409
5410 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005411
5412 if args:
5413 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005414 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005415 diff_cmd.append(arg)
5416 else:
5417 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005418
5419 return diff_cmd
5420
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005421
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005422def MatchingFileType(file_name, extensions):
5423 """Returns true if the file name ends with one of the given extensions."""
5424 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005425
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005426
enne@chromium.org555cfe42014-01-29 18:21:39 +00005427@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005428@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005429def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005430 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005431 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005432 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005433 parser.add_option('--full', action='store_true',
5434 help='Reformat the full content of all touched files')
5435 parser.add_option('--dry-run', action='store_true',
5436 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005437 parser.add_option(
5438 '--python',
5439 action='store_true',
5440 default=None,
5441 help='Enables python formatting on all python files.')
5442 parser.add_option(
5443 '--no-python',
5444 action='store_true',
5445 dest='python',
5446 help='Disables python formatting on all python files. '
5447 'Takes precedence over --python. '
5448 'If neither --python or --no-python are set, python '
5449 'files that have a .style.yapf file in an ancestor '
5450 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005451 parser.add_option('--js', action='store_true',
5452 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005453 parser.add_option('--diff', action='store_true',
5454 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005455 parser.add_option('--presubmit', action='store_true',
5456 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005457 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005458
Daniel Chengc55eecf2016-12-30 03:11:02 -08005459 # Normalize any remaining args against the current path, so paths relative to
5460 # the current directory are still resolved as expected.
5461 args = [os.path.join(os.getcwd(), arg) for arg in args]
5462
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005463 # git diff generates paths against the root of the repository. Change
5464 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005465 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005466 if rel_base_path:
5467 os.chdir(rel_base_path)
5468
digit@chromium.org29e47272013-05-17 17:01:46 +00005469 # Grab the merge-base commit, i.e. the upstream commit of the current
5470 # branch when it was created or the last time it was rebased. This is
5471 # to cover the case where the user may have called "git fetch origin",
5472 # moving the origin branch to a newer commit, but hasn't rebased yet.
5473 upstream_commit = None
5474 cl = Changelist()
5475 upstream_branch = cl.GetUpstreamBranch()
5476 if upstream_branch:
5477 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5478 upstream_commit = upstream_commit.strip()
5479
5480 if not upstream_commit:
5481 DieWithError('Could not find base commit for this branch. '
5482 'Are you in detached state?')
5483
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005484 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5485 diff_output = RunGit(changed_files_cmd)
5486 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005487 # Filter out files deleted by this CL
5488 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005489
Christopher Lamc5ba6922017-01-24 11:19:14 +11005490 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005491 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005492
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005493 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5494 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5495 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005496 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005497
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005498 top_dir = os.path.normpath(
5499 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5500
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005501 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5502 # formatted. This is used to block during the presubmit.
5503 return_value = 0
5504
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005505 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005506 # Locate the clang-format binary in the checkout
5507 try:
5508 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005509 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005510 DieWithError(e)
5511
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005512 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005513 cmd = [clang_format_tool]
5514 if not opts.dry_run and not opts.diff:
5515 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005516 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005517 if opts.diff:
5518 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005519 else:
5520 env = os.environ.copy()
5521 env['PATH'] = str(os.path.dirname(clang_format_tool))
5522 try:
5523 script = clang_format.FindClangFormatScriptInChromiumTree(
5524 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005525 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005526 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005527
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005528 cmd = [sys.executable, script, '-p0']
5529 if not opts.dry_run and not opts.diff:
5530 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005531
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005532 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5533 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005534
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005535 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5536 if opts.diff:
5537 sys.stdout.write(stdout)
5538 if opts.dry_run and len(stdout) > 0:
5539 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005540
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005541 # Similar code to above, but using yapf on .py files rather than clang-format
5542 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005543 py_explicitly_disabled = opts.python is not None and not opts.python
5544 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005545 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5546 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5547 if sys.platform.startswith('win'):
5548 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005549
Aiden Bennerc08566e2018-10-03 17:52:42 +00005550 # If we couldn't find a yapf file we'll default to the chromium style
5551 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005552 chromium_default_yapf_style = os.path.join(depot_tools_path,
5553 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005554 # Used for caching.
5555 yapf_configs = {}
5556 for f in python_diff_files:
5557 # Find the yapf style config for the current file, defaults to depot
5558 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005559 _FindYapfConfigFile(f, yapf_configs, top_dir)
5560
5561 # Turn on python formatting by default if a yapf config is specified.
5562 # This breaks in the case of this repo though since the specified
5563 # style file is also the global default.
5564 if opts.python is None:
5565 filtered_py_files = []
5566 for f in python_diff_files:
5567 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5568 filtered_py_files.append(f)
5569 else:
5570 filtered_py_files = python_diff_files
5571
5572 # Note: yapf still seems to fix indentation of the entire file
5573 # even if line ranges are specified.
5574 # See https://github.com/google/yapf/issues/499
5575 if not opts.full and filtered_py_files:
5576 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5577
5578 for f in filtered_py_files:
5579 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5580 if yapf_config is None:
5581 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005582
5583 cmd = [yapf_tool, '--style', yapf_config, f]
5584
5585 has_formattable_lines = False
5586 if not opts.full:
5587 # Only run yapf over changed line ranges.
5588 for diff_start, diff_len in py_line_diffs[f]:
5589 diff_end = diff_start + diff_len - 1
5590 # Yapf errors out if diff_end < diff_start but this
5591 # is a valid line range diff for a removal.
5592 if diff_end >= diff_start:
5593 has_formattable_lines = True
5594 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5595 # If all line diffs were removals we have nothing to format.
5596 if not has_formattable_lines:
5597 continue
5598
5599 if opts.diff or opts.dry_run:
5600 cmd += ['--diff']
5601 # Will return non-zero exit code if non-empty diff.
5602 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5603 if opts.diff:
5604 sys.stdout.write(stdout)
5605 elif len(stdout) > 0:
5606 return_value = 2
5607 else:
5608 cmd += ['-i']
5609 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005610
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005611 # Dart's formatter does not have the nice property of only operating on
5612 # modified chunks, so hard code full.
5613 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005614 try:
5615 command = [dart_format.FindDartFmtToolInChromiumTree()]
5616 if not opts.dry_run and not opts.diff:
5617 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005618 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005619
ppi@chromium.org6593d932016-03-03 15:41:15 +00005620 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005621 if opts.dry_run and stdout:
5622 return_value = 2
5623 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005624 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5625 'found in this checkout. Files in other languages are still '
5626 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005627
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005628 # Format GN build files. Always run on full build files for canonical form.
5629 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005630 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005631 if opts.dry_run or opts.diff:
5632 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005633 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005634 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5635 shell=sys.platform == 'win32',
5636 cwd=top_dir)
5637 if opts.dry_run and gn_ret == 2:
5638 return_value = 2 # Not formatted.
5639 elif opts.diff and gn_ret == 2:
5640 # TODO this should compute and print the actual diff.
5641 print("This change has GN build file diff for " + gn_diff_file)
5642 elif gn_ret != 0:
5643 # For non-dry run cases (and non-2 return values for dry-run), a
5644 # nonzero error code indicates a failure, probably because the file
5645 # doesn't parse.
5646 DieWithError("gn format failed on " + gn_diff_file +
5647 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005648
Ilya Shermane081cbe2017-08-15 17:51:04 -07005649 # Skip the metrics formatting from the global presubmit hook. These files have
5650 # a separate presubmit hook that issues an error if the files need formatting,
5651 # whereas the top-level presubmit script merely issues a warning. Formatting
5652 # these files is somewhat slow, so it's important not to duplicate the work.
5653 if not opts.presubmit:
5654 for xml_dir in GetDirtyMetricsDirs(diff_files):
5655 tool_dir = os.path.join(top_dir, xml_dir)
5656 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5657 if opts.dry_run or opts.diff:
5658 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005659 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005660 if opts.diff:
5661 sys.stdout.write(stdout)
5662 if opts.dry_run and stdout:
5663 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005664
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005665 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005666
Steven Holte2e664bf2017-04-21 13:10:47 -07005667def GetDirtyMetricsDirs(diff_files):
5668 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5669 metrics_xml_dirs = [
5670 os.path.join('tools', 'metrics', 'actions'),
5671 os.path.join('tools', 'metrics', 'histograms'),
5672 os.path.join('tools', 'metrics', 'rappor'),
5673 os.path.join('tools', 'metrics', 'ukm')]
5674 for xml_dir in metrics_xml_dirs:
5675 if any(file.startswith(xml_dir) for file in xml_diff_files):
5676 yield xml_dir
5677
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005678
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005679@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005680@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005681def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005682 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005683 _, args = parser.parse_args(args)
5684
5685 if len(args) != 1:
5686 parser.print_help()
5687 return 1
5688
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005689 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005690 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005691 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005692
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005693 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005694
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005695 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005696 output = RunGit(['config', '--local', '--get-regexp',
5697 r'branch\..*\.%s' % issueprefix],
5698 error_ok=True)
5699 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005700 if issue == target_issue:
5701 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005702
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005703 branches = []
5704 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005705 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005706 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005707 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005708 return 1
5709 if len(branches) == 1:
5710 RunGit(['checkout', branches[0]])
5711 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005712 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005713 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005714 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005715 which = raw_input('Choose by index: ')
5716 try:
5717 RunGit(['checkout', branches[int(which)]])
5718 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005719 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005720 return 1
5721
5722 return 0
5723
5724
maruel@chromium.org29404b52014-09-08 22:58:00 +00005725def CMDlol(parser, args):
5726 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005727 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005728 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5729 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5730 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005731 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005732 return 0
5733
5734
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005735class OptionParser(optparse.OptionParser):
5736 """Creates the option parse and add --verbose support."""
5737 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005738 optparse.OptionParser.__init__(
5739 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005740 self.add_option(
5741 '-v', '--verbose', action='count', default=0,
5742 help='Use 2 times for more debugging info')
5743
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005744 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005745 try:
5746 return self._parse_args(args)
5747 finally:
5748 # Regardless of success or failure of args parsing, we want to report
5749 # metrics, but only after logging has been initialized (if parsing
5750 # succeeded).
5751 global settings
5752 settings = Settings()
5753
5754 if not metrics.DISABLE_METRICS_COLLECTION:
5755 # GetViewVCUrl ultimately calls logging method.
5756 project_url = settings.GetViewVCUrl().strip('/+')
5757 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5758 metrics.collector.add('project_urls', [project_url])
5759
5760 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005761 # Create an optparse.Values object that will store only the actual passed
5762 # options, without the defaults.
5763 actual_options = optparse.Values()
5764 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5765 # Create an optparse.Values object with the default options.
5766 options = optparse.Values(self.get_default_values().__dict__)
5767 # Update it with the options passed by the user.
5768 options._update_careful(actual_options.__dict__)
5769 # Store the options passed by the user in an _actual_options attribute.
5770 # We store only the keys, and not the values, since the values can contain
5771 # arbitrary information, which might be PII.
5772 metrics.collector.add('arguments', actual_options.__dict__.keys())
5773
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005774 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005775 logging.basicConfig(
5776 level=levels[min(options.verbose, len(levels) - 1)],
5777 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5778 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005779
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005780 return options, args
5781
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005782
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005783def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005784 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005785 print('\nYour python version %s is unsupported, please upgrade.\n' %
5786 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005787 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005788
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005789 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005790 dispatcher = subcommand.CommandDispatcher(__name__)
5791 try:
5792 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005793 except auth.AuthenticationError as e:
5794 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005795 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005796 if e.code != 500:
5797 raise
5798 DieWithError(
5799 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5800 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005801 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005802
5803
5804if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005805 # These affect sys.stdout so do it outside of main() to simplify mocks in
5806 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005807 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005808 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005809 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005810 sys.exit(main(sys.argv[1:]))