blob: f7f84d8b0b23554d5f90997cd8076ce1fd531b5c [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')
Edward Lemur1b52d872019-05-09 21:12:12 +00002555 git_push_metadata['trace_name'] = trace_name
2556 gclient_utils.FileWrite(
2557 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2558
2559 # Keep only the first 6 characters of the git hashes on the packet
2560 # trace. This greatly decreases size after compression.
2561 packet_traces = os.path.join(traces_dir, 'trace-packet')
2562 if os.path.isfile(packet_traces):
2563 contents = gclient_utils.FileRead(packet_traces)
2564 gclient_utils.FileWrite(
2565 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2566 shutil.make_archive(traces_zip, 'zip', traces_dir)
2567
2568 # Collect and compress the git config and gitcookies.
2569 git_config = RunGit(['config', '-l'])
2570 gclient_utils.FileWrite(
2571 os.path.join(git_info_dir, 'git-config'),
2572 git_config)
2573
2574 cookie_auth = gerrit_util.Authenticator.get()
2575 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2576 gitcookies_path = cookie_auth.get_gitcookies_path()
2577 if os.path.isfile(gitcookies_path):
2578 gitcookies = gclient_utils.FileRead(gitcookies_path)
2579 gclient_utils.FileWrite(
2580 os.path.join(git_info_dir, 'gitcookies'),
2581 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2582 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2583
Edward Lemur1b52d872019-05-09 21:12:12 +00002584 gclient_utils.rmtree(git_info_dir)
2585
2586 def _RunGitPushWithTraces(
2587 self, change_desc, refspec, refspec_opts, git_push_metadata):
2588 """Run git push and collect the traces resulting from the execution."""
2589 # Create a temporary directory to store traces in. Traces will be compressed
2590 # and stored in a 'traces' dir inside depot_tools.
2591 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002592 trace_name = os.path.join(
2593 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002594
2595 env = os.environ.copy()
2596 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2597 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
2598 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2599 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2600 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2601
2602 try:
2603 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002604 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002605 before_push = time_time()
2606 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002607 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002608 env=env,
2609 print_stdout=True,
2610 # Flush after every line: useful for seeing progress when running as
2611 # recipe.
2612 filter_fn=lambda _: sys.stdout.flush())
2613 except subprocess2.CalledProcessError as e:
2614 push_returncode = e.returncode
2615 DieWithError('Failed to create a change. Please examine output above '
2616 'for the reason of the failure.\n'
2617 'Hint: run command below to diagnose common Git/Gerrit '
2618 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002619 ' git cl creds-check\n'
2620 '\n'
2621 'If git-cl is not working correctly, file a bug under the '
2622 'Infra>SDK component including the files below.\n'
2623 'Review the files before upload, since they might contain '
2624 'sensitive information.\n'
2625 'Set the Restrict-View-Google label so that they are not '
2626 'publicly accessible.\n'
2627 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002628 change_desc)
2629 finally:
2630 execution_time = time_time() - before_push
2631 metrics.collector.add_repeated('sub_commands', {
2632 'command': 'git push',
2633 'execution_time': execution_time,
2634 'exit_code': push_returncode,
2635 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2636 })
2637
Edward Lemur1b52d872019-05-09 21:12:12 +00002638 git_push_metadata['execution_time'] = execution_time
2639 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002640 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002641
Edward Lemur1b52d872019-05-09 21:12:12 +00002642 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002643 gclient_utils.rmtree(traces_dir)
2644
2645 return push_stdout
2646
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002647 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002648 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002649 if options.squash and options.no_squash:
2650 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002651
2652 if not options.squash and not options.no_squash:
2653 # Load default for user, repo, squash=true, in this order.
2654 options.squash = settings.GetSquashGerritUploads()
2655 elif options.no_squash:
2656 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002657
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002658 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002659 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002660 # This may be None; default fallback value is determined in logic below.
2661 title = options.title
2662
Dominic Battre7d1c4842017-10-27 09:17:28 +02002663 # Extract bug number from branch name.
2664 bug = options.bug
2665 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2666 if not bug and match:
2667 bug = match.group(1)
2668
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002669 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002670 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002671 if self.GetIssue():
2672 # Try to get the message from a previous upload.
2673 message = self.GetDescription()
2674 if not message:
2675 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002676 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002677 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002678 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002679 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002680 # When uploading a subsequent patchset, -m|--message is taken
2681 # as the patchset title if --title was not provided.
2682 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002683 else:
2684 default_title = RunGit(
2685 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002686 if options.force:
2687 title = default_title
2688 else:
2689 title = ask_for_data(
2690 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002691 change_id = self._GetChangeDetail()['change_id']
2692 while True:
2693 footer_change_ids = git_footers.get_footer_change_id(message)
2694 if footer_change_ids == [change_id]:
2695 break
2696 if not footer_change_ids:
2697 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002698 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002699 continue
2700 # There is already a valid footer but with different or several ids.
2701 # Doing this automatically is non-trivial as we don't want to lose
2702 # existing other footers, yet we want to append just 1 desired
2703 # Change-Id. Thus, just create a new footer, but let user verify the
2704 # new description.
2705 message = '%s\n\nChange-Id: %s' % (message, change_id)
2706 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002707 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002708 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002709 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002710 'Please, check the proposed correction to the description, '
2711 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2712 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2713 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002714 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002715 if not options.force:
2716 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002717 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002718 message = change_desc.description
2719 if not message:
2720 DieWithError("Description is empty. Aborting...")
2721 # Continue the while loop.
2722 # Sanity check of this code - we should end up with proper message
2723 # footer.
2724 assert [change_id] == git_footers.get_footer_change_id(message)
2725 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002726 else: # if not self.GetIssue()
2727 if options.message:
2728 message = options.message
2729 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002730 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002731 if options.title:
2732 message = options.title + '\n\n' + message
2733 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002734
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002736 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002737 # On first upload, patchset title is always this string, while
2738 # --title flag gets converted to first line of message.
2739 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002740 if not change_desc.description:
2741 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002742 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002743 if len(change_ids) > 1:
2744 DieWithError('too many Change-Id footers, at most 1 allowed.')
2745 if not change_ids:
2746 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002747 change_desc.set_description(git_footers.add_footer_change_id(
2748 change_desc.description,
2749 GenerateGerritChangeId(change_desc.description)))
2750 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002751 assert len(change_ids) == 1
2752 change_id = change_ids[0]
2753
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002754 if options.reviewers or options.tbrs or options.add_owners_to:
2755 change_desc.update_reviewers(options.reviewers, options.tbrs,
2756 options.add_owners_to, change)
2757
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002758 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002759 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2760 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002762 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2763 desc_tempfile.write(change_desc.description)
2764 desc_tempfile.close()
2765 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2766 '-F', desc_tempfile.name]).strip()
2767 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768 else:
2769 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002770 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002771 if not change_desc.description:
2772 DieWithError("Description is empty. Aborting...")
2773
2774 if not git_footers.get_footer_change_id(change_desc.description):
2775 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002776 change_desc.set_description(
2777 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002778 if options.reviewers or options.tbrs or options.add_owners_to:
2779 change_desc.update_reviewers(options.reviewers, options.tbrs,
2780 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002781 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002782 # For no-squash mode, we assume the remote called "origin" is the one we
2783 # want. It is not worthwhile to support different workflows for
2784 # no-squash mode.
2785 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002786 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2787
2788 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002789 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2791 ref_to_push)]).splitlines()
2792 if len(commits) > 1:
2793 print('WARNING: This will upload %d commits. Run the following command '
2794 'to see which commits will be uploaded: ' % len(commits))
2795 print('git log %s..%s' % (parent, ref_to_push))
2796 print('You can also use `git squash-branch` to squash these into a '
2797 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002798 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002799
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002800 if options.reviewers or options.tbrs or options.add_owners_to:
2801 change_desc.update_reviewers(options.reviewers, options.tbrs,
2802 options.add_owners_to, change)
2803
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002804 reviewers = sorted(change_desc.get_reviewers())
2805 # Add cc's from the CC_LIST and --cc flag (if any).
2806 if not options.private and not options.no_autocc:
2807 cc = self.GetCCList().split(',')
2808 else:
2809 cc = []
2810 if options.cc:
2811 cc.extend(options.cc)
2812 cc = filter(None, [email.strip() for email in cc])
2813 if change_desc.get_cced():
2814 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002815 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2816 valid_accounts = set(reviewers + cc)
2817 # TODO(crbug/877717): relax this for all hosts.
2818 else:
2819 valid_accounts = gerrit_util.ValidAccounts(
2820 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002821 logging.info('accounts %s are recognized, %s invalid',
2822 sorted(valid_accounts),
2823 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002824
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002825 # Extra options that can be specified at push time. Doc:
2826 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002827 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002828
Aaron Gable844cf292017-06-28 11:32:59 -07002829 # By default, new changes are started in WIP mode, and subsequent patchsets
2830 # don't send email. At any time, passing --send-mail will mark the change
2831 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002832 if options.send_mail:
2833 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002834 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002835 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002836 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002837 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002838 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002839
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002840 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002841 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002842
Aaron Gable9b713dd2016-12-14 16:04:21 -08002843 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002844 # Punctuation and whitespace in |title| must be percent-encoded.
2845 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002846
agablec6787972016-09-09 16:13:34 -07002847 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002848 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002849
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002850 for r in sorted(reviewers):
2851 if r in valid_accounts:
2852 refspec_opts.append('r=%s' % r)
2853 reviewers.remove(r)
2854 else:
2855 # TODO(tandrii): this should probably be a hard failure.
2856 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2857 % r)
2858 for c in sorted(cc):
2859 # refspec option will be rejected if cc doesn't correspond to an
2860 # account, even though REST call to add such arbitrary cc may succeed.
2861 if c in valid_accounts:
2862 refspec_opts.append('cc=%s' % c)
2863 cc.remove(c)
2864
rmistry9eadede2016-09-19 11:22:43 -07002865 if options.topic:
2866 # Documentation on Gerrit topics is here:
2867 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002868 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002869
Edward Lemur687ca902018-12-05 02:30:30 +00002870 if options.enable_auto_submit:
2871 refspec_opts.append('l=Auto-Submit+1')
2872 if options.use_commit_queue:
2873 refspec_opts.append('l=Commit-Queue+2')
2874 elif options.cq_dry_run:
2875 refspec_opts.append('l=Commit-Queue+1')
2876
2877 if change_desc.get_reviewers(tbr_only=True):
2878 score = gerrit_util.GetCodeReviewTbrScore(
2879 self._GetGerritHost(),
2880 self._GetGerritProject())
2881 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002882
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002883 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002884 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002885 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002886 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002887 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2888
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002889 refspec_suffix = ''
2890 if refspec_opts:
2891 refspec_suffix = '%' + ','.join(refspec_opts)
2892 assert ' ' not in refspec_suffix, (
2893 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2894 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2895
Edward Lemur1b52d872019-05-09 21:12:12 +00002896 git_push_metadata = {
2897 'gerrit_host': self._GetGerritHost(),
2898 'title': title or '<untitled>',
2899 'change_id': change_id,
2900 'description': change_desc.description,
2901 }
2902 push_stdout = self._RunGitPushWithTraces(
2903 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002904
2905 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002906 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002907 change_numbers = [m.group(1)
2908 for m in map(regex.match, push_stdout.splitlines())
2909 if m]
2910 if len(change_numbers) != 1:
2911 DieWithError(
2912 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002913 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002914 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002915 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002916
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002917 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002918 # GetIssue() is not set in case of non-squash uploads according to tests.
2919 # TODO(agable): non-squash uploads in git cl should be removed.
2920 gerrit_util.AddReviewers(
2921 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002922 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002923 reviewers, cc,
2924 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002925
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002926 return 0
2927
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002928 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2929 change_desc):
2930 """Computes parent of the generated commit to be uploaded to Gerrit.
2931
2932 Returns revision or a ref name.
2933 """
2934 if custom_cl_base:
2935 # Try to avoid creating additional unintended CLs when uploading, unless
2936 # user wants to take this risk.
2937 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2938 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2939 local_ref_of_target_remote])
2940 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002941 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002942 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2943 'If you proceed with upload, more than 1 CL may be created by '
2944 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2945 'If you are certain that specified base `%s` has already been '
2946 'uploaded to Gerrit as another CL, you may proceed.\n' %
2947 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2948 if not force:
2949 confirm_or_exit(
2950 'Do you take responsibility for cleaning up potential mess '
2951 'resulting from proceeding with upload?',
2952 action='upload')
2953 return custom_cl_base
2954
Aaron Gablef97e33d2017-03-30 15:44:27 -07002955 if remote != '.':
2956 return self.GetCommonAncestorWithUpstream()
2957
2958 # If our upstream branch is local, we base our squashed commit on its
2959 # squashed version.
2960 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2961
Aaron Gablef97e33d2017-03-30 15:44:27 -07002962 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002963 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002964
2965 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002966 # TODO(tandrii): consider checking parent change in Gerrit and using its
2967 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2968 # the tree hash of the parent branch. The upside is less likely bogus
2969 # requests to reupload parent change just because it's uploadhash is
2970 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002971 parent = RunGit(['config',
2972 'branch.%s.gerritsquashhash' % upstream_branch_name],
2973 error_ok=True).strip()
2974 # Verify that the upstream branch has been uploaded too, otherwise
2975 # Gerrit will create additional CLs when uploading.
2976 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2977 RunGitSilent(['rev-parse', parent + ':'])):
2978 DieWithError(
2979 '\nUpload upstream branch %s first.\n'
2980 'It is likely that this branch has been rebased since its last '
2981 'upload, so you just need to upload it again.\n'
2982 '(If you uploaded it with --no-squash, then branch dependencies '
2983 'are not supported, and you should reupload with --squash.)'
2984 % upstream_branch_name,
2985 change_desc)
2986 return parent
2987
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002988 def _AddChangeIdToCommitMessage(self, options, args):
2989 """Re-commits using the current message, assumes the commit hook is in
2990 place.
2991 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002992 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002993 git_command = ['commit', '--amend', '-m', log_desc]
2994 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002995 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002996 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002997 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002998 return new_log_desc
2999 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003000 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003001
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003002 def SetCQState(self, new_state):
3003 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003004 vote_map = {
3005 _CQState.NONE: 0,
3006 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003007 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003008 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003009 labels = {'Commit-Queue': vote_map[new_state]}
3010 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003011 gerrit_util.SetReview(
3012 self._GetGerritHost(), self._GerritChangeIdentifier(),
3013 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003014
tandriie113dfd2016-10-11 10:20:12 -07003015 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003016 try:
3017 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003018 except GerritChangeNotExists:
3019 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003020
3021 if data['status'] in ('ABANDONED', 'MERGED'):
3022 return 'CL %s is closed' % self.GetIssue()
3023
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003024 def GetTryJobProperties(self, patchset=None):
3025 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003026 data = self._GetChangeDetail(['ALL_REVISIONS'])
3027 patchset = int(patchset or self.GetPatchset())
3028 assert patchset
3029 revision_data = None # Pylint wants it to be defined.
3030 for revision_data in data['revisions'].itervalues():
3031 if int(revision_data['_number']) == patchset:
3032 break
3033 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003034 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003035 (patchset, self.GetIssue()))
3036 return {
3037 'patch_issue': self.GetIssue(),
3038 'patch_set': patchset or self.GetPatchset(),
3039 'patch_project': data['project'],
3040 'patch_storage': 'gerrit',
3041 'patch_ref': revision_data['fetch']['http']['ref'],
3042 'patch_repository_url': revision_data['fetch']['http']['url'],
3043 'patch_gerrit_url': self.GetCodereviewServer(),
3044 }
tandriie113dfd2016-10-11 10:20:12 -07003045
tandriide281ae2016-10-12 06:02:30 -07003046 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003047 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003048
Edward Lemur707d70b2018-02-07 00:50:14 +01003049 def GetReviewers(self):
3050 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003051 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003052
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003053
3054_CODEREVIEW_IMPLEMENTATIONS = {
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003055 'gerrit': _GerritChangelistImpl,
3056}
3057
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003058
iannuccie53c9352016-08-17 14:40:40 -07003059def _add_codereview_issue_select_options(parser, extra=""):
3060 _add_codereview_select_options(parser)
3061
3062 text = ('Operate on this issue number instead of the current branch\'s '
3063 'implicit issue.')
3064 if extra:
3065 text += ' '+extra
3066 parser.add_option('-i', '--issue', type=int, help=text)
3067
3068
3069def _process_codereview_issue_select_options(parser, options):
3070 _process_codereview_select_options(parser, options)
3071 if options.issue is not None and not options.forced_codereview:
3072 parser.error('--issue must be specified with either --rietveld or --gerrit')
3073
3074
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003075def _add_codereview_select_options(parser):
3076 """Appends --gerrit and --rietveld options to force specific codereview."""
3077 parser.codereview_group = optparse.OptionGroup(
3078 parser, 'EXPERIMENTAL! Codereview override options')
3079 parser.add_option_group(parser.codereview_group)
3080 parser.codereview_group.add_option(
3081 '--gerrit', action='store_true',
3082 help='Force the use of Gerrit for codereview')
3083 parser.codereview_group.add_option(
3084 '--rietveld', action='store_true',
3085 help='Force the use of Rietveld for codereview')
3086
3087
3088def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003089 if options.rietveld:
3090 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003091 options.forced_codereview = None
3092 if options.gerrit:
3093 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003094
3095
tandriif9aefb72016-07-01 09:06:51 -07003096def _get_bug_line_values(default_project, bugs):
3097 """Given default_project and comma separated list of bugs, yields bug line
3098 values.
3099
3100 Each bug can be either:
3101 * a number, which is combined with default_project
3102 * string, which is left as is.
3103
3104 This function may produce more than one line, because bugdroid expects one
3105 project per line.
3106
3107 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3108 ['v8:123', 'chromium:789']
3109 """
3110 default_bugs = []
3111 others = []
3112 for bug in bugs.split(','):
3113 bug = bug.strip()
3114 if bug:
3115 try:
3116 default_bugs.append(int(bug))
3117 except ValueError:
3118 others.append(bug)
3119
3120 if default_bugs:
3121 default_bugs = ','.join(map(str, default_bugs))
3122 if default_project:
3123 yield '%s:%s' % (default_project, default_bugs)
3124 else:
3125 yield default_bugs
3126 for other in sorted(others):
3127 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3128 yield other
3129
3130
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003131class ChangeDescription(object):
3132 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003133 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003134 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003135 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003136 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003137 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3138 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3139 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3140 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003141
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003142 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003143 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003144
agable@chromium.org42c20792013-09-12 17:34:49 +00003145 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003146 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003147 return '\n'.join(self._description_lines)
3148
3149 def set_description(self, desc):
3150 if isinstance(desc, basestring):
3151 lines = desc.splitlines()
3152 else:
3153 lines = [line.rstrip() for line in desc]
3154 while lines and not lines[0]:
3155 lines.pop(0)
3156 while lines and not lines[-1]:
3157 lines.pop(-1)
3158 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003159
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003160 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3161 """Rewrites the R=/TBR= line(s) as a single line each.
3162
3163 Args:
3164 reviewers (list(str)) - list of additional emails to use for reviewers.
3165 tbrs (list(str)) - list of additional emails to use for TBRs.
3166 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3167 the change that are missing OWNER coverage. If this is not None, you
3168 must also pass a value for `change`.
3169 change (Change) - The Change that should be used for OWNERS lookups.
3170 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003171 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003172 assert isinstance(tbrs, list), tbrs
3173
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003174 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003175 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003176
3177 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003178 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003179
3180 reviewers = set(reviewers)
3181 tbrs = set(tbrs)
3182 LOOKUP = {
3183 'TBR': tbrs,
3184 'R': reviewers,
3185 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003186
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003187 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003188 regexp = re.compile(self.R_LINE)
3189 matches = [regexp.match(line) for line in self._description_lines]
3190 new_desc = [l for i, l in enumerate(self._description_lines)
3191 if not matches[i]]
3192 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003193
agable@chromium.org42c20792013-09-12 17:34:49 +00003194 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003195
3196 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003197 for match in matches:
3198 if not match:
3199 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003200 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3201
3202 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003203 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003204 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003205 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003206 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003207 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003208 LOOKUP[add_owners_to].update(
3209 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003210
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003211 # If any folks ended up in both groups, remove them from tbrs.
3212 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003213
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003214 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3215 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003216
3217 # Put the new lines in the description where the old first R= line was.
3218 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3219 if 0 <= line_loc < len(self._description_lines):
3220 if new_tbr_line:
3221 self._description_lines.insert(line_loc, new_tbr_line)
3222 if new_r_line:
3223 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003224 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003225 if new_r_line:
3226 self.append_footer(new_r_line)
3227 if new_tbr_line:
3228 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003229
Aaron Gable3a16ed12017-03-23 10:51:55 -07003230 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003231 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003232 self.set_description([
3233 '# Enter a description of the change.',
3234 '# This will be displayed on the codereview site.',
3235 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003236 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 '--------------------',
3238 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003239
agable@chromium.org42c20792013-09-12 17:34:49 +00003240 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003241 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00003242 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003243 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003244 if git_footer:
3245 self.append_footer('Bug: %s' % ', '.join(values))
3246 else:
3247 for value in values:
3248 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003249
agable@chromium.org42c20792013-09-12 17:34:49 +00003250 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003251 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003252 if not content:
3253 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003254 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003255
Bruce Dawson2377b012018-01-11 16:46:49 -08003256 # Strip off comments and default inserted "Bug:" line.
3257 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003258 (line.startswith('#') or
3259 line.rstrip() == "Bug:" or
3260 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003261 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003262 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003263 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003264
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003265 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003266 """Adds a footer line to the description.
3267
3268 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3269 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3270 that Gerrit footers are always at the end.
3271 """
3272 parsed_footer_line = git_footers.parse_footer(line)
3273 if parsed_footer_line:
3274 # Line is a gerrit footer in the form: Footer-Key: any value.
3275 # Thus, must be appended observing Gerrit footer rules.
3276 self.set_description(
3277 git_footers.add_footer(self.description,
3278 key=parsed_footer_line[0],
3279 value=parsed_footer_line[1]))
3280 return
3281
3282 if not self._description_lines:
3283 self._description_lines.append(line)
3284 return
3285
3286 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3287 if gerrit_footers:
3288 # git_footers.split_footers ensures that there is an empty line before
3289 # actual (gerrit) footers, if any. We have to keep it that way.
3290 assert top_lines and top_lines[-1] == ''
3291 top_lines, separator = top_lines[:-1], top_lines[-1:]
3292 else:
3293 separator = [] # No need for separator if there are no gerrit_footers.
3294
3295 prev_line = top_lines[-1] if top_lines else ''
3296 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3297 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3298 top_lines.append('')
3299 top_lines.append(line)
3300 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003301
tandrii99a72f22016-08-17 14:33:24 -07003302 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003303 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003304 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003305 reviewers = [match.group(2).strip()
3306 for match in matches
3307 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003308 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003309
bradnelsond975b302016-10-23 12:20:23 -07003310 def get_cced(self):
3311 """Retrieves the list of reviewers."""
3312 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3313 cced = [match.group(2).strip() for match in matches if match]
3314 return cleanup_list(cced)
3315
Nodir Turakulov23b82142017-11-16 11:04:25 -08003316 def get_hash_tags(self):
3317 """Extracts and sanitizes a list of Gerrit hashtags."""
3318 subject = (self._description_lines or ('',))[0]
3319 subject = re.sub(
3320 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3321
3322 tags = []
3323 start = 0
3324 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3325 while True:
3326 m = bracket_exp.match(subject, start)
3327 if not m:
3328 break
3329 tags.append(self.sanitize_hash_tag(m.group(1)))
3330 start = m.end()
3331
3332 if not tags:
3333 # Try "Tag: " prefix.
3334 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3335 if m:
3336 tags.append(self.sanitize_hash_tag(m.group(1)))
3337 return tags
3338
3339 @classmethod
3340 def sanitize_hash_tag(cls, tag):
3341 """Returns a sanitized Gerrit hash tag.
3342
3343 A sanitized hashtag can be used as a git push refspec parameter value.
3344 """
3345 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3346
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003347 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3348 """Updates this commit description given the parent.
3349
3350 This is essentially what Gnumbd used to do.
3351 Consult https://goo.gl/WMmpDe for more details.
3352 """
3353 assert parent_msg # No, orphan branch creation isn't supported.
3354 assert parent_hash
3355 assert dest_ref
3356 parent_footer_map = git_footers.parse_footers(parent_msg)
3357 # This will also happily parse svn-position, which GnumbD is no longer
3358 # supporting. While we'd generate correct footers, the verifier plugin
3359 # installed in Gerrit will block such commit (ie git push below will fail).
3360 parent_position = git_footers.get_position(parent_footer_map)
3361
3362 # Cherry-picks may have last line obscuring their prior footers,
3363 # from git_footers perspective. This is also what Gnumbd did.
3364 cp_line = None
3365 if (self._description_lines and
3366 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3367 cp_line = self._description_lines.pop()
3368
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003369 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003370
3371 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3372 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003373 for i, line in enumerate(footer_lines):
3374 k, v = git_footers.parse_footer(line) or (None, None)
3375 if k and k.startswith('Cr-'):
3376 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003377
3378 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003379 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003380 if parent_position[0] == dest_ref:
3381 # Same branch as parent.
3382 number = int(parent_position[1]) + 1
3383 else:
3384 number = 1 # New branch, and extra lineage.
3385 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3386 int(parent_position[1])))
3387
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003388 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3389 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003390
3391 self._description_lines = top_lines
3392 if cp_line:
3393 self._description_lines.append(cp_line)
3394 if self._description_lines[-1] != '':
3395 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003396 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003397
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003398
Aaron Gablea1bab272017-04-11 16:38:18 -07003399def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003400 """Retrieves the reviewers that approved a CL from the issue properties with
3401 messages.
3402
3403 Note that the list may contain reviewers that are not committer, thus are not
3404 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003405
3406 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003407 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003408 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003409 return sorted(
3410 set(
3411 message['sender']
3412 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003413 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003414 )
3415 )
3416
3417
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003418def FindCodereviewSettingsFile(filename='codereview.settings'):
3419 """Finds the given file starting in the cwd and going up.
3420
3421 Only looks up to the top of the repository unless an
3422 'inherit-review-settings-ok' file exists in the root of the repository.
3423 """
3424 inherit_ok_file = 'inherit-review-settings-ok'
3425 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003426 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003427 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3428 root = '/'
3429 while True:
3430 if filename in os.listdir(cwd):
3431 if os.path.isfile(os.path.join(cwd, filename)):
3432 return open(os.path.join(cwd, filename))
3433 if cwd == root:
3434 break
3435 cwd = os.path.dirname(cwd)
3436
3437
3438def LoadCodereviewSettingsFromFile(fileobj):
3439 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003440 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003441
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003442 def SetProperty(name, setting, unset_error_ok=False):
3443 fullname = 'rietveld.' + name
3444 if setting in keyvals:
3445 RunGit(['config', fullname, keyvals[setting]])
3446 else:
3447 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3448
tandrii48df5812016-10-17 03:55:37 -07003449 if not keyvals.get('GERRIT_HOST', False):
3450 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003451 # Only server setting is required. Other settings can be absent.
3452 # In that case, we ignore errors raised during option deletion attempt.
3453 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3454 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3455 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003456 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003457 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3458 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003459 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3460 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003461
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003462 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003463 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003464
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003465 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003466 RunGit(['config', 'gerrit.squash-uploads',
3467 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003468
tandrii@chromium.org28253532016-04-14 13:46:56 +00003469 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003470 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003471 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3472
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003473 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003474 # should be of the form
3475 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3476 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003477 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3478 keyvals['ORIGIN_URL_CONFIG']])
3479
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003480
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003481def urlretrieve(source, destination):
3482 """urllib is broken for SSL connections via a proxy therefore we
3483 can't use urllib.urlretrieve()."""
3484 with open(destination, 'w') as f:
3485 f.write(urllib2.urlopen(source).read())
3486
3487
ukai@chromium.org712d6102013-11-27 00:52:58 +00003488def hasSheBang(fname):
3489 """Checks fname is a #! script."""
3490 with open(fname) as f:
3491 return f.read(2).startswith('#!')
3492
3493
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003494# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3495def DownloadHooks(*args, **kwargs):
3496 pass
3497
3498
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003499def DownloadGerritHook(force):
3500 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003501
3502 Args:
3503 force: True to update hooks. False to install hooks if not present.
3504 """
3505 if not settings.GetIsGerrit():
3506 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003507 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003508 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3509 if not os.access(dst, os.X_OK):
3510 if os.path.exists(dst):
3511 if not force:
3512 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003513 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003514 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003515 if not hasSheBang(dst):
3516 DieWithError('Not a script: %s\n'
3517 'You need to download from\n%s\n'
3518 'into .git/hooks/commit-msg and '
3519 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003520 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3521 except Exception:
3522 if os.path.exists(dst):
3523 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003524 DieWithError('\nFailed to download hooks.\n'
3525 'You need to download from\n%s\n'
3526 'into .git/hooks/commit-msg and '
3527 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003528
3529
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003530class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003531 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003532
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003533 _GOOGLESOURCE = 'googlesource.com'
3534
3535 def __init__(self):
3536 # Cached list of [host, identity, source], where source is either
3537 # .gitcookies or .netrc.
3538 self._all_hosts = None
3539
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003540 def ensure_configured_gitcookies(self):
3541 """Runs checks and suggests fixes to make git use .gitcookies from default
3542 path."""
3543 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3544 configured_path = RunGitSilent(
3545 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003546 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003547 if configured_path:
3548 self._ensure_default_gitcookies_path(configured_path, default)
3549 else:
3550 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003551
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003552 @staticmethod
3553 def _ensure_default_gitcookies_path(configured_path, default_path):
3554 assert configured_path
3555 if configured_path == default_path:
3556 print('git is already configured to use your .gitcookies from %s' %
3557 configured_path)
3558 return
3559
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003560 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003561 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3562 (configured_path, default_path))
3563
3564 if not os.path.exists(configured_path):
3565 print('However, your configured .gitcookies file is missing.')
3566 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3567 action='reconfigure')
3568 RunGit(['config', '--global', 'http.cookiefile', default_path])
3569 return
3570
3571 if os.path.exists(default_path):
3572 print('WARNING: default .gitcookies file already exists %s' %
3573 default_path)
3574 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3575 default_path)
3576
3577 confirm_or_exit('Move existing .gitcookies to default location?',
3578 action='move')
3579 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003580 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003581 print('Moved and reconfigured git to use .gitcookies from %s' %
3582 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003583
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003584 @staticmethod
3585 def _configure_gitcookies_path(default_path):
3586 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3587 if os.path.exists(netrc_path):
3588 print('You seem to be using outdated .netrc for git credentials: %s' %
3589 netrc_path)
3590 print('This tool will guide you through setting up recommended '
3591 '.gitcookies store for git credentials.\n'
3592 '\n'
3593 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3594 ' git config --global --unset http.cookiefile\n'
3595 ' mv %s %s.backup\n\n' % (default_path, default_path))
3596 confirm_or_exit(action='setup .gitcookies')
3597 RunGit(['config', '--global', 'http.cookiefile', default_path])
3598 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003599
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003600 def get_hosts_with_creds(self, include_netrc=False):
3601 if self._all_hosts is None:
3602 a = gerrit_util.CookiesAuthenticator()
3603 self._all_hosts = [
3604 (h, u, s)
3605 for h, u, s in itertools.chain(
3606 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3607 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3608 )
3609 if h.endswith(self._GOOGLESOURCE)
3610 ]
3611
3612 if include_netrc:
3613 return self._all_hosts
3614 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3615
3616 def print_current_creds(self, include_netrc=False):
3617 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3618 if not hosts:
3619 print('No Git/Gerrit credentials found')
3620 return
3621 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3622 header = [('Host', 'User', 'Which file'),
3623 ['=' * l for l in lengths]]
3624 for row in (header + hosts):
3625 print('\t'.join((('%%+%ds' % l) % s)
3626 for l, s in zip(lengths, row)))
3627
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003628 @staticmethod
3629 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003630 """Parses identity "git-<username>.domain" into <username> and domain."""
3631 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003632 # distinguishable from sub-domains. But we do know typical domains:
3633 if identity.endswith('.chromium.org'):
3634 domain = 'chromium.org'
3635 username = identity[:-len('.chromium.org')]
3636 else:
3637 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003638 if username.startswith('git-'):
3639 username = username[len('git-'):]
3640 return username, domain
3641
3642 def _get_usernames_of_domain(self, domain):
3643 """Returns list of usernames referenced by .gitcookies in a given domain."""
3644 identities_by_domain = {}
3645 for _, identity, _ in self.get_hosts_with_creds():
3646 username, domain = self._parse_identity(identity)
3647 identities_by_domain.setdefault(domain, []).append(username)
3648 return identities_by_domain.get(domain)
3649
3650 def _canonical_git_googlesource_host(self, host):
3651 """Normalizes Gerrit hosts (with '-review') to Git host."""
3652 assert host.endswith(self._GOOGLESOURCE)
3653 # Prefix doesn't include '.' at the end.
3654 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3655 if prefix.endswith('-review'):
3656 prefix = prefix[:-len('-review')]
3657 return prefix + '.' + self._GOOGLESOURCE
3658
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003659 def _canonical_gerrit_googlesource_host(self, host):
3660 git_host = self._canonical_git_googlesource_host(host)
3661 prefix = git_host.split('.', 1)[0]
3662 return prefix + '-review.' + self._GOOGLESOURCE
3663
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003664 def _get_counterpart_host(self, host):
3665 assert host.endswith(self._GOOGLESOURCE)
3666 git = self._canonical_git_googlesource_host(host)
3667 gerrit = self._canonical_gerrit_googlesource_host(git)
3668 return git if gerrit == host else gerrit
3669
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003670 def has_generic_host(self):
3671 """Returns whether generic .googlesource.com has been configured.
3672
3673 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3674 """
3675 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3676 if host == '.' + self._GOOGLESOURCE:
3677 return True
3678 return False
3679
3680 def _get_git_gerrit_identity_pairs(self):
3681 """Returns map from canonic host to pair of identities (Git, Gerrit).
3682
3683 One of identities might be None, meaning not configured.
3684 """
3685 host_to_identity_pairs = {}
3686 for host, identity, _ in self.get_hosts_with_creds():
3687 canonical = self._canonical_git_googlesource_host(host)
3688 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3689 idx = 0 if canonical == host else 1
3690 pair[idx] = identity
3691 return host_to_identity_pairs
3692
3693 def get_partially_configured_hosts(self):
3694 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003695 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3696 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3697 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003698
3699 def get_conflicting_hosts(self):
3700 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003701 host
3702 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003703 if None not in (i1, i2) and i1 != i2)
3704
3705 def get_duplicated_hosts(self):
3706 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3707 return set(host for host, count in counters.iteritems() if count > 1)
3708
3709 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3710 'chromium.googlesource.com': 'chromium.org',
3711 'chrome-internal.googlesource.com': 'google.com',
3712 }
3713
3714 def get_hosts_with_wrong_identities(self):
3715 """Finds hosts which **likely** reference wrong identities.
3716
3717 Note: skips hosts which have conflicting identities for Git and Gerrit.
3718 """
3719 hosts = set()
3720 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3721 pair = self._get_git_gerrit_identity_pairs().get(host)
3722 if pair and pair[0] == pair[1]:
3723 _, domain = self._parse_identity(pair[0])
3724 if domain != expected:
3725 hosts.add(host)
3726 return hosts
3727
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003728 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003729 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003730 hosts = sorted(hosts)
3731 assert hosts
3732 if extra_column_func is None:
3733 extras = [''] * len(hosts)
3734 else:
3735 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003736 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3737 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003738 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003739 lines.append(tmpl % he)
3740 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003741
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003742 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003743 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003744 yield ('.googlesource.com wildcard record detected',
3745 ['Chrome Infrastructure team recommends to list full host names '
3746 'explicitly.'],
3747 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003748
3749 dups = self.get_duplicated_hosts()
3750 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003751 yield ('The following hosts were defined twice',
3752 self._format_hosts(dups),
3753 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003754
3755 partial = self.get_partially_configured_hosts()
3756 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003757 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3758 'These hosts are missing',
3759 self._format_hosts(partial, lambda host: 'but %s defined' %
3760 self._get_counterpart_host(host)),
3761 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003762
3763 conflicting = self.get_conflicting_hosts()
3764 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003765 yield ('The following Git hosts have differing credentials from their '
3766 'Gerrit counterparts',
3767 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3768 tuple(self._get_git_gerrit_identity_pairs()[host])),
3769 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003770
3771 wrong = self.get_hosts_with_wrong_identities()
3772 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003773 yield ('These hosts likely use wrong identity',
3774 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3775 (self._get_git_gerrit_identity_pairs()[host][0],
3776 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3777 wrong)
3778
3779 def find_and_report_problems(self):
3780 """Returns True if there was at least one problem, else False."""
3781 found = False
3782 bad_hosts = set()
3783 for title, sublines, hosts in self._find_problems():
3784 if not found:
3785 found = True
3786 print('\n\n.gitcookies problem report:\n')
3787 bad_hosts.update(hosts or [])
3788 print(' %s%s' % (title , (':' if sublines else '')))
3789 if sublines:
3790 print()
3791 print(' %s' % '\n '.join(sublines))
3792 print()
3793
3794 if bad_hosts:
3795 assert found
3796 print(' You can manually remove corresponding lines in your %s file and '
3797 'visit the following URLs with correct account to generate '
3798 'correct credential lines:\n' %
3799 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3800 print(' %s' % '\n '.join(sorted(set(
3801 gerrit_util.CookiesAuthenticator().get_new_password_url(
3802 self._canonical_git_googlesource_host(host))
3803 for host in bad_hosts
3804 ))))
3805 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003806
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003807
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003808@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003809def CMDcreds_check(parser, args):
3810 """Checks credentials and suggests changes."""
3811 _, _ = parser.parse_args(args)
3812
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003813 # Code below checks .gitcookies. Abort if using something else.
3814 authn = gerrit_util.Authenticator.get()
3815 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3816 if isinstance(authn, gerrit_util.GceAuthenticator):
3817 DieWithError(
3818 'This command is not designed for GCE, are you on a bot?\n'
3819 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3820 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003821 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003822 'This command is not designed for bot environment. It checks '
3823 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003824
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003825 checker = _GitCookiesChecker()
3826 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003827
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003828 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003829 checker.print_current_creds(include_netrc=True)
3830
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003831 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003832 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003833 return 0
3834 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003835
3836
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003837@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003838def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003839 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003840 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3841 branch = ShortBranchName(branchref)
3842 _, args = parser.parse_args(args)
3843 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003845 return RunGit(['config', 'branch.%s.base-url' % branch],
3846 error_ok=False).strip()
3847 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003849 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3850 error_ok=False).strip()
3851
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003852def color_for_status(status):
3853 """Maps a Changelist status to color, for CMDstatus and other tools."""
3854 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003855 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003856 'waiting': Fore.BLUE,
3857 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003858 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003859 'lgtm': Fore.GREEN,
3860 'commit': Fore.MAGENTA,
3861 'closed': Fore.CYAN,
3862 'error': Fore.WHITE,
3863 }.get(status, Fore.WHITE)
3864
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003865
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003866def get_cl_statuses(changes, fine_grained, max_processes=None):
3867 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003868
3869 If fine_grained is true, this will fetch CL statuses from the server.
3870 Otherwise, simply indicate if there's a matching url for the given branches.
3871
3872 If max_processes is specified, it is used as the maximum number of processes
3873 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3874 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003875
3876 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003877 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003878 if not changes:
3879 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003880
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003881 if not fine_grained:
3882 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003883 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003884 for cl in changes:
3885 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003886 return
3887
3888 # First, sort out authentication issues.
3889 logging.debug('ensuring credentials exist')
3890 for cl in changes:
3891 cl.EnsureAuthenticated(force=False, refresh=True)
3892
3893 def fetch(cl):
3894 try:
3895 return (cl, cl.GetStatus())
3896 except:
3897 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003898 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003899 raise
3900
3901 threads_count = len(changes)
3902 if max_processes:
3903 threads_count = max(1, min(threads_count, max_processes))
3904 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3905
3906 pool = ThreadPool(threads_count)
3907 fetched_cls = set()
3908 try:
3909 it = pool.imap_unordered(fetch, changes).__iter__()
3910 while True:
3911 try:
3912 cl, status = it.next(timeout=5)
3913 except multiprocessing.TimeoutError:
3914 break
3915 fetched_cls.add(cl)
3916 yield cl, status
3917 finally:
3918 pool.close()
3919
3920 # Add any branches that failed to fetch.
3921 for cl in set(changes) - fetched_cls:
3922 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003923
rmistry@google.com2dd99862015-06-22 12:22:18 +00003924
3925def upload_branch_deps(cl, args):
3926 """Uploads CLs of local branches that are dependents of the current branch.
3927
3928 If the local branch dependency tree looks like:
3929 test1 -> test2.1 -> test3.1
3930 -> test3.2
3931 -> test2.2 -> test3.3
3932
3933 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3934 run on the dependent branches in this order:
3935 test2.1, test3.1, test3.2, test2.2, test3.3
3936
3937 Note: This function does not rebase your local dependent branches. Use it when
3938 you make a change to the parent branch that will not conflict with its
3939 dependent branches, and you would like their dependencies updated in
3940 Rietveld.
3941 """
3942 if git_common.is_dirty_git_tree('upload-branch-deps'):
3943 return 1
3944
3945 root_branch = cl.GetBranch()
3946 if root_branch is None:
3947 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3948 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003949 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003950 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3951 'patchset dependencies without an uploaded CL.')
3952
3953 branches = RunGit(['for-each-ref',
3954 '--format=%(refname:short) %(upstream:short)',
3955 'refs/heads'])
3956 if not branches:
3957 print('No local branches found.')
3958 return 0
3959
3960 # Create a dictionary of all local branches to the branches that are dependent
3961 # on it.
3962 tracked_to_dependents = collections.defaultdict(list)
3963 for b in branches.splitlines():
3964 tokens = b.split()
3965 if len(tokens) == 2:
3966 branch_name, tracked = tokens
3967 tracked_to_dependents[tracked].append(branch_name)
3968
vapiera7fbd5a2016-06-16 09:17:49 -07003969 print()
3970 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003971 dependents = []
3972 def traverse_dependents_preorder(branch, padding=''):
3973 dependents_to_process = tracked_to_dependents.get(branch, [])
3974 padding += ' '
3975 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003976 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003977 dependents.append(dependent)
3978 traverse_dependents_preorder(dependent, padding)
3979 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003980 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003981
3982 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003983 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003984 return 0
3985
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003986 confirm_or_exit('This command will checkout all dependent branches and run '
3987 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003988
rmistry@google.com2dd99862015-06-22 12:22:18 +00003989 # Record all dependents that failed to upload.
3990 failures = {}
3991 # Go through all dependents, checkout the branch and upload.
3992 try:
3993 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003994 print()
3995 print('--------------------------------------')
3996 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003997 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003998 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003999 try:
4000 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004001 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004002 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004003 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004004 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004005 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004006 finally:
4007 # Swap back to the original root branch.
4008 RunGit(['checkout', '-q', root_branch])
4009
vapiera7fbd5a2016-06-16 09:17:49 -07004010 print()
4011 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004012 for dependent_branch in dependents:
4013 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004014 print(' %s : %s' % (dependent_branch, upload_status))
4015 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004016
4017 return 0
4018
4019
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004020@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004021def CMDarchive(parser, args):
4022 """Archives and deletes branches associated with closed changelists."""
4023 parser.add_option(
4024 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004025 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004026 parser.add_option(
4027 '-f', '--force', action='store_true',
4028 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004029 parser.add_option(
4030 '-d', '--dry-run', action='store_true',
4031 help='Skip the branch tagging and removal steps.')
4032 parser.add_option(
4033 '-t', '--notags', action='store_true',
4034 help='Do not tag archived branches. '
4035 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004036
4037 auth.add_auth_options(parser)
4038 options, args = parser.parse_args(args)
4039 if args:
4040 parser.error('Unsupported args: %s' % ' '.join(args))
4041 auth_config = auth.extract_auth_config_from_options(options)
4042
4043 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4044 if not branches:
4045 return 0
4046
vapiera7fbd5a2016-06-16 09:17:49 -07004047 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004048 changes = [Changelist(branchref=b, auth_config=auth_config)
4049 for b in branches.splitlines()]
4050 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4051 statuses = get_cl_statuses(changes,
4052 fine_grained=True,
4053 max_processes=options.maxjobs)
4054 proposal = [(cl.GetBranch(),
4055 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4056 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004057 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004058 proposal.sort()
4059
4060 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004062 return 0
4063
4064 current_branch = GetCurrentBranch()
4065
vapiera7fbd5a2016-06-16 09:17:49 -07004066 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004067 if options.notags:
4068 for next_item in proposal:
4069 print(' ' + next_item[0])
4070 else:
4071 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4072 for next_item in proposal:
4073 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004074
kmarshall9249e012016-08-23 12:02:16 -07004075 # Quit now on precondition failure or if instructed by the user, either
4076 # via an interactive prompt or by command line flags.
4077 if options.dry_run:
4078 print('\nNo changes were made (dry run).\n')
4079 return 0
4080 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004081 print('You are currently on a branch \'%s\' which is associated with a '
4082 'closed codereview issue, so archive cannot proceed. Please '
4083 'checkout another branch and run this command again.' %
4084 current_branch)
4085 return 1
kmarshall9249e012016-08-23 12:02:16 -07004086 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004087 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4088 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004089 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004090 return 1
4091
4092 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004093 if not options.notags:
4094 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004095 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004096
vapiera7fbd5a2016-06-16 09:17:49 -07004097 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004098
4099 return 0
4100
4101
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004102@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004104 """Show status of changelists.
4105
4106 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004107 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004108 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004109 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004110 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004111 - Magenta in the commit queue
4112 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004113 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004114
4115 Also see 'git cl comments'.
4116 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004117 parser.add_option(
4118 '--no-branch-color',
4119 action='store_true',
4120 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004122 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004123 parser.add_option('-f', '--fast', action='store_true',
4124 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 parser.add_option(
4126 '-j', '--maxjobs', action='store', type=int,
4127 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004128
4129 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004130 _add_codereview_issue_select_options(
4131 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004132 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004133 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004134 if args:
4135 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004136 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004137
iannuccie53c9352016-08-17 14:40:40 -07004138 if options.issue is not None and not options.field:
4139 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004141 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004142 cl = Changelist(auth_config=auth_config, issue=options.issue,
4143 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004145 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004146 elif options.field == 'id':
4147 issueid = cl.GetIssue()
4148 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004149 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004150 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004151 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004152 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004153 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004154 elif options.field == 'status':
4155 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004156 elif options.field == 'url':
4157 url = cl.GetIssueURL()
4158 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004160 return 0
4161
4162 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4163 if not branches:
4164 print('No local branch found.')
4165 return 0
4166
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004167 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004168 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004169 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004170 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004171 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004172 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004173 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004174
Daniel McArdlea23bf592019-02-12 00:25:12 +00004175 current_branch = GetCurrentBranch()
4176
4177 def FormatBranchName(branch, colorize=False):
4178 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4179 an asterisk when it is the current branch."""
4180
4181 asterisk = ""
4182 color = Fore.RESET
4183 if branch == current_branch:
4184 asterisk = "* "
4185 color = Fore.GREEN
4186 branch_name = ShortBranchName(branch)
4187
4188 if colorize:
4189 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004190 return asterisk + branch_name
4191
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004192 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004193
4194 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004195 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4196 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004197 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004198 c, status = output.next()
4199 branch_statuses[c.GetBranch()] = status
4200 status = branch_statuses.pop(branch)
4201 url = cl.GetIssueURL()
4202 if url and (not status or status == 'error'):
4203 # The issue probably doesn't exist anymore.
4204 url += ' (broken)'
4205
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004206 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004207 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004208 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004209 color = ''
4210 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004211 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004212
Alan Cuttera3be9a52019-03-04 18:50:33 +00004213 branch_display = FormatBranchName(branch)
4214 padding = ' ' * (alignment - len(branch_display))
4215 if not options.no_branch_color:
4216 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004217
Alan Cuttera3be9a52019-03-04 18:50:33 +00004218 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4219 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004220
vapiera7fbd5a2016-06-16 09:17:49 -07004221 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004222 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004223 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004224 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004225 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004226 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004227 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004228 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004230 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004231 print('Issue description:')
4232 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004233 return 0
4234
4235
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004236def colorize_CMDstatus_doc():
4237 """To be called once in main() to add colors to git cl status help."""
4238 colors = [i for i in dir(Fore) if i[0].isupper()]
4239
4240 def colorize_line(line):
4241 for color in colors:
4242 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004243 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004244 indent = len(line) - len(line.lstrip(' ')) + 1
4245 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4246 return line
4247
4248 lines = CMDstatus.__doc__.splitlines()
4249 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4250
4251
phajdan.jre328cf92016-08-22 04:12:17 -07004252def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004253 if path == '-':
4254 json.dump(contents, sys.stdout)
4255 else:
4256 with open(path, 'w') as f:
4257 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004258
4259
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004260@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004261@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004262def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004263 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264
4265 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004266 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004267 parser.add_option('-r', '--reverse', action='store_true',
4268 help='Lookup the branch(es) for the specified issues. If '
4269 'no issues are specified, all branches with mapped '
4270 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004271 parser.add_option('--json',
4272 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004273 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004274 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004275 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276
dnj@chromium.org406c4402015-03-03 17:22:28 +00004277 if options.reverse:
4278 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004279 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004280 # Reverse issue lookup.
4281 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004282
4283 git_config = {}
4284 for config in RunGit(['config', '--get-regexp',
4285 r'branch\..*issue']).splitlines():
4286 name, _space, val = config.partition(' ')
4287 git_config[name] = val
4288
dnj@chromium.org406c4402015-03-03 17:22:28 +00004289 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004290 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4291 config_key = _git_branch_config_key(ShortBranchName(branch),
4292 cls.IssueConfigKey())
4293 issue = git_config.get(config_key)
4294 if issue:
4295 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004296 if not args:
4297 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004298 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004299 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004300 try:
4301 issue_num = int(issue)
4302 except ValueError:
4303 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004304 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004305 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004306 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004307 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004308 if options.json:
4309 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004310 return 0
4311
4312 if len(args) > 0:
4313 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4314 if not issue.valid:
4315 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4316 'or no argument to list it.\n'
4317 'Maybe you want to run git cl status?')
4318 cl = Changelist(codereview=issue.codereview)
4319 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004320 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004321 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004322 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4323 if options.json:
4324 write_json(options.json, {
4325 'issue': cl.GetIssue(),
4326 'issue_url': cl.GetIssueURL(),
4327 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004328 return 0
4329
4330
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004331@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004332def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004333 """Shows or posts review comments for any changelist."""
4334 parser.add_option('-a', '--add-comment', dest='comment',
4335 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004336 parser.add_option('-p', '--publish', action='store_true',
4337 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004338 parser.add_option('-i', '--issue', dest='issue',
4339 help='review issue id (defaults to current issue). '
4340 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004341 parser.add_option('-m', '--machine-readable', dest='readable',
4342 action='store_false', default=True,
4343 help='output comments in a format compatible with '
4344 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004345 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004346 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004347 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004348 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004349 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004350 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004351 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004352
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004353 issue = None
4354 if options.issue:
4355 try:
4356 issue = int(options.issue)
4357 except ValueError:
4358 DieWithError('A review issue id is expected to be a number')
4359
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004360 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4361
4362 if not cl.IsGerrit():
4363 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004364
4365 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004366 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004367 return 0
4368
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004369 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4370 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004371 for comment in summary:
4372 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004373 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004374 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004375 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004376 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004377 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004378 elif comment.autogenerated:
4379 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004380 else:
4381 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004382 print('\n%s%s %s%s\n%s' % (
4383 color,
4384 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4385 comment.sender,
4386 Fore.RESET,
4387 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4388
smut@google.comc85ac942015-09-15 16:34:43 +00004389 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004390 def pre_serialize(c):
4391 dct = c.__dict__.copy()
4392 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4393 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004394 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004395 return 0
4396
4397
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004398@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004399@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004400def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004401 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004402 parser.add_option('-d', '--display', action='store_true',
4403 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004404 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004405 help='New description to set for this issue (- for stdin, '
4406 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004407 parser.add_option('-f', '--force', action='store_true',
4408 help='Delete any unpublished Gerrit edits for this issue '
4409 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004410
4411 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004412 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004413 options, args = parser.parse_args(args)
4414 _process_codereview_select_options(parser, options)
4415
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004416 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004417 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004418 target_issue_arg = ParseIssueNumberArgument(args[0],
4419 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004420 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004421 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004422
martiniss6eda05f2016-06-30 10:18:35 -07004423 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004424 'auth_config': auth.extract_auth_config_from_options(options),
4425 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004426 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004427 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004428 if target_issue_arg:
4429 kwargs['issue'] = target_issue_arg.issue
4430 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004431 if target_issue_arg.codereview and not options.forced_codereview:
4432 detected_codereview_from_url = True
4433 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004434
4435 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004436 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004437 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004438 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004439
4440 if detected_codereview_from_url:
4441 logging.info('canonical issue/change URL: %s (type: %s)\n',
4442 cl.GetIssueURL(), target_issue_arg.codereview)
4443
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004444 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004445
smut@google.com34fb6b12015-07-13 20:03:26 +00004446 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004447 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004448 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004449
4450 if options.new_description:
4451 text = options.new_description
4452 if text == '-':
4453 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004454 elif text == '+':
4455 base_branch = cl.GetCommonAncestorWithUpstream()
4456 change = cl.GetChange(base_branch, None, local_description=True)
4457 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004458
4459 description.set_description(text)
4460 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004461 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004462
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004463 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004464 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004465 return 0
4466
4467
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004468@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004469def CMDlint(parser, args):
4470 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004471 parser.add_option('--filter', action='append', metavar='-x,+y',
4472 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004473 auth.add_auth_options(parser)
4474 options, args = parser.parse_args(args)
4475 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004476
4477 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004478 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004479 try:
4480 import cpplint
4481 import cpplint_chromium
4482 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004483 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004484 return 1
4485
4486 # Change the current working directory before calling lint so that it
4487 # shows the correct base.
4488 previous_cwd = os.getcwd()
4489 os.chdir(settings.GetRoot())
4490 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004491 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004492 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4493 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004494 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004495 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004496 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004497
4498 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004499 command = args + files
4500 if options.filter:
4501 command = ['--filter=' + ','.join(options.filter)] + command
4502 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004503
4504 white_regex = re.compile(settings.GetLintRegex())
4505 black_regex = re.compile(settings.GetLintIgnoreRegex())
4506 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4507 for filename in filenames:
4508 if white_regex.match(filename):
4509 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004510 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004511 else:
4512 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4513 extra_check_functions)
4514 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004515 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004516 finally:
4517 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004518 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004519 if cpplint._cpplint_state.error_count != 0:
4520 return 1
4521 return 0
4522
4523
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004524@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004525def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004526 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004527 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004528 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004529 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004530 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004531 parser.add_option('--all', action='store_true',
4532 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004533 parser.add_option('--parallel', action='store_true',
4534 help='Run all tests specified by input_api.RunTests in all '
4535 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004536 auth.add_auth_options(parser)
4537 options, args = parser.parse_args(args)
4538 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539
sbc@chromium.org71437c02015-04-09 19:29:40 +00004540 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004541 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542 return 1
4543
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004544 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545 if args:
4546 base_branch = args[0]
4547 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004548 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004549 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550
Aaron Gable8076c282017-11-29 14:39:41 -08004551 if options.all:
4552 base_change = cl.GetChange(base_branch, None)
4553 files = [('M', f) for f in base_change.AllFiles()]
4554 change = presubmit_support.GitChange(
4555 base_change.Name(),
4556 base_change.FullDescriptionText(),
4557 base_change.RepositoryRoot(),
4558 files,
4559 base_change.issue,
4560 base_change.patchset,
4561 base_change.author_email,
4562 base_change._upstream)
4563 else:
4564 change = cl.GetChange(base_branch, None)
4565
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004566 cl.RunHook(
4567 committing=not options.upload,
4568 may_prompt=False,
4569 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004570 change=change,
4571 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004572 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004573
4574
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004575def GenerateGerritChangeId(message):
4576 """Returns Ixxxxxx...xxx change id.
4577
4578 Works the same way as
4579 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4580 but can be called on demand on all platforms.
4581
4582 The basic idea is to generate git hash of a state of the tree, original commit
4583 message, author/committer info and timestamps.
4584 """
4585 lines = []
4586 tree_hash = RunGitSilent(['write-tree'])
4587 lines.append('tree %s' % tree_hash.strip())
4588 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4589 if code == 0:
4590 lines.append('parent %s' % parent.strip())
4591 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4592 lines.append('author %s' % author.strip())
4593 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4594 lines.append('committer %s' % committer.strip())
4595 lines.append('')
4596 # Note: Gerrit's commit-hook actually cleans message of some lines and
4597 # whitespace. This code is not doing this, but it clearly won't decrease
4598 # entropy.
4599 lines.append(message)
4600 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004601 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004602 return 'I%s' % change_hash.strip()
4603
4604
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004605def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004606 """Computes the remote branch ref to use for the CL.
4607
4608 Args:
4609 remote (str): The git remote for the CL.
4610 remote_branch (str): The git remote branch for the CL.
4611 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004612 """
4613 if not (remote and remote_branch):
4614 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004615
wittman@chromium.org455dc922015-01-26 20:15:50 +00004616 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004617 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004618 # refs, which are then translated into the remote full symbolic refs
4619 # below.
4620 if '/' not in target_branch:
4621 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4622 else:
4623 prefix_replacements = (
4624 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4625 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4626 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4627 )
4628 match = None
4629 for regex, replacement in prefix_replacements:
4630 match = re.search(regex, target_branch)
4631 if match:
4632 remote_branch = target_branch.replace(match.group(0), replacement)
4633 break
4634 if not match:
4635 # This is a branch path but not one we recognize; use as-is.
4636 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004637 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4638 # Handle the refs that need to land in different refs.
4639 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004640
wittman@chromium.org455dc922015-01-26 20:15:50 +00004641 # Create the true path to the remote branch.
4642 # Does the following translation:
4643 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4644 # * refs/remotes/origin/master -> refs/heads/master
4645 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4646 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4647 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4648 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4649 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4650 'refs/heads/')
4651 elif remote_branch.startswith('refs/remotes/branch-heads'):
4652 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004653
wittman@chromium.org455dc922015-01-26 20:15:50 +00004654 return remote_branch
4655
4656
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004657def cleanup_list(l):
4658 """Fixes a list so that comma separated items are put as individual items.
4659
4660 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4661 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4662 """
4663 items = sum((i.split(',') for i in l), [])
4664 stripped_items = (i.strip() for i in items)
4665 return sorted(filter(None, stripped_items))
4666
4667
Aaron Gable4db38df2017-11-03 14:59:07 -07004668@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004669@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004670def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004671 """Uploads the current changelist to codereview.
4672
4673 Can skip dependency patchset uploads for a branch by running:
4674 git config branch.branch_name.skip-deps-uploads True
4675 To unset run:
4676 git config --unset branch.branch_name.skip-deps-uploads
4677 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004678
4679 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4680 a bug number, this bug number is automatically populated in the CL
4681 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004682
4683 If subject contains text in square brackets or has "<text>: " prefix, such
4684 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4685 [git-cl] add support for hashtags
4686 Foo bar: implement foo
4687 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004688 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004689 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4690 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004691 parser.add_option('--bypass-watchlists', action='store_true',
4692 dest='bypass_watchlists',
4693 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004694 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004695 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004696 parser.add_option('--message', '-m', dest='message',
4697 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004698 parser.add_option('-b', '--bug',
4699 help='pre-populate the bug number(s) for this issue. '
4700 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004701 parser.add_option('--message-file', dest='message_file',
4702 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004703 parser.add_option('--title', '-t', dest='title',
4704 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004705 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004706 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004707 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004708 parser.add_option('--tbrs',
4709 action='append', default=[],
4710 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004711 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004712 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004713 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004714 parser.add_option('--hashtag', dest='hashtags',
4715 action='append', default=[],
4716 help=('Gerrit hashtag for new CL; '
4717 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004718 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004719 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004720 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004721 help='tell the commit queue to commit this patchset; '
4722 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004723 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004724 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004725 metavar='TARGET',
4726 help='Apply CL to remote ref TARGET. ' +
4727 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004728 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004729 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004730 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004731 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004732 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004733 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004734 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4735 const='TBR', help='add a set of OWNERS to TBR')
4736 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4737 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004738 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4739 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004740 help='Send the patchset to do a CQ dry run right after '
4741 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004742 parser.add_option('--dependencies', action='store_true',
4743 help='Uploads CLs of all the local branches that depend on '
4744 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004745 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4746 help='Sends your change to the CQ after an approval. Only '
4747 'works on repos that have the Auto-Submit label '
4748 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004749 parser.add_option('--parallel', action='store_true',
4750 help='Run all tests specified by input_api.RunTests in all '
4751 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004752
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004753 parser.add_option('--no-autocc', action='store_true',
4754 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004755 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004756 help='Set the review private. This implies --no-autocc.')
4757
rmistry@google.com2dd99862015-06-22 12:22:18 +00004758 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004759 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004760 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004761 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004762 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004763 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004764
sbc@chromium.org71437c02015-04-09 19:29:40 +00004765 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004766 return 1
4767
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004768 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004769 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004770 options.cc = cleanup_list(options.cc)
4771
tandriib80458a2016-06-23 12:20:07 -07004772 if options.message_file:
4773 if options.message:
4774 parser.error('only one of --message and --message-file allowed.')
4775 options.message = gclient_utils.FileRead(options.message_file)
4776 options.message_file = None
4777
tandrii4d0545a2016-07-06 03:56:49 -07004778 if options.cq_dry_run and options.use_commit_queue:
4779 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4780
Aaron Gableedbc4132017-09-11 13:22:28 -07004781 if options.use_commit_queue:
4782 options.send_mail = True
4783
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004784 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4785 settings.GetIsGerrit()
4786
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004787 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004788 if not cl.IsGerrit():
4789 # Error out with instructions for repos not yet configured for Gerrit.
4790 print('=====================================')
4791 print('NOTICE: Rietveld is no longer supported. '
4792 'You can upload changes to Gerrit with')
4793 print(' git cl upload --gerrit')
4794 print('or set Gerrit to be your default code review tool with')
4795 print(' git config gerrit.host true')
4796 print('=====================================')
4797 return 1
4798
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004799 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004800
4801
Francois Dorayd42c6812017-05-30 15:10:20 -04004802@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004803@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004804def CMDsplit(parser, args):
4805 """Splits a branch into smaller branches and uploads CLs.
4806
4807 Creates a branch and uploads a CL for each group of files modified in the
4808 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004809 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004810 the shared OWNERS file.
4811 """
4812 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05004813 help="A text file containing a CL description in which "
4814 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04004815 parser.add_option("-c", "--comment", dest="comment_file",
4816 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11004817 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
4818 default=False,
4819 help="List the files and reviewers for each CL that would "
4820 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00004821 parser.add_option("--cq-dry-run", action='store_true',
4822 help="If set, will do a cq dry run for each uploaded CL. "
4823 "Please be careful when doing this; more than ~10 CLs "
4824 "has the potential to overload our build "
4825 "infrastructure. Try to upload these not during high "
4826 "load times (usually 11-3 Mountain View time). Email "
4827 "infra-dev@chromium.org with any questions.")
Takuto Ikuta51eca592019-02-14 19:40:52 +00004828 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4829 default=True,
4830 help='Sends your change to the CQ after an approval. Only '
4831 'works on repos that have the Auto-Submit label '
4832 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004833 options, _ = parser.parse_args(args)
4834
4835 if not options.description_file:
4836 parser.error('No --description flag specified.')
4837
4838 def WrappedCMDupload(args):
4839 return CMDupload(OptionParser(), args)
4840
4841 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004842 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004843 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004844
4845
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004846@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004847@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004848def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004849 """DEPRECATED: Used to commit the current changelist via git-svn."""
4850 message = ('git-cl no longer supports committing to SVN repositories via '
4851 'git-svn. You probably want to use `git cl land` instead.')
4852 print(message)
4853 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004854
4855
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004856# Two special branches used by git cl land.
4857MERGE_BRANCH = 'git-cl-commit'
4858CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4859
4860
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004861@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004862@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004863def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004864 """Commits the current changelist via git.
4865
4866 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4867 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004868 """
4869 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4870 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004871 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004872 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004873 parser.add_option('--parallel', action='store_true',
4874 help='Run all tests specified by input_api.RunTests in all '
4875 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004876 auth.add_auth_options(parser)
4877 (options, args) = parser.parse_args(args)
4878 auth_config = auth.extract_auth_config_from_options(options)
4879
4880 cl = Changelist(auth_config=auth_config)
4881
Robert Iannucci2e73d432018-03-14 01:10:47 -07004882 if not cl.IsGerrit():
4883 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004884
Robert Iannucci2e73d432018-03-14 01:10:47 -07004885 if not cl.GetIssue():
4886 DieWithError('You must upload the change first to Gerrit.\n'
4887 ' If you would rather have `git cl land` upload '
4888 'automatically for you, see http://crbug.com/642759')
4889 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004890 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004891
4892
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004893@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004894@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004895def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004896 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004897 parser.add_option('-b', dest='newbranch',
4898 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004899 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004900 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004901 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07004902 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004903 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004904 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004905 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004906 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004907 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004908 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004909
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004910
4911 group = optparse.OptionGroup(
4912 parser,
4913 'Options for continuing work on the current issue uploaded from a '
4914 'different clone (e.g. different machine). Must be used independently '
4915 'from the other options. No issue number should be specified, and the '
4916 'branch must have an issue number associated with it')
4917 group.add_option('--reapply', action='store_true', dest='reapply',
4918 help='Reset the branch and reapply the issue.\n'
4919 'CAUTION: This will undo any local changes in this '
4920 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004921
4922 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004923 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004924 parser.add_option_group(group)
4925
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004926 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004927 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004928 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004929 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004930 auth_config = auth.extract_auth_config_from_options(options)
4931
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004932 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004933 if options.newbranch:
4934 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004935 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004936 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004937
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004938 cl = Changelist(auth_config=auth_config,
4939 codereview=options.forced_codereview)
4940 if not cl.GetIssue():
4941 parser.error('current branch must have an associated issue')
4942
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004943 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004944 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004945 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004946
4947 RunGit(['reset', '--hard', upstream])
4948 if options.pull:
4949 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004950
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004951 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4952 options.directory)
4953
4954 if len(args) != 1 or not args[0]:
4955 parser.error('Must specify issue number or url')
4956
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004957 target_issue_arg = ParseIssueNumberArgument(args[0],
4958 options.forced_codereview)
4959 if not target_issue_arg.valid:
4960 parser.error('invalid codereview url or CL id')
4961
4962 cl_kwargs = {
4963 'auth_config': auth_config,
4964 'codereview_host': target_issue_arg.hostname,
4965 'codereview': options.forced_codereview,
4966 }
4967 detected_codereview_from_url = False
4968 if target_issue_arg.codereview and not options.forced_codereview:
4969 detected_codereview_from_url = True
4970 cl_kwargs['codereview'] = target_issue_arg.codereview
4971 cl_kwargs['issue'] = target_issue_arg.issue
4972
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004973 # We don't want uncommitted changes mixed up with the patch.
4974 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004975 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004976
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004977 if options.newbranch:
4978 if options.force:
4979 RunGit(['branch', '-D', options.newbranch],
4980 stderr=subprocess2.PIPE, error_ok=True)
4981 RunGit(['new-branch', options.newbranch])
4982
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004983 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004984
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004985 if cl.IsGerrit():
4986 if options.reject:
4987 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004988 if options.directory:
4989 parser.error('--directory is not supported with Gerrit codereview.')
4990
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004991 if detected_codereview_from_url:
4992 print('canonical issue/change URL: %s (type: %s)\n' %
4993 (cl.GetIssueURL(), target_issue_arg.codereview))
4994
4995 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07004996 options.nocommit, options.directory,
4997 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004998
4999
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005000def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005001 """Fetches the tree status and returns either 'open', 'closed',
5002 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005003 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005004 if url:
5005 status = urllib2.urlopen(url).read().lower()
5006 if status.find('closed') != -1 or status == '0':
5007 return 'closed'
5008 elif status.find('open') != -1 or status == '1':
5009 return 'open'
5010 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005011 return 'unset'
5012
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005014def GetTreeStatusReason():
5015 """Fetches the tree status from a json url and returns the message
5016 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005017 url = settings.GetTreeStatusUrl()
5018 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005019 connection = urllib2.urlopen(json_url)
5020 status = json.loads(connection.read())
5021 connection.close()
5022 return status['message']
5023
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005024
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005025@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005026def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005027 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005028 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005029 status = GetTreeStatus()
5030 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005031 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005032 return 2
5033
vapiera7fbd5a2016-06-16 09:17:49 -07005034 print('The tree is %s' % status)
5035 print()
5036 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005037 if status != 'open':
5038 return 1
5039 return 0
5040
5041
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005042@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005043def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005044 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005045 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005046 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005047 '-b', '--bot', action='append',
5048 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5049 'times to specify multiple builders. ex: '
5050 '"-b win_rel -b win_layout". See '
5051 'the try server waterfall for the builders name and the tests '
5052 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005053 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005054 '-B', '--bucket', default='',
5055 help=('Buildbucket bucket to send the try requests.'))
5056 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005057 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005058 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005059 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005060 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005061 help='Revision to use for the try job; default: the revision will '
5062 'be determined by the try recipe that builder runs, which usually '
5063 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005064 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005065 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005066 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005067 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005068 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005069 '--category', default='git_cl_try', help='Specify custom build category.')
5070 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005071 '--project',
5072 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005073 'in recipe to determine to which repository or directory to '
5074 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005075 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005076 '-p', '--property', dest='properties', action='append', default=[],
5077 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005078 'key2=value2 etc. The value will be treated as '
5079 'json if decodable, or as string otherwise. '
5080 'NOTE: using this may make your try job not usable for CQ, '
5081 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005082 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005083 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5084 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005085 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005086 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005087 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005088 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005089 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005090 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005091
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005092 if options.master and options.master.startswith('luci.'):
5093 parser.error(
5094 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005095 # Make sure that all properties are prop=value pairs.
5096 bad_params = [x for x in options.properties if '=' not in x]
5097 if bad_params:
5098 parser.error('Got properties with missing "=": %s' % bad_params)
5099
maruel@chromium.org15192402012-09-06 12:38:29 +00005100 if args:
5101 parser.error('Unknown arguments: %s' % args)
5102
Koji Ishii31c14782018-01-08 17:17:33 +09005103 cl = Changelist(auth_config=auth_config, issue=options.issue,
5104 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005105 if not cl.GetIssue():
5106 parser.error('Need to upload first')
5107
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005108 if cl.IsGerrit():
5109 # HACK: warm up Gerrit change detail cache to save on RPCs.
5110 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5111
tandriie113dfd2016-10-11 10:20:12 -07005112 error_message = cl.CannotTriggerTryJobReason()
5113 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005114 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005115
borenet6c0efe62016-10-19 08:13:29 -07005116 if options.bucket and options.master:
5117 parser.error('Only one of --bucket and --master may be used.')
5118
qyearsley1fdfcb62016-10-24 13:22:03 -07005119 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005120
qyearsleydd49f942016-10-28 11:57:22 -07005121 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5122 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005123 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005124 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005125 print('git cl try with no bots now defaults to CQ dry run.')
5126 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5127 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005128
borenet6c0efe62016-10-19 08:13:29 -07005129 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005130 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005131 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005132 'of bot requires an initial job from a parent (usually a builder). '
5133 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005134 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005135 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005136
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005137 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005138 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005139 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005140 except BuildbucketResponseException as ex:
5141 print('ERROR: %s' % ex)
5142 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005143 return 0
5144
5145
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005146@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005147def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005148 """Prints info about try jobs associated with current CL."""
5149 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005150 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005151 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005152 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005153 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005154 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005155 '--color', action='store_true', default=setup_color.IS_TTY,
5156 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005157 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005158 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5159 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005160 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005161 '--json', help=('Path of JSON output file to write try job results to,'
5162 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005163 parser.add_option_group(group)
5164 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005165 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005166 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005167 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005168 if args:
5169 parser.error('Unrecognized args: %s' % ' '.join(args))
5170
5171 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005172 cl = Changelist(
5173 issue=options.issue, codereview=options.forced_codereview,
5174 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005175 if not cl.GetIssue():
5176 parser.error('Need to upload first')
5177
tandrii221ab252016-10-06 08:12:04 -07005178 patchset = options.patchset
5179 if not patchset:
5180 patchset = cl.GetMostRecentPatchset()
5181 if not patchset:
5182 parser.error('Codereview doesn\'t know about issue %s. '
5183 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005184 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005185 cl.GetIssue())
5186
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005187 try:
tandrii221ab252016-10-06 08:12:04 -07005188 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005189 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005190 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005191 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005192 if options.json:
5193 write_try_results_json(options.json, jobs)
5194 else:
5195 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005196 return 0
5197
5198
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005199@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005200@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005201def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005202 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005203 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005204 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005205 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005206
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005208 if args:
5209 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005210 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005211 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005212 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005213 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005214
5215 # Clear configured merge-base, if there is one.
5216 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005217 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005218 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005219 return 0
5220
5221
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005222@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005223def CMDweb(parser, args):
5224 """Opens the current CL in the web browser."""
5225 _, args = parser.parse_args(args)
5226 if args:
5227 parser.error('Unrecognized args: %s' % ' '.join(args))
5228
5229 issue_url = Changelist().GetIssueURL()
5230 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005231 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005232 return 1
5233
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005234 # Redirect I/O before invoking browser to hide its output. For example, this
5235 # allows to hide "Created new window in existing browser session." message
5236 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5237 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005238 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005239 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005240 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005241 os.open(os.devnull, os.O_RDWR)
5242 try:
5243 webbrowser.open(issue_url)
5244 finally:
5245 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005246 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005247 return 0
5248
5249
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005250@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005251def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005252 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005253 parser.add_option('-d', '--dry-run', action='store_true',
5254 help='trigger in dry run mode')
5255 parser.add_option('-c', '--clear', action='store_true',
5256 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005257 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005258 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005259 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005260 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005261 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005262 if args:
5263 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005264 if options.dry_run and options.clear:
5265 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5266
iannuccie53c9352016-08-17 14:40:40 -07005267 cl = Changelist(auth_config=auth_config, issue=options.issue,
5268 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005269 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005270 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005271 elif options.dry_run:
5272 state = _CQState.DRY_RUN
5273 else:
5274 state = _CQState.COMMIT
5275 if not cl.GetIssue():
5276 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005277 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005278 return 0
5279
5280
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005281@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005282def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005283 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005284 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005285 auth.add_auth_options(parser)
5286 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005287 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005288 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005289 if args:
5290 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005291 cl = Changelist(auth_config=auth_config, issue=options.issue,
5292 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005293 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005294 if not cl.GetIssue():
5295 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005296 cl.CloseIssue()
5297 return 0
5298
5299
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005300@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005301def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005302 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005303 parser.add_option(
5304 '--stat',
5305 action='store_true',
5306 dest='stat',
5307 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005308 auth.add_auth_options(parser)
5309 options, args = parser.parse_args(args)
5310 auth_config = auth.extract_auth_config_from_options(options)
5311 if args:
5312 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005313
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005314 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005315 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005316 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005317 if not issue:
5318 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005319
Aaron Gablea718c3e2017-08-28 17:47:28 -07005320 base = cl._GitGetBranchConfigValue('last-upload-hash')
5321 if not base:
5322 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5323 if not base:
5324 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5325 revision_info = detail['revisions'][detail['current_revision']]
5326 fetch_info = revision_info['fetch']['http']
5327 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5328 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005329
Aaron Gablea718c3e2017-08-28 17:47:28 -07005330 cmd = ['git', 'diff']
5331 if options.stat:
5332 cmd.append('--stat')
5333 cmd.append(base)
5334 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005335
5336 return 0
5337
5338
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005339@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005340def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005341 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005342 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005343 '--ignore-current',
5344 action='store_true',
5345 help='Ignore the CL\'s current reviewers and start from scratch.')
5346 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005347 '--ignore-self',
5348 action='store_true',
5349 help='Do not consider CL\'s author as an owners.')
5350 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005351 '--no-color',
5352 action='store_true',
5353 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005354 parser.add_option(
5355 '--batch',
5356 action='store_true',
5357 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005358 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005359 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005360 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005361
5362 author = RunGit(['config', 'user.email']).strip() or None
5363
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005364 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005365
5366 if args:
5367 if len(args) > 1:
5368 parser.error('Unknown args')
5369 base_branch = args[0]
5370 else:
5371 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005372 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005373
5374 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005375 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5376
5377 if options.batch:
5378 db = owners.Database(change.RepositoryRoot(), file, os.path)
5379 print('\n'.join(db.reviewers_for(affected_files, author)))
5380 return 0
5381
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005382 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005383 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005384 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005385 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005386 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005387 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005388 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005389 override_files=change.OriginalOwnersFiles(),
5390 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005391
5392
Aiden Bennerc08566e2018-10-03 17:52:42 +00005393def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005394 """Generates a diff command."""
5395 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005396 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5397
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005398 if allow_prefix:
5399 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5400 # case that diff.noprefix is set in the user's git config.
5401 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5402 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005403 diff_cmd += ['--no-prefix']
5404
5405 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005406
5407 if args:
5408 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005409 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005410 diff_cmd.append(arg)
5411 else:
5412 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005413
5414 return diff_cmd
5415
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005416
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005417def MatchingFileType(file_name, extensions):
5418 """Returns true if the file name ends with one of the given extensions."""
5419 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005420
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005421
enne@chromium.org555cfe42014-01-29 18:21:39 +00005422@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005423@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005424def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005425 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005426 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005427 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005428 parser.add_option('--full', action='store_true',
5429 help='Reformat the full content of all touched files')
5430 parser.add_option('--dry-run', action='store_true',
5431 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005432 parser.add_option(
5433 '--python',
5434 action='store_true',
5435 default=None,
5436 help='Enables python formatting on all python files.')
5437 parser.add_option(
5438 '--no-python',
5439 action='store_true',
5440 dest='python',
5441 help='Disables python formatting on all python files. '
5442 'Takes precedence over --python. '
5443 'If neither --python or --no-python are set, python '
5444 'files that have a .style.yapf file in an ancestor '
5445 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005446 parser.add_option('--js', action='store_true',
5447 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005448 parser.add_option('--diff', action='store_true',
5449 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005450 parser.add_option('--presubmit', action='store_true',
5451 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005452 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005453
Daniel Chengc55eecf2016-12-30 03:11:02 -08005454 # Normalize any remaining args against the current path, so paths relative to
5455 # the current directory are still resolved as expected.
5456 args = [os.path.join(os.getcwd(), arg) for arg in args]
5457
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005458 # git diff generates paths against the root of the repository. Change
5459 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005460 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005461 if rel_base_path:
5462 os.chdir(rel_base_path)
5463
digit@chromium.org29e47272013-05-17 17:01:46 +00005464 # Grab the merge-base commit, i.e. the upstream commit of the current
5465 # branch when it was created or the last time it was rebased. This is
5466 # to cover the case where the user may have called "git fetch origin",
5467 # moving the origin branch to a newer commit, but hasn't rebased yet.
5468 upstream_commit = None
5469 cl = Changelist()
5470 upstream_branch = cl.GetUpstreamBranch()
5471 if upstream_branch:
5472 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5473 upstream_commit = upstream_commit.strip()
5474
5475 if not upstream_commit:
5476 DieWithError('Could not find base commit for this branch. '
5477 'Are you in detached state?')
5478
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005479 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5480 diff_output = RunGit(changed_files_cmd)
5481 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005482 # Filter out files deleted by this CL
5483 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005484
Christopher Lamc5ba6922017-01-24 11:19:14 +11005485 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005486 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005487
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005488 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5489 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5490 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005491 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005492
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005493 top_dir = os.path.normpath(
5494 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5495
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005496 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5497 # formatted. This is used to block during the presubmit.
5498 return_value = 0
5499
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005500 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005501 # Locate the clang-format binary in the checkout
5502 try:
5503 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005504 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005505 DieWithError(e)
5506
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005507 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005508 cmd = [clang_format_tool]
5509 if not opts.dry_run and not opts.diff:
5510 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005511 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005512 if opts.diff:
5513 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005514 else:
5515 env = os.environ.copy()
5516 env['PATH'] = str(os.path.dirname(clang_format_tool))
5517 try:
5518 script = clang_format.FindClangFormatScriptInChromiumTree(
5519 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005520 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005521 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005522
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005523 cmd = [sys.executable, script, '-p0']
5524 if not opts.dry_run and not opts.diff:
5525 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005526
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005527 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5528 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005529
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005530 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5531 if opts.diff:
5532 sys.stdout.write(stdout)
5533 if opts.dry_run and len(stdout) > 0:
5534 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005535
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005536 # Similar code to above, but using yapf on .py files rather than clang-format
5537 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005538 py_explicitly_disabled = opts.python is not None and not opts.python
5539 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005540 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5541 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5542 if sys.platform.startswith('win'):
5543 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005544
Aiden Bennerc08566e2018-10-03 17:52:42 +00005545 # If we couldn't find a yapf file we'll default to the chromium style
5546 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005547 chromium_default_yapf_style = os.path.join(depot_tools_path,
5548 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005549 # Used for caching.
5550 yapf_configs = {}
5551 for f in python_diff_files:
5552 # Find the yapf style config for the current file, defaults to depot
5553 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005554 _FindYapfConfigFile(f, yapf_configs, top_dir)
5555
5556 # Turn on python formatting by default if a yapf config is specified.
5557 # This breaks in the case of this repo though since the specified
5558 # style file is also the global default.
5559 if opts.python is None:
5560 filtered_py_files = []
5561 for f in python_diff_files:
5562 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5563 filtered_py_files.append(f)
5564 else:
5565 filtered_py_files = python_diff_files
5566
5567 # Note: yapf still seems to fix indentation of the entire file
5568 # even if line ranges are specified.
5569 # See https://github.com/google/yapf/issues/499
5570 if not opts.full and filtered_py_files:
5571 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5572
5573 for f in filtered_py_files:
5574 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5575 if yapf_config is None:
5576 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005577
5578 cmd = [yapf_tool, '--style', yapf_config, f]
5579
5580 has_formattable_lines = False
5581 if not opts.full:
5582 # Only run yapf over changed line ranges.
5583 for diff_start, diff_len in py_line_diffs[f]:
5584 diff_end = diff_start + diff_len - 1
5585 # Yapf errors out if diff_end < diff_start but this
5586 # is a valid line range diff for a removal.
5587 if diff_end >= diff_start:
5588 has_formattable_lines = True
5589 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5590 # If all line diffs were removals we have nothing to format.
5591 if not has_formattable_lines:
5592 continue
5593
5594 if opts.diff or opts.dry_run:
5595 cmd += ['--diff']
5596 # Will return non-zero exit code if non-empty diff.
5597 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5598 if opts.diff:
5599 sys.stdout.write(stdout)
5600 elif len(stdout) > 0:
5601 return_value = 2
5602 else:
5603 cmd += ['-i']
5604 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005605
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005606 # Dart's formatter does not have the nice property of only operating on
5607 # modified chunks, so hard code full.
5608 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005609 try:
5610 command = [dart_format.FindDartFmtToolInChromiumTree()]
5611 if not opts.dry_run and not opts.diff:
5612 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005613 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005614
ppi@chromium.org6593d932016-03-03 15:41:15 +00005615 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005616 if opts.dry_run and stdout:
5617 return_value = 2
5618 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005619 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5620 'found in this checkout. Files in other languages are still '
5621 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005622
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005623 # Format GN build files. Always run on full build files for canonical form.
5624 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005625 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005626 if opts.dry_run or opts.diff:
5627 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005628 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005629 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5630 shell=sys.platform == 'win32',
5631 cwd=top_dir)
5632 if opts.dry_run and gn_ret == 2:
5633 return_value = 2 # Not formatted.
5634 elif opts.diff and gn_ret == 2:
5635 # TODO this should compute and print the actual diff.
5636 print("This change has GN build file diff for " + gn_diff_file)
5637 elif gn_ret != 0:
5638 # For non-dry run cases (and non-2 return values for dry-run), a
5639 # nonzero error code indicates a failure, probably because the file
5640 # doesn't parse.
5641 DieWithError("gn format failed on " + gn_diff_file +
5642 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005643
Ilya Shermane081cbe2017-08-15 17:51:04 -07005644 # Skip the metrics formatting from the global presubmit hook. These files have
5645 # a separate presubmit hook that issues an error if the files need formatting,
5646 # whereas the top-level presubmit script merely issues a warning. Formatting
5647 # these files is somewhat slow, so it's important not to duplicate the work.
5648 if not opts.presubmit:
5649 for xml_dir in GetDirtyMetricsDirs(diff_files):
5650 tool_dir = os.path.join(top_dir, xml_dir)
5651 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5652 if opts.dry_run or opts.diff:
5653 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005654 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005655 if opts.diff:
5656 sys.stdout.write(stdout)
5657 if opts.dry_run and stdout:
5658 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005659
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005660 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005661
Steven Holte2e664bf2017-04-21 13:10:47 -07005662def GetDirtyMetricsDirs(diff_files):
5663 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5664 metrics_xml_dirs = [
5665 os.path.join('tools', 'metrics', 'actions'),
5666 os.path.join('tools', 'metrics', 'histograms'),
5667 os.path.join('tools', 'metrics', 'rappor'),
5668 os.path.join('tools', 'metrics', 'ukm')]
5669 for xml_dir in metrics_xml_dirs:
5670 if any(file.startswith(xml_dir) for file in xml_diff_files):
5671 yield xml_dir
5672
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005673
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005674@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005675@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005676def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005677 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005678 _, args = parser.parse_args(args)
5679
5680 if len(args) != 1:
5681 parser.print_help()
5682 return 1
5683
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005684 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005685 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005686 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005687
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005688 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005689
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005690 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005691 output = RunGit(['config', '--local', '--get-regexp',
5692 r'branch\..*\.%s' % issueprefix],
5693 error_ok=True)
5694 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005695 if issue == target_issue:
5696 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005697
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005698 branches = []
5699 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005700 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005701 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005702 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005703 return 1
5704 if len(branches) == 1:
5705 RunGit(['checkout', branches[0]])
5706 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005707 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005708 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005709 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005710 which = raw_input('Choose by index: ')
5711 try:
5712 RunGit(['checkout', branches[int(which)]])
5713 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005714 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005715 return 1
5716
5717 return 0
5718
5719
maruel@chromium.org29404b52014-09-08 22:58:00 +00005720def CMDlol(parser, args):
5721 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005722 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005723 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5724 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5725 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005726 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005727 return 0
5728
5729
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005730class OptionParser(optparse.OptionParser):
5731 """Creates the option parse and add --verbose support."""
5732 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005733 optparse.OptionParser.__init__(
5734 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005735 self.add_option(
5736 '-v', '--verbose', action='count', default=0,
5737 help='Use 2 times for more debugging info')
5738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005739 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005740 try:
5741 return self._parse_args(args)
5742 finally:
5743 # Regardless of success or failure of args parsing, we want to report
5744 # metrics, but only after logging has been initialized (if parsing
5745 # succeeded).
5746 global settings
5747 settings = Settings()
5748
5749 if not metrics.DISABLE_METRICS_COLLECTION:
5750 # GetViewVCUrl ultimately calls logging method.
5751 project_url = settings.GetViewVCUrl().strip('/+')
5752 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5753 metrics.collector.add('project_urls', [project_url])
5754
5755 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005756 # Create an optparse.Values object that will store only the actual passed
5757 # options, without the defaults.
5758 actual_options = optparse.Values()
5759 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5760 # Create an optparse.Values object with the default options.
5761 options = optparse.Values(self.get_default_values().__dict__)
5762 # Update it with the options passed by the user.
5763 options._update_careful(actual_options.__dict__)
5764 # Store the options passed by the user in an _actual_options attribute.
5765 # We store only the keys, and not the values, since the values can contain
5766 # arbitrary information, which might be PII.
5767 metrics.collector.add('arguments', actual_options.__dict__.keys())
5768
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005769 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005770 logging.basicConfig(
5771 level=levels[min(options.verbose, len(levels) - 1)],
5772 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5773 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005774
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005775 return options, args
5776
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005777
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005778def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005779 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005780 print('\nYour python version %s is unsupported, please upgrade.\n' %
5781 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005782 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005783
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005784 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005785 dispatcher = subcommand.CommandDispatcher(__name__)
5786 try:
5787 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005788 except auth.AuthenticationError as e:
5789 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005790 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005791 if e.code != 500:
5792 raise
5793 DieWithError(
5794 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5795 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005796 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005797
5798
5799if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005800 # These affect sys.stdout so do it outside of main() to simplify mocks in
5801 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005802 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005803 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005804 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005805 sys.exit(main(sys.argv[1:]))